cvs: ZendEngine2(PHP_5_2) / zend_ini.c
| From: | Dmitry Stogov | Date: | Fri, 19 May 2006 15:31:25 +0000 |
| Subject: | cvs: ZendEngine2(PHP_5_2) / zend_ini.c | ||
| Groups: | php.zend-engine.cvs | ||
| Request: | Send a blank email to php-zend-engine-cvs+get-4902@lists.php.net to get a copy of this message | ||
dmitry Fri May 19 15:31:25 2006 UTC
Modified files: (Branch: PHP_5_2)
/ZendEngine2 zend_ini.c
Log:
Fixed random crashes in ZTS mode becouse of uninitialized EG(modified_ini_directives).
http://cvs.php.net/viewcvs.cgi/ZendEngine2/zend_ini.c?r1=1.39.2.2.2.1&r2=1.39.2.2.2.2&diff_format=u
Index: ZendEngine2/zend_ini.c
diff -u ZendEngine2/zend_ini.c:1.39.2.2.2.1 ZendEngine2/zend_ini.c:1.39.2.2.2.2
--- ZendEngine2/zend_ini.c:1.39.2.2.2.1 Mon May 15 14:52:35 2006
+++ ZendEngine2/zend_ini.c Fri May 19 15:31:25 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_ini.c,v 1.39.2.2.2.1 2006/05/15 14:52:35 dmitry Exp $ */
+/* $Id: zend_ini.c,v 1.39.2.2.2.2 2006/05/19 15:31:25 dmitry Exp $ */
#include "zend.h"
#include "zend_qsort.h"
@@ -120,6 +120,7 @@
{
zend_ini_entry ini_entry;
+ EG(modified_ini_directives) = NULL;
EG(ini_directives) = (HashTable *) malloc(sizeof(HashTable));
if (zend_hash_init_ex(EG(ini_directives), registered_zend_ini_directives->nNumOfElements, NULL,
NULL, 1, 0)==FAILURE) {
return FAILURE;