]> granicus.if.org Git - php/commitdiff
Don't use conn->net without checking if it is NULL, because
authorAndrey Hristov <andrey@php.net>
Wed, 26 May 2010 13:47:43 +0000 (13:47 +0000)
committerAndrey Hristov <andrey@php.net>
Wed, 26 May 2010 13:47:43 +0000 (13:47 +0000)
it can be NULL in OOM conditions. This would cause a crash.

ext/mysqlnd/mysqlnd.c

index 37b7c1bf4203c87e21229a7fc21a912f931544e8..567570a3abb39b26a18bc5fe816d9475bff37222 100644 (file)
@@ -125,7 +125,9 @@ MYSQLND_METHOD(mysqlnd_conn, free_contents)(MYSQLND * conn TSRMLS_DC)
                conn->current_result = NULL;
        }
 
-       conn->net->m.free_contents(conn->net TSRMLS_CC);
+       if (conn->net) {
+               conn->net->m.free_contents(conn->net TSRMLS_CC);
+       }
 
        DBG_INF("Freeing memory of members");