Merge pull request #4076 from sysown/v2.x_crash_fix_debug

Avoid null pointer mysql connection access
sysown · Jan 12, 2023 · cb2ca9c · cb2ca9c
2 parents 3998873 + 6c104fb
commit cb2ca9c
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/lib/MySQL_Monitor.cpp b/lib/MySQL_Monitor.cpp
@@ -317,14 +317,16 @@ MYSQL * MySQL_Monitor_Connection_Pool::get_connection(char *hostname, int port,
 					break;
 				}
 #ifdef DEBUG
-				for (unsigned int j=0; j<conns->len; j++) {
-					MYSQL *my1 = (MYSQL *)conns->index(j);
-					assert(my!=my1);
-					assert(my->net.fd!=my1->net.fd);
-				}
-				//proxy_info("Registering MYSQL with FD %d from mmsd %p and MYSQL %p\n", my->net.fd, mmsd, my);
-				if (my)
+				if (my) {
+					for (unsigned int j=0; j<conns->len; j++) {
+						MYSQL *my1 = (MYSQL *)conns->index(j);
+						assert(my!=my1);
+						assert(my->net.fd!=my1->net.fd);
+					}
+					//proxy_info("Registering MYSQL with FD %d from mmsd %p and MYSQL %p\n", my->net.fd, mmsd, my);
+
 					conns->add(my);
+				}
 #endif // DEBUG
 			}
 #ifdef DEBUG