diff options
| author | Xinchen Hui <laruence@php.net> | 2015-03-14 11:31:53 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2015-03-14 11:31:53 +0800 |
| commit | 96bb3b838c5cbeafa1328c65fbe33be1c340572b (patch) | |
| tree | 635e277319be271273ee24a4915a38217ea5f810 | |
| parent | 669c7104c3dbac643697382bdb924f26ee99ecd4 (diff) | |
| parent | 5b87d5204108f78d433880b12b941ba8fba10e62 (diff) | |
| download | php-git-96bb3b838c5cbeafa1328c65fbe33be1c340572b.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
| -rw-r--r-- | ext/spl/spl_observer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/spl/spl_observer.c b/ext/spl/spl_observer.c index 56d1a16ac0..cf8663632b 100644 --- a/ext/spl/spl_observer.c +++ b/ext/spl/spl_observer.c @@ -374,7 +374,7 @@ static HashTable *spl_object_storage_get_gc(zval *obj, zval ***table, int *n TSR spl_SplObjectStorageElement *element; HashPosition pos; - if (intern->storage.nNumOfElements > intern->gcdata_num) { + if (intern->storage.nNumOfElements * 2 > intern->gcdata_num) { intern->gcdata_num = intern->storage.nNumOfElements * 2; intern->gcdata = (zval**)erealloc(intern->gcdata, sizeof(zval*) * intern->gcdata_num); } |