Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:18994 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 52136 invoked by uid 1010); 15 Sep 2005 15:08:56 -0000 Delivered-To: ezmlm-scan-internals@lists.php.net Delivered-To: ezmlm-internals@lists.php.net Received: (qmail 52121 invoked from network); 15 Sep 2005 15:08:56 -0000 Received: from unknown (HELO lists.php.net) (127.0.0.1) by localhost with SMTP; 15 Sep 2005 15:08:56 -0000 X-Host-Fingerprint: 80.74.107.235 mail.zend.com Linux 2.5 (sometimes 2.4) (4) Received: from ([80.74.107.235:41296] helo=mail.zend.com) by pb1.pair.com (ecelerity 2.0 beta r(6323M)) with SMTP id 83/5E-41173-78E89234 for ; Thu, 15 Sep 2005 11:08:56 -0400 Received: (qmail 23465 invoked from network); 15 Sep 2005 15:08:52 -0000 Received: from internal.zend.office (HELO ?127.0.0.1?) (10.1.1.1) by internal.zend.office with SMTP; 15 Sep 2005 15:08:52 -0000 Message-ID: <43298E87.3080501@zend.com> Date: Thu, 15 Sep 2005 19:08:55 +0400 User-Agent: Thunderbird 1.4 (X11/20050907) MIME-Version: 1.0 To: Zeev Suraski CC: internals@lists.php.net References: <5.1.0.14.2.20050914142002.050b9cc0@localhost> In-Reply-To: <5.1.0.14.2.20050914142002.050b9cc0@localhost> Content-Type: multipart/mixed; boundary="------------090009080201010407000402" Subject: PATCH for typo in zend_compile.c (was 5.1.0RC2) From: antony@zend.com (Antony Dovgal) --------------090009080201010407000402 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit On 14.09.2005 15:20, Zeev Suraski wrote: > Any last minute additions to 5.1.0RC2 or can we roll it? It seems that #27145 has crept back into 5.1 with a copy/paste typo. Here is the patch for it too. -- Wbr, Antony Dovgal --------------090009080201010407000402 Content-Type: text/plain; name="patch.diff" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="patch.diff" Index: Zend/zend_compile.c =================================================================== RCS file: /repository/ZendEngine2/zend_compile.c,v retrieving revision 1.647.2.4 diff -u -p -d -r1.647.2.4 zend_compile.c --- Zend/zend_compile.c 9 Sep 2005 06:48:47 -0000 1.647.2.4 +++ Zend/zend_compile.c 15 Sep 2005 14:53:39 -0000 @@ -2062,7 +2062,7 @@ static zend_bool do_inherit_property_acc } if (zend_hash_find(ht, prot_name, prot_name_length+1, (void**)&prop) == SUCCESS) { zval **new_prop; - if (zend_hash_find(ht, child_info->name, child_info->name_length+1, (void**)&new_prop) == SUCCESS) { + if (zend_hash_find(ce->static_members, child_info->name, child_info->name_length+1, (void**)&new_prop) == SUCCESS) { if (Z_TYPE_PP(new_prop) != IS_NULL && Z_TYPE_PP(prop) != IS_NULL) { char *prop_name, *tmp; zend_unmangle_property_name(child_info->name, &tmp, &prop_name); --------------090009080201010407000402--