clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 10:27:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

array_pop wasnt setting next index

Browse Source
This commit is contained in:
Brad LaFountain 2002-08-01 17:34:31 +00:00
parent 922b7596a2
commit 9b0553c390
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ext/standard/array.c
View File

@ -1663,7 +1663,7 @@ static void _phpi_pop(INTERNAL_FUNCTION_PARAMETERS, int off_the_end)
zval **stack, /* Input stack */
**val; /* Value to be popped */
char *key = NULL;
int key_len;
int key_len = 0;
ulong index;
/* Get the arguments and do error-checking */
@ -1696,19 +1696,16 @@ static void _phpi_pop(INTERNAL_FUNCTION_PARAMETERS, int off_the_end)
/* If we did a shift... re-index like it did before */
if (!off_the_end) {
HANDLE_BLOCK_INTERRUPTIONS();
{
int k = 0;
Bucket *p = Z_ARRVAL_PP(stack)->pListHead;
while (p != NULL) {
if (p->nKeyLength == 0)
p->h = k++;
p = p->pListNext;
}
Z_ARRVAL_PP(stack)->nNextFreeElement = k+1;
zend_hash_rehash(Z_ARRVAL_PP(stack));
int k = 0;
Bucket *p = Z_ARRVAL_PP(stack)->pListHead;
while (p != NULL) {
if (p->nKeyLength == 0)
p->h = k++;
p = p->pListNext;
}
HANDLE_UNBLOCK_INTERRUPTIONS();
Z_ARRVAL_PP(stack)->nNextFreeElement = k+1;
} else if(!key_len) {
Z_ARRVAL_PP(stack)->nNextFreeElement = Z_ARRVAL_PP(stack)->nNextFreeElement - 1;
}
}
/* }}} */