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

Fix for CONC-392:

Browse Source 
Fixed crash when server sent session tracking information with session type
SESSION_TRACK_STATE_CHANGE. In this special case the packet doesn't contain
the overall length. (see https://mariadb.com/kb/en/library/ok_packet/).
This commit is contained in:
Georg Richter
2019-03-02 07:54:06 +01:00
parent 31ae1278aa
commit 68d05007bb
2 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libmariadb/mariadb_lib.c
View File

@@ -2034,6 +2034,7 @@ int ma_read_ok_packet(MYSQL *mysql, uchar *pos, ulong length)
case SESSION_TRACK_STATE_CHANGE:
case SESSION_TRACK_TRANSACTION_CHARACTERISTICS:
case SESSION_TRACK_SYSTEM_VARIABLES:
if (si_type != SESSION_TRACK_STATE_CHANGE)
net_field_length(&pos); /* ignore total length, item length will follow next */
plen= net_field_length(&pos);
if (!ma_multi_malloc(0,

20
unittest/libmariadb/connection.c
View File

@@ -1602,8 +1602,28 @@ static int test_conc312(MYSQL *my)
return OK;
}
static int test_conc392(MYSQL *mysql)
{
int rc;
const char *data;
size_t len;
rc= mysql_query(mysql, "set session_track_state_change=1");
check_mysql_rc(rc, mysql);
if (mysql_session_track_get_first(mysql, SESSION_TRACK_STATE_CHANGE, &data, &len))
{
diag("session_track_get_first failed");
return FAIL;
}
FAIL_IF(len != 1, "Expected length 1");
return OK;
}
struct my_tests_st my_tests[] = {
{"test_conc392", test_conc392, TEST_CONNECTION_DEFAULT, 0, NULL, NULL},
{"test_conc312", test_conc312, TEST_CONNECTION_DEFAULT, 0, NULL, NULL},
{"test_conc351", test_conc351, TEST_CONNECTION_NONE, 0, NULL, NULL},
{"test_conc332", test_conc332, TEST_CONNECTION_NONE, 0, NULL, NULL},