Fix segmentation fault when running test_ssl_cipher_in_option_file test

nmariz · nmariz · commit fa2374f89557 · 2016-12-02T16:25:47.000Z
diff --git a/src/mysql_capi.c b/src/mysql_capi.c
@@ -1032,6 +1032,7 @@ MySQL_connect(MySQL *self, PyObject *args, PyObject *kwds)
 	unsigned long client_flags= 0;
 	unsigned int port= 3306, tmp_uint;
 	unsigned int protocol= 0;
+  unsigned int ssl_mode;
 	my_bool abool;
 	MYSQL *res;
 
@@ -1118,15 +1119,17 @@ MySQL_connect(MySQL *self, PyObject *args, PyObject *kwds)
 #endif
 #if MYSQL_VERSION_ID >= 50711
         {
-            mysql_options(&self->session, MYSQL_OPT_SSL_MODE, SSL_MODE_REQUIRED);
+            ssl_mode= SSL_MODE_REQUIRED;
+            mysql_options(&self->session, MYSQL_OPT_SSL_MODE, &ssl_mode);
         }
 #endif
 
         if (ssl_verify_cert && ssl_verify_cert == Py_True)
         {
 #if MYSQL_VERSION_ID >= 50711
             {
-                mysql_options(&self->session, MYSQL_OPT_SSL_MODE, SSL_MODE_VERIFY_IDENTITY);
+                ssl_mode= SSL_MODE_VERIFY_IDENTITY;
+                mysql_options(&self->session, MYSQL_OPT_SSL_MODE, &ssl_mode);
             }
 #else
             {
@@ -1147,7 +1150,8 @@ MySQL_connect(MySQL *self, PyObject *args, PyObject *kwds)
 #endif
 #if MYSQL_VERSION_ID >= 50711
         {
-            mysql_options(&self->session, MYSQL_OPT_SSL_ENFORCE, SSL_MODE_DISABLED);
+            ssl_mode= SSL_MODE_DISABLED;
+            mysql_options(&self->session, MYSQL_OPT_SSL_MODE, &ssl_mode);
         }
 #endif
     }
@@ -1173,6 +1177,10 @@ MySQL_connect(MySQL *self, PyObject *args, PyObject *kwds)
         client_flags= client_flags & ~CLIENT_CONNECT_WITH_DB;
     }
 
+    if (client_flags & CLIENT_LOCAL_FILES) {
+        abool= 1;
+        mysql_options(&self->session, MYSQL_OPT_LOCAL_INFILE, (unsigned int*)&abool);
+    }
 
 #ifdef PY3
     res= mysql_real_connect(&self->session, host, user, password, database,

Original file line number	Diff line number	Diff line change
`@@ -1032,6 +1032,7 @@ MySQL_connect(MySQL self, PyObject args, PyObject *kwds)`
`1032`	`1032`	`unsigned long client_flags= 0;`
`1033`	`1033`	`unsigned int port= 3306, tmp_uint;`
`1034`	`1034`	`unsigned int protocol= 0;`
	`1035`	`+ unsigned int ssl_mode;`
`1035`	`1036`	`my_bool abool;`
`1036`	`1037`	`MYSQL *res;`
`1037`	`1038`
`@@ -1118,15 +1119,17 @@ MySQL_connect(MySQL self, PyObject args, PyObject *kwds)`
`1118`	`1119`	`#endif`
`1119`	`1120`	`#if MYSQL_VERSION_ID >= 50711`
`1120`	`1121`	`{`
`1121`		`- mysql_options(&self->session, MYSQL_OPT_SSL_MODE, SSL_MODE_REQUIRED);`
	`1122`	`+ ssl_mode= SSL_MODE_REQUIRED;`
	`1123`	`+ mysql_options(&self->session, MYSQL_OPT_SSL_MODE, &ssl_mode);`
`1122`	`1124`	`}`
`1123`	`1125`	`#endif`
`1124`	`1126`
`1125`	`1127`	`if (ssl_verify_cert && ssl_verify_cert == Py_True)`
`1126`	`1128`	`{`
`1127`	`1129`	`#if MYSQL_VERSION_ID >= 50711`
`1128`	`1130`	`{`
`1129`		`- mysql_options(&self->session, MYSQL_OPT_SSL_MODE, SSL_MODE_VERIFY_IDENTITY);`
	`1131`	`+ ssl_mode= SSL_MODE_VERIFY_IDENTITY;`
	`1132`	`+ mysql_options(&self->session, MYSQL_OPT_SSL_MODE, &ssl_mode);`
`1130`	`1133`	`}`
`1131`	`1134`	`#else`
`1132`	`1135`	`{`
`@@ -1147,7 +1150,8 @@ MySQL_connect(MySQL self, PyObject args, PyObject *kwds)`
`1147`	`1150`	`#endif`
`1148`	`1151`	`#if MYSQL_VERSION_ID >= 50711`
`1149`	`1152`	`{`
`1150`		`- mysql_options(&self->session, MYSQL_OPT_SSL_ENFORCE, SSL_MODE_DISABLED);`
	`1153`	`+ ssl_mode= SSL_MODE_DISABLED;`
	`1154`	`+ mysql_options(&self->session, MYSQL_OPT_SSL_MODE, &ssl_mode);`
`1151`	`1155`	`}`
`1152`	`1156`	`#endif`
`1153`	`1157`	`}`
`@@ -1173,6 +1177,10 @@ MySQL_connect(MySQL self, PyObject args, PyObject *kwds)`
`1173`	`1177`	`client_flags= client_flags & ~CLIENT_CONNECT_WITH_DB;`
`1174`	`1178`	`}`
`1175`	`1179`
	`1180`	`+ if (client_flags & CLIENT_LOCAL_FILES) {`
	`1181`	`+ abool= 1;`
	`1182`	`+ mysql_options(&self->session, MYSQL_OPT_LOCAL_INFILE, (unsigned int*)&abool);`
	`1183`	`+ }`
`1176`	`1184`
`1177`	`1185`	`#ifdef PY3`
`1178`	`1186`	`res= mysql_real_connect(&self->session, host, user, password, database,`