summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXinchen Hui <laruence@php.net>2015-03-14 11:32:09 +0800
committerXinchen Hui <laruence@php.net>2015-03-14 11:32:09 +0800
commit9420a2a5b0079ddc9ff6db31f7ebcf3e869a0717 (patch)
tree9ec4daf096c2b64cf6e00d48c2a8e7b47221e0e6
parente78971cd7bd53b0d18dacedd88f3daaae9aa592f (diff)
parent96bb3b838c5cbeafa1328c65fbe33be1c340572b (diff)
downloadphp-git-9420a2a5b0079ddc9ff6db31f7ebcf3e869a0717.tar.gz
Merge branch 'PHP-5.6'
-rw-r--r--ext/spl/spl_observer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/spl/spl_observer.c b/ext/spl/spl_observer.c
index 14a0bade71..619ed3883a 100644
--- a/ext/spl/spl_observer.c
+++ b/ext/spl/spl_observer.c
@@ -363,7 +363,7 @@ static HashTable *spl_object_storage_get_gc(zval *obj, zval **table, int *n) /*
spl_SplObjectStorage *intern = Z_SPLOBJSTORAGE_P(obj);
spl_SplObjectStorageElement *element;
- 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);
}