Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:25024 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 24382 invoked by uid 1010); 28 Jul 2006 01:14:15 -0000 Delivered-To: ezmlm-scan-internals@lists.php.net Delivered-To: ezmlm-internals@lists.php.net Received: (qmail 24367 invoked from network); 28 Jul 2006 01:14:15 -0000 Received: from unknown (HELO lists.php.net) (127.0.0.1) by localhost with SMTP; 28 Jul 2006 01:14:15 -0000 X-PHP-List-Original-Sender: php_lists@realplain.com X-Host-Fingerprint: 209.142.136.132 msa2-mx.centurytel.net Linux 2.4/2.6 Received: from ([209.142.136.132:55946] helo=msa2-mx.centurytel.net) by pb1.pair.com (ecelerity 2.1.1.3 r(11751M)) with ESMTP id B7/72-23194-0E469C44 for ; Thu, 27 Jul 2006 21:14:10 -0400 Received: from pc1 (72-161-144-130.dyn.centurytel.net [72.161.144.130]) by msa2-mx.centurytel.net (8.13.6/8.13.6) with SMTP id k6S1E4uu017018; Thu, 27 Jul 2006 20:14:04 -0500 Message-ID: <005b01c6b1e3$1ecb2480$0201a8c0@pc1> To: , "Andrei Zmievski" Date: Thu, 27 Jul 2006 20:14:05 -0500 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_NextPart_000_0058_01C6B1B9.359A7960" X-Priority: 3 X-MSMail-Priority: Normal X-Mailer: Microsoft Outlook Express 6.00.2800.1807 X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2800.1807 Subject: array_merge[_recursive] is not binary-key safe (patch) From: php_lists@realplain.com ("Matt W") ------=_NextPart_000_0058_01C6B1B9.359A7960 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Hi, Happened to notice this. Only in 5.2. Thanks, Matt ------=_NextPart_000_0058_01C6B1B9.359A7960 Content-Type: text/plain; name="array_merge_binkey.diff.txt" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="array_merge_binkey.diff.txt" Index: ext/standard/array.c=0A= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=0A= RCS file: /repository/php-src/ext/standard/array.c,v=0A= retrieving revision 1.308.2.21.2.8=0A= diff -u -r1.308.2.21.2.8 array.c=0A= --- ext/standard/array.c 24 Jul 2006 18:18:33 -0000 1.308.2.21.2.8=0A= +++ ext/standard/array.c 28 Jul 2006 01:00:00 -0000=0A= @@ -2328,7 +2328,7 @@=0A= } else {=0A= (*src_entry)->refcount++;=0A= =0A= - zend_hash_update(dest, string_key, strlen(string_key)+1,=0A= + zend_hash_update(dest, string_key, string_key_len,=0A= src_entry, sizeof(zval *), NULL);=0A= }=0A= break;=0A= ------=_NextPart_000_0058_01C6B1B9.359A7960--