Merge pull request #4076 from sysown/v2.x_crash_fix_debug

Avoid null pointer mysql connection access
pull/3521/merge
René Cannaò 3 years ago committed by GitHub
commit cb2ca9ca16
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -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

Loading…
Cancel
Save