Fixes crash on shutdown when connection is null

sysown · May 18, 2018 · 3819fb2 · 3819fb2
1 parent 9c1a794
commit 3819fb2
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/lib/MySQL_Session.cpp b/lib/MySQL_Session.cpp
@@ -2922,8 +2922,12 @@ int MySQL_Session::handler() {
 								case PROCESSING_STMT_PREPARE:
 									{
 										char sqlstate[10];
-										sprintf(sqlstate,"%s",mysql_sqlstate(myconn->mysql));
-										client_myds->myprot.generate_pkt_ERR(true,NULL,NULL,client_myds->pkt_sid+1,mysql_errno(myconn->mysql),sqlstate,(char *)mysql_stmt_error(myconn->query.stmt));
+                                                                                if (myconn->mysql) {
+                                                                                        sprintf(sqlstate,"%s",mysql_sqlstate(myconn->mysql));
+                                                                                        client_myds->myprot.generate_pkt_ERR(true,NULL,NULL,client_myds->pkt_sid+1,mysql_errno(myconn->mysql),sqlstate,(char *)mysql_stmt_error(myconn->query.stmt));
+                                                                                } else {
+                                                                                        client_myds->myprot.generate_pkt_ERR(true,NULL,NULL,client_myds->pkt_sid+1, 2013, (char *)"" ,(char *)"Lost connection to MySQL server during query");
+                                                                                }
 										client_myds->pkt_sid++;
 										if (previous_status.size()) {
 											// an STMT_PREPARE failed
@@ -2937,8 +2941,12 @@ int MySQL_Session::handler() {
 								case PROCESSING_STMT_EXECUTE:
 									{
 										char sqlstate[10];
-										sprintf(sqlstate,"%s",mysql_sqlstate(myconn->mysql));
-										client_myds->myprot.generate_pkt_ERR(true,NULL,NULL,client_myds->pkt_sid+1,mysql_errno(myconn->mysql),sqlstate,(char *)mysql_stmt_error(myconn->query.stmt));
+										if (myconn->mysql) {
+											sprintf(sqlstate,"%s",mysql_sqlstate(myconn->mysql));
+											client_myds->myprot.generate_pkt_ERR(true,NULL,NULL,client_myds->pkt_sid+1,mysql_errno(myconn->mysql),sqlstate,(char *)mysql_stmt_error(myconn->query.stmt));
+										} else {
+											client_myds->myprot.generate_pkt_ERR(true,NULL,NULL,client_myds->pkt_sid+1, 2013, (char *)"" ,(char *)"Lost connection to MySQL server during query");
+										}
 										client_myds->pkt_sid++;
 									}
 									break;