diff options
| author | Ondřej Surý <ondrej@sury.org> | 2014-08-25 11:37:32 +0200 |
|---|---|---|
| committer | Ondřej Surý <ondrej@sury.org> | 2014-08-25 11:37:32 +0200 |
| commit | 4b01785e700724da58ab36336a92a44c5d8246a8 (patch) | |
| tree | 94beaa316d16d2a191164f26efc78b3a744718d0 /ext/standard/array.c | |
| parent | 66921ccd8c83bce7c509b6f005951c2fac8fbb80 (diff) | |
| download | php-upstream/5.4.32.tar.gz | |
New upstream version 5.4.32upstream/5.4.32
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 c2efca58f..06cac0e64 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -2020,7 +2020,7 @@ static void _phpi_pop(INTERNAL_FUNCTION_PARAMETERS, int off_the_end) if (should_rehash) { zend_hash_rehash(Z_ARRVAL_P(stack)); } - } 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; } |