From: Dmitry Stogov <dmitry@php.net>
Date: Fri, 15 Apr 2011 09:59:42 +0000 (+0000)
Subject: Changed initialization order to workaround against crashes after memory overflow
X-Git-Tag: php-5.4.0alpha1~191^2~67
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8fe3ea75cb2fc9fe3b6e58340a07aa61f89079b2;p=php

Changed initialization order to workaround against crashes after memory overflow
---

diff --git a/Zend/zend_hash.c b/Zend/zend_hash.c
index f073dcd101..4ee3cdeb5c 100644
--- a/Zend/zend_hash.c
+++ b/Zend/zend_hash.c
@@ -138,8 +138,8 @@ ZEND_API ulong zend_hash_func(const char *arKey, uint nKeyLength)
 
 #define CHECK_INIT(ht) do {												\
 	if (UNEXPECTED((ht)->nTableMask == 0)) {								\
-		(ht)->nTableMask = (ht)->nTableSize - 1;						\
 		(ht)->arBuckets = (Bucket **) pecalloc((ht)->nTableSize, sizeof(Bucket *), (ht)->persistent);	\
+		(ht)->nTableMask = (ht)->nTableSize - 1;						\
 	}																	\
 } while (0)