From: Dmitry Stogov <dmitry@php.net>
Date: Fri, 9 Jul 2010 07:31:18 +0000 (+0000)
Subject: zend_ptr_stack allocation is delayed before the actual usage
X-Git-Tag: php-5.4.0alpha1~191^2~1189
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bc1f1d25fa30805a8f4208829cad241880a486ab;p=php

zend_ptr_stack allocation is delayed before the actual usage
---

diff --git a/NEWS b/NEWS
index 712366b66d..000f8972e7 100644
--- a/NEWS
+++ b/NEWS
@@ -18,7 +18,7 @@ PHP                                                                        NEWS
     A constant class name may be used as a direct operand of ZEND_FETCH_*
     instruction without previous ZEND_FETCH_CLASS.
   . eliminated unnecessary iterations during request startup/shutdown
-  . zend_stack initialization is delayed before the actual usage
+  . zend_stack and zend_ptr_stack allocation is delayed before the actual usage
   . $GLOBALS became a JIT autoglobal, so it's initialized only if used
     (this may affect opcode caches)
 - Added concept of interned strings. All strings constants known at compile
diff --git a/Zend/zend_ptr_stack.c b/Zend/zend_ptr_stack.c
index 0d4556d9ed..af345987f7 100644
--- a/Zend/zend_ptr_stack.c
+++ b/Zend/zend_ptr_stack.c
@@ -27,9 +27,8 @@
 
 ZEND_API void zend_ptr_stack_init_ex(zend_ptr_stack *stack, zend_bool persistent)
 {
-	stack->top_element = stack->elements = (void **) pemalloc(sizeof(void *)*PTR_STACK_BLOCK_SIZE, persistent);
-	stack->max = PTR_STACK_BLOCK_SIZE;
-	stack->top = 0;
+	stack->top_element = stack->elements = NULL;
+	stack->top = stack->max = 0;
 	stack->persistent = persistent;
 }
 
diff --git a/Zend/zend_ptr_stack.h b/Zend/zend_ptr_stack.h
index affe7d037b..8f2828d54a 100644
--- a/Zend/zend_ptr_stack.h
+++ b/Zend/zend_ptr_stack.h
@@ -46,8 +46,9 @@ END_EXTERN_C()
 #define ZEND_PTR_STACK_RESIZE_IF_NEEDED(stack, count)		\
 	if (stack->top+count > stack->max) {					\
 		/* we need to allocate more memory */				\
-		stack->max *= 2;									\
-		stack->max += count;								\
+		do {												\
+			stack->max += PTR_STACK_BLOCK_SIZE;				\
+		} while (stack->top+count > stack->max);			\
 		stack->elements = (void **) perealloc(stack->elements, (sizeof(void *) * (stack->max)), stack->persistent);	\
 		stack->top_element = stack->elements+stack->top;	\
 	}