svn: /php/php-src/trunk/Zend/ zend_hash.c
| From: | Dmitry Stogov | Date: | Fri, 15 Apr 2011 09:59:42 +0000 |
| Subject: | svn: /php/php-src/trunk/Zend/ zend_hash.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-64815@lists.php.net to get a copy of this message | ||
dmitry Fri, 15 Apr 2011 09:59:42 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=310233
Log:
Changed initialization order to workaround against crashes after memory overflow
Changed paths:
U php/php-src/trunk/Zend/zend_hash.c
Modified: php/php-src/trunk/Zend/zend_hash.c
===================================================================
--- php/php-src/trunk/Zend/zend_hash.c 2011-04-15 09:57:43 UTC (rev 310232)
+++ php/php-src/trunk/Zend/zend_hash.c 2011-04-15 09:59:42 UTC (rev 310233)
@@ -138,8 +138,8 @@
#define CHECK_INIT(ht) do { \
if (UNEXPECTED((ht)->nTableMask == 0)) { \
+ (ht)->arBuckets = (Bucket **) pecalloc((ht)->nTableSize, sizeof(Bucket *),
(ht)->persistent); \
(ht)->nTableMask = (ht)->nTableSize - 1; \
- (ht)->arBuckets = (Bucket **) pecalloc((ht)->nTableSize, sizeof(Bucket *),
(ht)->persistent); \
} \
} while (0)