cvs: ZendEngine2 / zend_execute.c

helly Fri Jul 23 03:13:56 2004 EDT Modified files: /ZendEngine2 zend_execute.c Log: Fix 0 Byte leak after alloca to emalloc change http://cvs.php.net/diff.php/ZendEngine2/zend_execute.c?r1=1.654&r2=1.655&ty=u Index: ZendEngine2/zend_execute.c diff -u ZendEngine2/zend_execute.c:1.654 ZendEngine2/zend_execute.c:1.655 --- ZendEngine2/zend_execute.c:1.654 Mon Jul 19 03:19:01 2004 +++ ZendEngine2/zend_execute.c Fri Jul 23 03:13:54 2004 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_execute.c,v 1.654 2004/07/19 07:19:01 andi Exp $ */ +/* $Id: zend_execute.c,v 1.655 2004/07/23 07:13:54 helly Exp $ */ #define ZEND_INTENSIVE_DEBUGGING 0 @@ -1330,7 +1330,7 @@ } #define RETURN_FROM_EXECUTE_LOOP(execute_data) \ - efree(EX(Ts)); \ + if (EX(Ts)) efree(EX(Ts)); \ EG(in_execution) = EX(original_in_execution); \ EG(current_execute_data) = EX(prev_execute_data); \ return 1; /* CHECK_ME */ @@ -1349,7 +1349,7 @@ /* Initialize execute_data */ EX(fbc) = NULL; EX(object) = NULL; - EX(Ts) = (temp_variable *) safe_emalloc(sizeof(temp_variable), op_array->T, 0); + EX(Ts) = (temp_variable *) (op_array->T ? safe_emalloc(sizeof(temp_variable), op_array->T, 0) : NULL); EX(op_array) = op_array; EX(original_in_execution) = EG(in_execution); EX(prev_execute_data) = EG(current_execute_data);