Bug#14840488 VALGRIND ERRORS IN MYSQL_CLIENT_TEST

Tor Didriksen · Tor Didriksen · commit 640ff30e35c2 · 2012-11-01T11:59:32.000+01:00
Add missing DBUG_RETURNs, otherwise the debug-stack gets messed up,
and _db_enter_ and _db_exit_ will access data outside the current stack frame.

Add some missing mysql_free_xx() mysql_close_xx() to fix memory leaks.
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c
@@ -4239,7 +4239,7 @@ int STDCALL mysql_stmt_fetch_column(MYSQL_STMT *stmt, MYSQL_BIND *my_bind,
   if ((int) stmt->state < (int) MYSQL_STMT_FETCH_DONE)
   {
     set_stmt_error(stmt, CR_NO_DATA, unknown_sqlstate, NULL);
-    return 1;
+    DBUG_RETURN(1);
   }
   if (column >= stmt->field_count)
   {
diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c
@@ -978,6 +978,7 @@ static void test_wl4435_2()
     rc= mysql_query(mysql, "DROP PROCEDURE p1");
     myquery(rc);
   }
+  mct_close_log();
 }
 
 
@@ -1041,6 +1042,7 @@ static void test_wl4435_2()
   rc= mysql_stmt_next_result(ps); \
   DIE_UNLESS(rc == 0); \
   \
+  mysql_free_result(rs_metadata); \
   mysql_stmt_free_result(ps); \
   mysql_stmt_close(ps); \
   \
@@ -16192,6 +16194,7 @@ static void test_bug27876()
 
   rc= mysql_query(mysql, "set names default");
   myquery(rc);
+  DBUG_VOID_RETURN;
 }
 
 
@@ -17981,6 +17984,8 @@ static void test_bug43560(void)
   rc= mysql_stmt_execute(stmt);
   DIE_UNLESS(rc && mysql_stmt_errno(stmt) == CR_SERVER_LOST);
 
+  mysql_stmt_close(stmt);
+
   opt_drop_db= 0;
   client_disconnect(conn);
   rc= mysql_query(mysql, "DROP TABLE t1");
@@ -18280,6 +18285,7 @@ static void test_bug42373()
   DIE_UNLESS(rc == 1);
 
   mysql_stmt_close(stmt);
+  mysql_close(&con);
 
   /* Now try with a multi-statement. */
   DIE_UNLESS(mysql_client_init(&con));

Original file line number	Diff line number	Diff line change
`@@ -4239,7 +4239,7 @@ int STDCALL mysql_stmt_fetch_column(MYSQL_STMT stmt, MYSQL_BIND my_bind,`
`4239`	`4239`	`if ((int) stmt->state < (int) MYSQL_STMT_FETCH_DONE)`
`4240`	`4240`	`{`
`4241`	`4241`	`set_stmt_error(stmt, CR_NO_DATA, unknown_sqlstate, NULL);`
`4242`		`- return 1;`
	`4242`	`+ DBUG_RETURN(1);`
`4243`	`4243`	`}`
`4244`	`4244`	`if (column >= stmt->field_count)`
`4245`	`4245`	`{`
Original file line number	Diff line number	Diff line change
`@@ -978,6 +978,7 @@ static void test_wl4435_2()`
`978`	`978`	`rc= mysql_query(mysql, "DROP PROCEDURE p1");`
`979`	`979`	`myquery(rc);`
`980`	`980`	`}`
	`981`	`+ mct_close_log();`
`981`	`982`	`}`
`982`	`983`
`983`	`984`
`@@ -1041,6 +1042,7 @@ static void test_wl4435_2()`
`1041`	`1042`	`rc= mysql_stmt_next_result(ps); \`
`1042`	`1043`	`DIE_UNLESS(rc == 0); \`
`1043`	`1044`	`\`
	`1045`	`+ mysql_free_result(rs_metadata); \`
`1044`	`1046`	`mysql_stmt_free_result(ps); \`
`1045`	`1047`	`mysql_stmt_close(ps); \`
`1046`	`1048`	`\`
`@@ -16192,6 +16194,7 @@ static void test_bug27876()`
`16192`	`16194`
`16193`	`16195`	`rc= mysql_query(mysql, "set names default");`
`16194`	`16196`	`myquery(rc);`
	`16197`	`+ DBUG_VOID_RETURN;`
`16195`	`16198`	`}`
`16196`	`16199`
`16197`	`16200`
`@@ -17981,6 +17984,8 @@ static void test_bug43560(void)`
`17981`	`17984`	`rc= mysql_stmt_execute(stmt);`
`17982`	`17985`	`DIE_UNLESS(rc && mysql_stmt_errno(stmt) == CR_SERVER_LOST);`
`17983`	`17986`
	`17987`	`+ mysql_stmt_close(stmt);`
	`17988`	`+`
`17984`	`17989`	`opt_drop_db= 0;`
`17985`	`17990`	`client_disconnect(conn);`
`17986`	`17991`	`rc= mysql_query(mysql, "DROP TABLE t1");`
`@@ -18280,6 +18285,7 @@ static void test_bug42373()`
`18280`	`18285`	`DIE_UNLESS(rc == 1);`
`18281`	`18286`
`18282`	`18287`	`mysql_stmt_close(stmt);`
	`18288`	`+ mysql_close(&con);`
`18283`	`18289`
`18284`	`18290`	`/* Now try with a multi-statement. */`
`18285`	`18291`	`DIE_UNLESS(mysql_client_init(&con));`