cvs: ZendEngine2 / zend_API.c
| From: | Marcus Boerger | Date: | Thu, 27 Nov 2003 19:24:38 +0000 |
| Subject: | cvs: ZendEngine2 / zend_API.c | ||
| Groups: | php.zend-engine.cvs | ||
| Request: | Send a blank email to php-zend-engine-cvs+get-2013@lists.php.net to get a copy of this message | ||
helly Thu Nov 27 14:24:38 2003 EDT
Modified files:
/ZendEngine2 zend_API.c
Log:
Convert objects to string if string is required by newer parameter parsing
since we do this for older parameter parsing does so too.
Index: ZendEngine2/zend_API.c
diff -u ZendEngine2/zend_API.c:1.225 ZendEngine2/zend_API.c:1.226
--- ZendEngine2/zend_API.c:1.225 Mon Nov 24 13:13:29 2003
+++ ZendEngine2/zend_API.c Thu Nov 27 14:24:38 2003
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_API.c,v 1.225 2003/11/24 18:13:29 andi Exp $ */
+/* $Id: zend_API.c,v 1.226 2003/11/27 19:24:38 helly Exp $ */
#include "zend.h"
#include "zend_execute.h"
@@ -316,8 +316,15 @@
*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) {
+ *pl = Z_STRLEN_PP(arg);
+ *p = Z_STRVAL_PP(arg);
+ break;
+ }
+ }
+
case IS_ARRAY:
- case IS_OBJECT:
case IS_RESOURCE:
default:
return "string";