Use zend_string_concat helper instead of strpprintf

Girgias · Girgias · commit 8e51cfe0ae40 · 2023-04-06T14:56:42.000+01:00
diff --git a/ext/phar/func_interceptors.c b/ext/phar/func_interceptors.c
@@ -137,10 +137,14 @@ static zend_string* phar_get_name_for_relative_paths(zend_string *filename, bool
 				goto notfound;
 			}
 		}
-		// TODO Known sizes use string concat helper
 		/* auto-convert to phar:// */
 		if (entry[0] == '/') {
-			name = strpprintf(4096, "phar://%s%s", arch, entry);
+			ZEND_ASSERT(strlen("phar://") + arch_len + entry_len < 4096);
+			name = zend_string_concat3(
+				"phar://", strlen("phar://"),
+				arch, arch_len,
+				entry, entry_len
+			);
 		} else {
 			name = strpprintf(4096, "phar://%s/%s", arch, entry);
 		}

Original file line number	Diff line number	Diff line change
`@@ -137,10 +137,14 @@ static zend_string* phar_get_name_for_relative_paths(zend_string *filename, bool`
`137`	`137`	`goto notfound;`
`138`	`138`	`}`
`139`	`139`	`}`
`140`		`- // TODO Known sizes use string concat helper`
`141`	`140`	`/* auto-convert to phar:// */`
`142`	`141`	`if (entry[0] == '/') {`
`143`		`- name = strpprintf(4096, "phar://%s%s", arch, entry);`
	`142`	`+ ZEND_ASSERT(strlen("phar://") + arch_len + entry_len < 4096);`
	`143`	`+ name = zend_string_concat3(`
	`144`	`+ "phar://", strlen("phar://"),`
	`145`	`+ arch, arch_len,`
	`146`	`+ entry, entry_len`
	`147`	`+ );`
`144`	`148`	`} else {`
`145`	`149`	`name = strpprintf(4096, "phar://%s/%s", arch, entry);`
`146`	`150`	`}`