Bug #17337684 MEMORY LEAK IN CLI_MYSQL_REAL_CONNECT() FUNCTION

Igor Solodovnikov · Igor Solodovnikov · commit 3d4aae6b10c7 · 2013-08-23T15:41:06.000+03:00
Memory leak in cli_mysql_real_connect() was caused by
'goto error' statements after failing call to vio_new() or
vio_reset(). Those gotos skipped freeaddrinfo() for res_lst
and client_bind_ai_lst.
Fixed by adding explicit calls to freeaddrinfo() before
both problematic 'goto error' statements.
diff --git a/sql-common/client.c b/sql-common/client.c
@@ -3500,6 +3500,9 @@ CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,const char *host, const char *user,
         {
           set_mysql_error(mysql, CR_OUT_OF_MEMORY, unknown_sqlstate);
           closesocket(sock);
+          freeaddrinfo(res_lst);
+          if (client_bind_ai_lst)
+            freeaddrinfo(client_bind_ai_lst);
           goto error;
         }
       }
@@ -3508,6 +3511,9 @@ CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,const char *host, const char *user,
       {
         set_mysql_error(mysql, CR_UNKNOWN_ERROR, unknown_sqlstate);
         closesocket(sock);
+        freeaddrinfo(res_lst);
+        if (client_bind_ai_lst)
+          freeaddrinfo(client_bind_ai_lst);
         goto error;
       }
 

Original file line number	Diff line number	Diff line change
`@@ -3500,6 +3500,9 @@ CLI_MYSQL_REAL_CONNECT(MYSQL mysql,const char host, const char *user,`
`3500`	`3500`	`{`
`3501`	`3501`	`set_mysql_error(mysql, CR_OUT_OF_MEMORY, unknown_sqlstate);`
`3502`	`3502`	`closesocket(sock);`
	`3503`	`+ freeaddrinfo(res_lst);`
	`3504`	`+ if (client_bind_ai_lst)`
	`3505`	`+ freeaddrinfo(client_bind_ai_lst);`
`3503`	`3506`	`goto error;`
`3504`	`3507`	`}`
`3505`	`3508`	`}`
`@@ -3508,6 +3511,9 @@ CLI_MYSQL_REAL_CONNECT(MYSQL mysql,const char host, const char *user,`
`3508`	`3511`	`{`
`3509`	`3512`	`set_mysql_error(mysql, CR_UNKNOWN_ERROR, unknown_sqlstate);`
`3510`	`3513`	`closesocket(sock);`
	`3514`	`+ freeaddrinfo(res_lst);`
	`3515`	`+ if (client_bind_ai_lst)`
	`3516`	`+ freeaddrinfo(client_bind_ai_lst);`
`3511`	`3517`	`goto error;`
`3512`	`3518`	`}`
`3513`	`3519`