diff options
| author | Tjerk Meesters <datibbaw@php.net> | 2014-07-30 18:27:29 +0800 |
|---|---|---|
| committer | Tjerk Meesters <datibbaw@php.net> | 2014-07-30 18:27:29 +0800 |
| commit | f9258929201616750d418c629f7afdcfdab7dada (patch) | |
| tree | 430928bd8e5d2c5cd482eb6a080825e10fc65d20 /ext/standard/array.c | |
| parent | 8e13e502679fe6b8a1a8289d71b214684242e07e (diff) | |
| parent | 52f4587e8a7a977909ea96c6ea9e27718d87b227 (diff) | |
| download | php-git-f9258929201616750d418c629f7afdcfdab7dada.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Updated NEWS for #67693
Fixed bug #67693 - incorrect push to the empty array
Diffstat (limited to 'ext/standard/array.c')
| -rw-r--r-- | ext/standard/array.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/standard/array.c b/ext/standard/array.c index cbcaaf5b8b..2792b86f02 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -1893,7 +1893,7 @@ 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) { zend_hash_reindex(Z_ARRVAL_P(stack), 1); - } else if (!key_len && index >= Z_ARRVAL_P(stack)->nNextFreeElement - 1) { + } else if (!key_len && Z_ARRVAL_P(stack)->nNextFreeElement > 0 && index >= Z_ARRVAL_P(stack)->nNextFreeElement - 1) { Z_ARRVAL_P(stack)->nNextFreeElement = Z_ARRVAL_P(stack)->nNextFreeElement - 1; } |