summaryrefslogtreecommitdiff
path: root/ext/mysqlnd/mysqlnd.c
diff options
context:
space:
mode:
authorAndrey Hristov <andrey@php.net>2010-05-26 13:47:43 +0000
committerAndrey Hristov <andrey@php.net>2010-05-26 13:47:43 +0000
commitce136a825cc355ade2cfa360629e00bed6593eb8 (patch)
treec3446c3915ccf3bce70cdf0d55ed5523a580c95b /ext/mysqlnd/mysqlnd.c
parent0d468290be3673e89e00fd78766c045057521f4c (diff)
downloadphp-git-ce136a825cc355ade2cfa360629e00bed6593eb8.tar.gz
Don't use conn->net without checking if it is NULL, because
it can be NULL in OOM conditions. This would cause a crash.
Diffstat (limited to 'ext/mysqlnd/mysqlnd.c')
-rw-r--r--ext/mysqlnd/mysqlnd.c4
1 files changed, 3 insertions, 1 deletions
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");