Re: [PATCH] array_combine is not binary-key safe

Hi, ----- Original Message ----- From: "bertrand Gugger" Sent: Monday, July 24, 2006 > Matt W wrote: > > Hi Andrei, > > > > I see you applied my patch. > Testing with a php5.2-200607222030 snaps having > /* $Id: array.c,v 1.308.2.21.2.7 2006/07/22 16:58:39 andrei Exp $ */ > > Looks by me as the ext/standard/tests/array/array_combine.phpt fails > Is it by me ? > > $ diff -W 60 -y --suppress-common-lines > ext/standard/tests/array/array_combine.exp > ext/standard/tests/array/array_combine.out > [green] => green | [gree] => green > [red] => red | [re] => red > [yellow] => yellow | [yello] => yellow > [green] => 1 | [gree] => 1 > [red] => 2 | [re] => 2 > [yellow] => 3 | [yello] => 3 > [green] => 0 | [gree] => 0 > [red] => 1 | [re] => 1 > [yellow] => 2 | [yello] => 2 > [green] => 1 | [gree] => 1 > [red] => | [re] => > [yellow] => | [yello] => > [1] => green | [] => green > [2] => red | [] => red > [3] => yellow | [] => yellow > [1] => 1 | [] => 1 > [2] => 2 | [] => 2 > [3] => 3 | [] => 3 > [1] => 0 | [] => 0 > [2] => 1 | [] => 1 > [3] => 2 | [] => 2 > [1] => 1 | [] => 1 > [2] => | [] => > [3] => | [] => > > PHP : /home/bertrand/php/php5.2-200607222030/sapi/cli/php > PHP_SAPI : cli > PHP_VERSION : 5.2.0-dev > ZEND_VERSION: 2.2.0 > PHP_OS : Linux - Linux ancilla.toggg.net 2.6.12-1.1381_FC3 #1 Fri > Oct 21 03 :46:55 EDT 2005 i686 > > Configure Command => './configure' > > Sorry for the noise , case I did something wrong , but what ? > (or case it is repaired in the mean time) Nope, it's broken. :-) I was confused as to why Andrei only fully applied my patch for HEAD, and seemed to manually "take part of" the 5.2 patch (I thought the binary key change was unwanted in 5.2, but he did update it then). Now it needs a 4th update... *shrug* :-) Andrei, in the first add_assoc_zval_ex(), after Z_STRLEN_PP(entry_keys), you forgot the +1. > -- > toggg It wasn't your fault, good catch. ;-) Matt