cvs: php-src(PHP_5_3) /ext/mysqlnd mysqlnd_block_alloc.c

andrey Thu Jun 11 08:52:06 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/mysqlnd mysqlnd_block_alloc.c Log: MFH: Protect the code when variable is NULL, which should never happen, but anyway, you know about "never happens" :) http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_block_alloc.c?r1=1.1.2.5&r2=1.1.2.6&diff_format=u Index: php-src/ext/mysqlnd/mysqlnd_block_alloc.c diff -u php-src/ext/mysqlnd/mysqlnd_block_alloc.c:1.1.2.5 php-src/ext/mysqlnd/mysqlnd_block_alloc.c:1.1.2.6 --- php-src/ext/mysqlnd/mysqlnd_block_alloc.c:1.1.2.5 Wed Dec 31 11:15:39 2008 +++ php-src/ext/mysqlnd/mysqlnd_block_alloc.c Thu Jun 11 08:52:06 2009 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: mysqlnd_block_alloc.c,v 1.1.2.5 2008/12/31 11:15:39 sebastian Exp $ */ +/* $Id: mysqlnd_block_alloc.c,v 1.1.2.6 2009/06/11 08:52:06 andrey Exp $ */ #include "php.h" #include "mysqlnd.h" @@ -183,10 +183,12 @@ 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; } /* }}} */