database/mariadb-connector-c
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-connector-c.git synced 2025-08-08 14:02:17 +03:00
Code Activity

10.2-integration fixes:

Browse Source 
- always send COM_STMT_RESET if specified
- prevent double free of context buffer
This commit is contained in:
Georg Richter
2016-03-10 14:02:30 +01:00
parent 3cfc5f8654
commit 06e5422715
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libmariadb/mariadb_lib.c
View File

@@ -1516,8 +1516,6 @@ error:
end_server(mysql);
/* only free the allocated memory, user needs to call mysql_close */
mysql_close_memory(mysql);
if (!(((ulong) client_flag) & CLIENT_REMEMBER_OPTIONS))
mysql_close_options(mysql);
return(0);
}
@@ -1786,10 +1784,11 @@ static void mysql_close_options(MYSQL *mysql)
if (mysql->options.extension)
{
struct mysql_async_context *ctxt;
if ((ctxt = mysql->options.extension->async_context) != 0)
if ((ctxt = mysql->options.extension->async_context))
{
my_context_destroy(&ctxt->async_context);
free(ctxt);
mysql->options.extension->async_context= 0;
}
free(mysql->options.extension->plugin_dir);
free(mysql->options.extension->default_auth);