Merge branch 'PHP-5.5' into PHP-5.6

laruence · laruence · commit 96bb3b838c5c · 2015-03-14T11:31:53.000+08:00
diff --git 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);
 	}

Original file line number	Diff line number	Diff line change
`@@ -374,7 +374,7 @@ static HashTable spl_object_storage_get_gc(zval obj, zval **table, int n TSR`
`374`	`374`	`spl_SplObjectStorageElement *element;`
`375`	`375`	`HashPosition pos;`
`376`	`376`
`377`		`- if (intern->storage.nNumOfElements > intern->gcdata_num) {`
	`377`	`+ if (intern->storage.nNumOfElements * 2 > intern->gcdata_num) {`
`378`	`378`	`intern->gcdata_num = intern->storage.nNumOfElements * 2;`
`379`	`379`	`intern->gcdata = (zval*)erealloc(intern->gcdata, sizeof(zval) * intern->gcdata_num);`
`380`	`380`	`}`