Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:23227 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 99520 invoked by uid 1010); 10 May 2006 14:34:08 -0000 Delivered-To: ezmlm-scan-internals@lists.php.net Delivered-To: ezmlm-internals@lists.php.net Received: (qmail 99504 invoked from network); 10 May 2006 14:34:08 -0000 Received: from unknown (HELO lists.php.net) (127.0.0.1) by localhost with SMTP; 10 May 2006 14:34:08 -0000 X-PHP-List-Original-Sender: rrichards@ctindustries.net X-Host-Fingerprint: 216.117.147.250 unknown Linux 2.4/2.6 Received: from ([216.117.147.250:50440] helo=ctindustries.net) by pb1.pair.com (ecelerity 2.0 beta r(6323M)) with SMTP id 79/B4-19568-FD9F1644 for ; Wed, 10 May 2006 10:34:07 -0400 Received: from [127.0.0.1] (dsta-aa203.pivot.net [66.186.171.203]) (authenticated bits=0) by ctindustries.net (8.12.8/8.12.8) with ESMTP id k4AEXgPI007415 for ; Wed, 10 May 2006 10:33:43 -0400 Message-ID: <4461FA24.1040007@ctindustries.net> Date: Wed, 10 May 2006 10:35:16 -0400 User-Agent: Thunderbird 1.5.0.2 (Windows/20060308) MIME-Version: 1.0 To: internals Content-Type: multipart/mixed; boundary="------------000507010500010904090702" X-Antivirus: avast! (VPS 0619-0, 05/08/2006), Outbound message X-Antivirus-Status: Clean X-Virus-Scanned: ClamAV 0.88.1/1453/Wed May 10 03:10:59 2006 on ctindustries.net X-Virus-Status: Clean Subject: patch: zend.c missing call for cast_object handler From: rrichards@ctindustries.net (Rob Richards) --------------000507010500010904090702 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit In zend_make_printable_zval, it looks like code for an object's cast_object handler was missed when synching. Rob --------------000507010500010904090702 Content-Type: text/plain; name="zend.c.diff.txt" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="zend.c.diff.txt" Index: zend.c =================================================================== RCS file: /repository/ZendEngine2/zend.c,v retrieving revision 1.308.2.12.2.1 diff -u -r1.308.2.12.2.1 zend.c --- zend.c 9 May 2006 23:53:22 -0000 1.308.2.12.2.1 +++ zend.c 10 May 2006 14:28:49 -0000 @@ -221,6 +221,9 @@ { TSRMLS_FETCH(); + if(Z_OBJ_HT_P(expr)->cast_object && Z_OBJ_HANDLER_P(expr, cast_object)(expr, expr_copy, IS_STRING TSRMLS_CC) == SUCCESS) { + break; + } /* Standard PHP objects */ if (Z_OBJ_HT_P(expr) == &std_object_handlers || !Z_OBJ_HT_P(expr)->cast_object) { if (zend_std_cast_object_tostring(expr, expr_copy, IS_STRING TSRMLS_CC) == SUCCESS) { --------------000507010500010904090702--