From: Andrey Hristov <andrey@php.net>
Date: Thu, 11 Jun 2009 08:52:06 +0000 (+0000)
Subject: MFH:
X-Git-Tag: php-5.3.0RC4~94
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=28c8d25dca97d0316458c86509301e948994f3db;p=php

MFH:
Protect the code when variable is NULL, which should never happen, but
anyway, you know about "never happens" :)
---

diff --git a/ext/mysqlnd/mysqlnd_block_alloc.c b/ext/mysqlnd/mysqlnd_block_alloc.c
index 2dcedcbfe6..4943624f47 100644
--- a/ext/mysqlnd/mysqlnd_block_alloc.c
+++ b/ext/mysqlnd/mysqlnd_block_alloc.c
@@ -183,10 +183,12 @@ void
 mysqlnd_mempool_destroy(MYSQLND_MEMORY_POOL * pool TSRMLS_DC)
 {
 	DBG_ENTER("mysqlnd_mempool_destroy");
-	/* mnd_free will reference LOCK_access and might crash, depending on the caller...*/
-	mysqlnd_mempool_free_contents(pool TSRMLS_CC);
-	mnd_free(pool->arena);
-	mnd_free(pool);
+	if (pool) {
+		/* mnd_free will reference LOCK_access and might crash, depending on the caller...*/
+		mysqlnd_mempool_free_contents(pool TSRMLS_CC);
+		mnd_free(pool->arena);
+		mnd_free(pool);
+	}
 	DBG_VOID_RETURN;
 }
 /* }}} */