Fixed unintended string duplication

dstogov · dstogov · commit 22019a1edd4b · 2021-04-05T17:55:42.000+03:00
diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c
@@ -1350,6 +1350,9 @@ static zend_string* accel_new_interned_key(zend_string *key)
 {
 	zend_string *new_key;
 
+	if (zend_accel_in_shm(key)) {
+		return key;
+	}
 	GC_ADDREF(key);
 	new_key = accel_new_interned_string(key);
 	if (UNEXPECTED(new_key == key)) {
diff --git a/ext/opcache/zend_persist_calc.c b/ext/opcache/zend_persist_calc.c
@@ -585,7 +585,7 @@ uint32_t zend_accel_script_persist_calc(zend_persistent_script *new_persistent_s
 	}
 
 	ADD_SIZE(sizeof(zend_persistent_script));
-	ADD_STRING(new_persistent_script->script.filename);
+	ADD_INTERNED_STRING(new_persistent_script->script.filename);
 
 #if defined(__AVX__) || defined(__SSE2__)
 	/* Align size to 64-byte boundary */

Original file line number	Diff line number	Diff line change
`@@ -1350,6 +1350,9 @@ static zend_string* accel_new_interned_key(zend_string *key)`
`1350`	`1350`	`{`
`1351`	`1351`	`zend_string *new_key;`
`1352`	`1352`
	`1353`	`+ if (zend_accel_in_shm(key)) {`
	`1354`	`+ return key;`
	`1355`	`+ }`
`1353`	`1356`	`GC_ADDREF(key);`
`1354`	`1357`	`new_key = accel_new_interned_string(key);`
`1355`	`1358`	`if (UNEXPECTED(new_key == key)) {`
Original file line number	Diff line number	Diff line change
`@@ -585,7 +585,7 @@ uint32_t zend_accel_script_persist_calc(zend_persistent_script *new_persistent_s`
`585`	`585`	`}`
`586`	`586`
`587`	`587`	`ADD_SIZE(sizeof(zend_persistent_script));`
`588`		`- ADD_STRING(new_persistent_script->script.filename);`
	`588`	`+ ADD_INTERNED_STRING(new_persistent_script->script.filename);`
`589`	`589`
`590`	`590`	`#if defined(__AVX__) \|\| defined(__SSE2__)`
`591`	`591`	`/* Align size to 64-byte boundary */`