cvs: ZendEngine2(PHP_5_0) / zend_API.c
| From: | Andi Gutmans | Date: | Thu, 09 Sep 2004 02:44:17 +0000 |
| Subject: | cvs: ZendEngine2(PHP_5_0) / zend_API.c | ||
| Groups: | php.zend-engine.cvs | ||
| Request: | Send a blank email to php-zend-engine-cvs+get-2936@lists.php.net to get a copy of this message | ||
andi Wed Sep 8 22:44:17 2004 EDT
Modified files: (Branch: PHP_5_0)
/ZendEngine2 zend_API.c
Log:
- MFH
http://cvs.php.net/diff.php/ZendEngine2/zend_API.c?r1=1.256.2.1&r2=1.256.2.2&ty=u
Index: ZendEngine2/zend_API.c
diff -u ZendEngine2/zend_API.c:1.256.2.1 ZendEngine2/zend_API.c:1.256.2.2
--- ZendEngine2/zend_API.c:1.256.2.1 Sat Sep 4 13:04:23 2004
+++ ZendEngine2/zend_API.c Wed Sep 8 22:44:17 2004
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_API.c,v 1.256.2.1 2004/09/04 17:04:23 andi Exp $ */
+/* $Id: zend_API.c,v 1.256.2.2 2004/09/09 02:44:17 andi Exp $ */
#include "zend.h"
#include "zend_execute.h"
@@ -316,12 +316,13 @@
*pl = Z_STRLEN_PP(arg);
break;
case IS_OBJECT: {
- if (Z_OBJ_HANDLER_PP(arg, cast_object)
- && Z_OBJ_HANDLER_PP(arg, cast_object)(*arg, *arg, IS_STRING, 0 TSRMLS_CC) ==
SUCCESS) {
+ if (Z_OBJ_HANDLER_PP(arg, cast_object)) {
SEPARATE_ZVAL_IF_NOT_REF(arg);
- *pl = Z_STRLEN_PP(arg);
- *p = Z_STRVAL_PP(arg);
- break;
+ if (Z_OBJ_HANDLER_PP(arg, cast_object)(*arg, *arg, IS_STRING, 0 TSRMLS_CC) == SUCCESS) {
+ *pl = Z_STRLEN_PP(arg);
+ *p = Z_STRVAL_PP(arg);
+ break;
+ }
}
}