cvs: php4(PHP_4_3) /ext/standard array.c

From: Date: Thu, 06 Feb 2003 15:28:28 +0000
Subject: cvs: php4(PHP_4_3) /ext/standard array.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-18462@lists.php.net to get a copy of this message
sniper Thu Feb 6 10:28:28 2003 EDT Modified files: (Branch: PHP_4_3) /php4/ext/standard array.c Log: MFH: - Fixed bug #22088 (array_shift() leaves next index to be +1 too much) Index: php4/ext/standard/array.c diff -u php4/ext/standard/array.c:1.199.2.13 php4/ext/standard/array.c:1.199.2.14 --- php4/ext/standard/array.c:1.199.2.13 Mon Feb 3 11:58:08 2003 +++ php4/ext/standard/array.c Thu Feb 6 10:28:28 2003 @@ -21,7 +21,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: array.c,v 1.199.2.13 2003/02/03 16:58:08 sniper Exp $ */ +/* $Id: array.c,v 1.199.2.14 2003/02/06 15:28:28 sniper Exp $ */ #include "php.h" #include "php_ini.h" @@ -1724,11 +1724,12 @@ int k = 0; Bucket *p = Z_ARRVAL_PP(stack)->pListHead; while (p != NULL) { - if (p->nKeyLength == 0) + if (p->nKeyLength == 0) { p->h = k++; + } p = p->pListNext; } - Z_ARRVAL_PP(stack)->nNextFreeElement = k+1; + Z_ARRVAL_PP(stack)->nNextFreeElement = k; zend_hash_rehash(Z_ARRVAL_PP(stack)); } else if (!key_len) { Z_ARRVAL_PP(stack)->nNextFreeElement = Z_ARRVAL_PP(stack)->nNextFreeElement - 1;

« previous php.cvs (#18462) next »