From: Andrey Hristov <andrey@php.net>
Date: Wed, 26 May 2010 13:47:43 +0000 (+0000)
Subject: Don't use conn->net without checking if it is NULL, because
X-Git-Tag: php-5.3.3RC1~123
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ce136a825cc355ade2cfa360629e00bed6593eb8;p=php

Don't use conn->net without checking if it is NULL, because
it can be NULL in OOM conditions. This would cause a crash.
---

diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c
index 37b7c1bf42..567570a3ab 100644
--- a/ext/mysqlnd/mysqlnd.c
+++ b/ext/mysqlnd/mysqlnd.c
@@ -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");