diff options
| -rw-r--r-- | sql/sql_class.h | 2 | ||||
| -rw-r--r-- | tests/client_test.c | 30 |
2 files changed, 31 insertions, 1 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index cd4849d13ae..01387e28402 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -561,7 +561,7 @@ public: { Statement *stmt; stmt= (Statement *) hash_search(&st_hash, (byte *) &id, sizeof(id)); - if (stmt->name.str) + if (stmt && stmt->name.str) return NULL; last_found_statement= stmt; } diff --git a/tests/client_test.c b/tests/client_test.c index b4ba20dbf00..efcb9c1be0b 100644 --- a/tests/client_test.c +++ b/tests/client_test.c @@ -9912,6 +9912,35 @@ static void test_bug4079() mysql_stmt_close(stmt); } + +static void test_bug4236() +{ + MYSQL_STMT *stmt; + const char *stmt_text; + int rc; + MYSQL_STMT backup; + + myheader("test_bug4296"); + + stmt= mysql_stmt_init(mysql); + + /* mysql_stmt_execute() of statement with statement id= 0 crashed server */ + stmt_text= "SELECT 1"; + /* We need to prepare statement to pass by possible check in libmysql */ + rc= mysql_stmt_prepare(stmt, stmt_text, strlen(stmt_text)); + check_execute(stmt, rc); + /* Hack to check that server works OK if statement wasn't found */ + backup.stmt_id= stmt->stmt_id; + stmt->stmt_id= 0; + rc= mysql_stmt_execute(stmt); + assert(rc); + /* Restore original statement id to be able to reprepare it */ + stmt->stmt_id= backup.stmt_id; + + mysql_stmt_close(stmt); +} + + /* Read and parse arguments and MySQL options from my.cnf */ @@ -10206,6 +10235,7 @@ int main(int argc, char **argv) test_bug3796(); /* test for select concat(?, <string>) */ test_bug4026(); /* test microseconds precision of time types */ test_bug4079(); /* erroneous subquery in prepared statement */ + test_bug4236(); /* init -> execute */ /* XXX: PLEASE RUN THIS PROGRAM UNDER VALGRIND AND VERIFY THAT YOUR TEST DOESN'T CONTAIN WARNINGS/ERRORS BEFORE YOU PUSH. |