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

CONC-741: Check that MYSQL_STMT is not null

Browse Source 
The code now again allows null MYSQL_STMT handles to be passed to
mysql_stmt_close(). Added a sanity check test case that should guard
against this happening in the future.
This commit is contained in:
Markus Mäkelä
2024-11-07 07:34:12 +02:00
parent 0269d947bc
commit 8dce8dba85
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libmariadb/mariadb_stmt.c
View File

@@ -129,7 +129,7 @@ static my_bool madb_have_pending_results(MYSQL_STMT *stmt)
{
LIST *li_stmt;
if (!stmt->mysql)
if (!stmt || !stmt->mysql)
return 0;
li_stmt= stmt->mysql->stmts;

8
unittest/libmariadb/misc.c
View File

@@ -1662,6 +1662,13 @@ static int test_disable_tls1_0(MYSQL *my __attribute__((unused)))
return OK;
}
static int test_null_handles(MYSQL *)
{
mysql_close(NULL);
mysql_stmt_close(NULL);
return OK;
}
struct my_tests_st my_tests[] = {
{"test_disable_tls1_0", test_disable_tls1_0, TEST_CONNECTION_DEFAULT, 0, NULL, NULL},
@@ -1708,6 +1715,7 @@ struct my_tests_st my_tests[] = {
#ifdef _WIN32
{"test_conc44", test_conc44, TEST_CONNECTION_NEW, 0, NULL, NULL},
#endif
{"test_null_handles", test_null_handles, TEST_CONNECTION_NONE, 0, NULL, NULL},
{NULL, NULL, 0, 0, NULL, 0}
};