Calling MySQLDrivercConnect with a NULL pcbConnStrOut causes a crash (Bug# 27101767/88371)

Author: Bogdan Degtyariov

ChangeLog

@@ -12,6 +12,8 @@
     (Bug# 27155880/86473)
   * MySQL Connector/ODBC 5.2.5 - Command Timeout does not work
     (Bug# 26474362/69416)
+  * Calling MySQLDrivercConnect with a NULL pcbConnStrOut causes a crash
+    (Bug# 27101767/88371)
 
   Built using MySQL 5.7.20
 
@@ -94,6 +96,7 @@
   * Assertion in ODBC Driver when calling mysql_stmt_close() on a broken
     connection (Bug# 25109356/83858)
   * Connector ODBC does not build with newer CMake (Bug# 22746557)
+  * Installation fails in OSX El Capitan (23123503/81113)
 
   Built using MySQL 5.7.17.
 

driver/unicode.c

@@ -243,8 +243,14 @@ SQLDriverConnectW(SQLHDBC hdbc, SQLHWND hwnd,
                   SQLWCHAR *out, SQLSMALLINT out_max, SQLSMALLINT *out_len,
                   SQLUSMALLINT completion)
 {
+  SQLSMALLINT dummy_out_len = 0;
+
   CHECK_HANDLE(hdbc);
 
+  // Make sure out_len is never NULL at least internally
+  if (!out_len)
+    out_len = &dummy_out_len;
+
   ((DBC *)hdbc)->unicode= TRUE; /* Hooray, a Unicode connection! */
 
   return MySQLDriverConnect(hdbc, hwnd, in, in_len, out, out_max,

test/my_info.c

@@ -526,8 +526,8 @@ DECLARE_TEST(t_query_timeout)
 
     ok_sql(hstmt, "DROP TABLE if exists t_query_timeout1");
 
-    /* Just in case there is a small delay in the network or somewhere else */
-    is(t2 - t1 < 3);
+    /* Just in case there is a delay in the network or somewhere else */
+    is(t2 - t1 < 5);
   }
   return OK;
 }