Fixed bug #34062 (Crash in catch block when many arguments are used)

php · Aug 10, 2005 · 5743a33 · 5743a33
1 parent 9183f91
commit 5743a33
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/NEWS b/NEWS
@@ -21,6 +21,8 @@ PHP                                                                        NEWS
 - Fixed segfaults when CURL callback functions throw exception. (Tony)
 - Fixed bug #34064 (arr[] as param to function is allowed only if function 
   receives argument by reference). (Dmitry)
+- Fixed bug #34062 (Crash in catch block when many arguments are used).
+  (Dmitry)
 - Fixed bug #33989 (extract($GLOBALS,EXTR_REFS) crashes PHP). (Dmitry)
 - Fixed bug #33940 (array_map() fails to pass by reference when called
   recursively). (Dmitry)

diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
@@ -4381,6 +4381,7 @@ int zend_handle_exception_handler(ZEND_OPCODE_HANDLER_ARGS)
 	while (*stack_zval_pp != NULL) {
 		zval_ptr_dtor(stack_zval_pp);
 		EG(argument_stack).top_element--;
+		EG(argument_stack).top--;
 		stack_zval_pp--;
 	}