ext/phar/utils.c: Change if guard to assertion in phar_get_link_location()

Girgias · Girgias · commit ce3a2406d80a · 2026-04-17T19:04:51.000+01:00
This condition is checked before calling it at the unique call site, effectively being dead code.
An assertion is clearer.
diff --git a/ext/phar/util.c b/ext/phar/util.c
@@ -41,9 +41,9 @@ static zend_result phar_call_openssl_signverify(bool is_sign, php_stream *fp, ze
 static char *phar_get_link_location(phar_entry_info *entry) /* {{{ */
 {
 	char *p, *ret = NULL;
-	if (!entry->link) {
-		return NULL;
-	}
+
+	ZEND_ASSERT(entry->link);
+
 	if (entry->link[0] == '/') {
 		return estrdup(entry->link + 1);
 	}

Original file line number	Diff line number	Diff line change
`@@ -41,9 +41,9 @@ static zend_result phar_call_openssl_signverify(bool is_sign, php_stream *fp, ze`
`41`	`41`	`static char phar_get_link_location(phar_entry_info entry) /* {{{ */`
`42`	`42`	`{`
`43`	`43`	`char p, ret = NULL;`
`44`		`- if (!entry->link) {`
`45`		`- return NULL;`
`46`		`- }`
	`44`	`+`
	`45`	`+ ZEND_ASSERT(entry->link);`
	`46`	`+`
`47`	`47`	`if (entry->link[0] == '/') {`
`48`	`48`	`return estrdup(entry->link + 1);`
`49`	`49`	`}`