Fix bug #69838 OPCACHE Warning Internal error: wrong size calculation

weltling · weltling · commit f88aad418e4e · 2015-06-20T09:35:01.000+02:00
This chunk is pre calculated with aligned size, so should it use it
at run time.
diff --git a/ext/opcache/zend_persist.c b/ext/opcache/zend_persist.c
@@ -94,7 +94,7 @@ static void zend_hash_persist(HashTable *ht, zend_persist_func_t pPersistElement
 		}
 		ht->nTableMask = -hash_size;
 		HT_SET_DATA_ADDR(ht, ZCG(mem));
-		ZCG(mem) = (void*)((char*)ZCG(mem) + (hash_size * sizeof(uint32_t)) + (ht->nNumUsed * sizeof(Bucket)));
+		ZCG(mem) = (void*)((char*)ZCG(mem) + ZEND_ALIGNED_SIZE((hash_size * sizeof(uint32_t)) + (ht->nNumUsed * sizeof(Bucket))));
 		HT_HASH_RESET(ht);
 		memcpy(ht->arData, old_buckets, ht->nNumUsed * sizeof(Bucket));
 		efree(old_data);

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ static void zend_hash_persist(HashTable *ht, zend_persist_func_t pPersistElement`
`94`	`94`	`}`
`95`	`95`	`ht->nTableMask = -hash_size;`
`96`	`96`	`HT_SET_DATA_ADDR(ht, ZCG(mem));`
`97`		`- ZCG(mem) = (void)((char)ZCG(mem) + (hash_size * sizeof(uint32_t)) + (ht->nNumUsed * sizeof(Bucket)));`
	`97`	`+ ZCG(mem) = (void)((char)ZCG(mem) + ZEND_ALIGNED_SIZE((hash_size * sizeof(uint32_t)) + (ht->nNumUsed * sizeof(Bucket))));`
`98`	`98`	`HT_HASH_RESET(ht);`
`99`	`99`	`memcpy(ht->arData, old_buckets, ht->nNumUsed * sizeof(Bucket));`
`100`	`100`	`efree(old_data);`