cvs: ZendEngine2(PHP_5_3) / zend_execute_API.c
[email protected] ("Matt Wilmas") Thu, 19 Mar 2009 18:34:16 -0000
| Newsgroups | php.zend-engine.cvs |
|---|---|
| Message-ID | <cvsmattwil1237487656@cvsserver> |
mattwil Thu Mar 19 18:34:16 2009 UTC
Modified files: (Branch: PHP_5_3)
/ZendEngine2 zend_execute_API.c
Log:
MFH: Removed extra space from eval string
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_execute_API.c?r1=1.331.2.20.2.24.2.74&r2=1.331.2.20.2.24.2.75&diff_format=u
Index: ZendEngine2/zend_execute_API.c
diff -u ZendEngine2/zend_execute_API.c:1.331.2.20.2.24.2.74 ZendEngine2/zend_execute_API.c:1.331.2.20.2.24.2.75
--- ZendEngine2/zend_execute_API.c:1.331.2.20.2.24.2.74 Wed Mar 18 10:41:39 2009
+++ ZendEngine2/zend_execute_API.c Thu Mar 19 18:34:16 2009
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_execute_API.c,v 1.331.2.20.2.24.2.74 2009/03/18 10:41:39 dmitry Exp $ */
+/* $Id: zend_execute_API.c,v 1.331.2.20.2.24.2.75 2009/03/19 18:34:16 mattwil Exp $ */
#include <stdio.h>
#include <signal.h>
@@ -1123,11 +1123,10 @@
if (retval_ptr) {
int l = strlen(str);
- Z_STRLEN(pv) = l + sizeof("return ;") - 1;
+ Z_STRLEN(pv) = l + sizeof("return ;") - 1;
Z_STRVAL(pv) = emalloc(Z_STRLEN(pv) + 1);
memcpy(Z_STRVAL(pv), "return ", sizeof("return ") - 1);
memcpy(Z_STRVAL(pv) + sizeof("return ") - 1, str, l);
- Z_STRVAL(pv)[Z_STRLEN(pv) - 2] = ' ';
Z_STRVAL(pv)[Z_STRLEN(pv) - 1] = ';';
Z_STRVAL(pv)[Z_STRLEN(pv)] = '\0';
} else {