cvs: ZendEngine2 / zend_execute_API.c
| From: | Marcus Boerger | Date: | Wed, 10 Dec 2003 10:24:36 +0000 |
| Subject: | cvs: ZendEngine2 / zend_execute_API.c | ||
| Groups: | php.zend-engine.cvs | ||
| Request: | Send a blank email to php-zend-engine-cvs+get-2088@lists.php.net to get a copy of this message | ||
helly Wed Dec 10 05:24:36 2003 EDT
Modified files:
/ZendEngine2 zend_execute_API.c
Log:
Do not double copy the string
Index: ZendEngine2/zend_execute_API.c
diff -u ZendEngine2/zend_execute_API.c:1.241 ZendEngine2/zend_execute_API.c:1.242
--- ZendEngine2/zend_execute_API.c:1.241 Mon Nov 24 13:13:29 2003
+++ ZendEngine2/zend_execute_API.c Wed Dec 10 05:24:35 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_execute_API.c,v 1.241 2003/11/24 18:13:29 andi Exp $ */
+/* $Id: zend_execute_API.c,v 1.242 2003/12/10 10:24:35 helly Exp $ */
#include <stdio.h>
#include <signal.h>
@@ -619,7 +619,7 @@
EX(function_state).function = calling_scope->__call;
/* prepare params */
ALLOC_INIT_ZVAL(method_name);
- ZVAL_STRING(method_name, function_name_lc, 1);
+ ZVAL_STRINGL(method_name, function_name_lc, fci->function_name->value.str.len, 0);
ALLOC_INIT_ZVAL(params_array);
array_init(params_array);
@@ -628,8 +628,9 @@
efree(function_name_lc);
return FAILURE;
}
+ } else {
+ efree(function_name_lc);
}
- efree(function_name_lc);
if (fci_cache) {
fci_cache->function_handler = EX(function_state).function;
fci_cache->object_pp = fci->object_pp;