Use zend_string_{equals,startswith} helpers

Closes phpGH-17240.

Author: ndossche

ext/phar/phar_object.c

@@ -4157,7 +4157,7 @@ static zend_result phar_extract_file(bool overwrite, phar_entry_info *entry, cha
 		return SUCCESS;
 	}
 
-	if (ZSTR_LEN(entry->filename) >= sizeof(".phar")-1 && !memcmp(ZSTR_VAL(entry->filename), ".phar", sizeof(".phar")-1)) {
+	if (zend_string_starts_with_literal(entry->filename, ".phar")) {
 		return SUCCESS;
 	}
 	/* strip .. from path and restrict it to be under dest directory */
@@ -4330,7 +4330,7 @@ static int extract_helper(phar_archive_data *archive, zend_string *search, char
 	} else if ('/' == ZSTR_VAL(search)[ZSTR_LEN(search) - 1]) {
 		/* ends in "/" -- extract all entries having that prefix */
 		ZEND_HASH_MAP_FOREACH_PTR(&archive->manifest, entry) {
-			if (0 != strncmp(ZSTR_VAL(search), ZSTR_VAL(entry->filename), ZSTR_LEN(search))) continue;
+			if (!zend_string_starts_with(entry->filename, search)) continue;
 			if (FAILURE == phar_extract_file(overwrite, entry, pathto, pathto_len, error)) return -1;
 			extracted++;
 		} ZEND_HASH_FOREACH_END();

ext/phar/stream.c

@@ -325,7 +325,7 @@ static php_stream * phar_wrapper_open_url(php_stream_wrapper *wrapper, const cha
 		char *entry = ZSTR_VAL(idata->internal_file->filename), *cwd;
 
 		PHAR_G(cwd_init) = 1;
-		if ((idata->phar->is_tar || idata->phar->is_zip) && ZSTR_LEN(idata->internal_file->filename) == sizeof(".phar/stub.php")-1 && !strncmp(entry, ".phar/stub.php", sizeof(".phar/stub.php")-1)) {
+		if ((idata->phar->is_tar || idata->phar->is_zip) && zend_string_equals_literal(idata->internal_file->filename, ".phar/stub.php")) {
 			/* we're executing the stub, which doesn't count as a file */
 			PHAR_G(cwd_init) = 0;
 		} else if ((cwd = strrchr(entry, '/'))) {

ext/phar/tar.c

@@ -177,7 +177,7 @@ static zend_result phar_tar_process_metadata(phar_entry_info *entry, php_stream
 
 	phar_parse_metadata_lazy(metadata, &entry->metadata_tracker, entry->uncompressed_filesize, entry->is_persistent);
 
-	if (ZSTR_LEN(entry->filename) == sizeof(".phar/.metadata.bin")-1 && !memcmp(ZSTR_VAL(entry->filename), ".phar/.metadata.bin", sizeof(".phar/.metadata.bin")-1)) {
+	if (zend_string_equals_literal(entry->filename, ".phar/.metadata.bin")) {
 		if (phar_metadata_tracker_has_data(&entry->phar->metadata_tracker, entry->phar->is_persistent)) {
 			efree(metadata);
 			return FAILURE;
@@ -515,7 +515,7 @@ zend_result phar_parse_tarfile(php_stream* fp, char *fname, size_t fname_len, ch
 			++entry.manifest_pos;
 		}
 
-		if (ZSTR_LEN(entry.filename) >= sizeof(".phar/.metadata")-1 && !memcmp(ZSTR_VAL(entry.filename), ".phar/.metadata", sizeof(".phar/.metadata")-1)) {
+		if (zend_string_starts_with_literal(entry.filename, ".phar/.metadata")) {
 			if (FAILURE == phar_tar_process_metadata(newentry, fp)) {
 				if (error) {
 					spprintf(error, 4096, "phar error: tar-based phar \"%s\" has invalid metadata in magic file \"%s\"", fname, ZSTR_VAL(entry.filename));
@@ -526,7 +526,7 @@ zend_result phar_parse_tarfile(php_stream* fp, char *fname, size_t fname_len, ch
 			}
 		}
 
-		if (!actual_alias && ZSTR_LEN(entry.filename) == sizeof(".phar/alias.txt")-1 && !strncmp(ZSTR_VAL(entry.filename), ".phar/alias.txt", sizeof(".phar/alias.txt")-1)) {
+		if (!actual_alias && zend_string_equals_literal(entry.filename, ".phar/alias.txt")) {
 			/* found explicit alias */
 			if (size > 511) {
 				if (error) {
@@ -907,8 +907,8 @@ static int phar_tar_setupmetadata(zval *zv, void *argument) /* {{{ */
 	char **error = i->error;
 	phar_entry_info *entry = (phar_entry_info *)Z_PTR_P(zv), *metadata, newentry = {0};
 
-	if (ZSTR_LEN(entry->filename) >= sizeof(".phar/.metadata") && !memcmp(ZSTR_VAL(entry->filename), ".phar/.metadata", sizeof(".phar/.metadata")-1)) {
-		if (ZSTR_LEN(entry->filename) == sizeof(".phar/.metadata.bin")-1 && !memcmp(ZSTR_VAL(entry->filename), ".phar/.metadata.bin", sizeof(".phar/.metadata.bin")-1)) {
+	if (zend_string_starts_with_literal(entry->filename, ".phar/.metadata")) {
+		if (zend_string_equals_literal(entry->filename, ".phar/.metadata.bin")) {
 			return phar_tar_setmetadata(&entry->phar->metadata_tracker, entry, error);
 		}
 		/* search for the file this metadata entry references */

ext/phar/zip.c

@@ -484,7 +484,7 @@ int phar_parse_zipfile(php_stream *fp, char *fname, size_t fname_len, char *alia
 											+ PHAR_GET_16(zipentry.extra_len);
 		}
 
-		if (ZSTR_LEN(entry.filename) == sizeof(".phar/signature.bin")-1 && !strncmp(ZSTR_VAL(entry.filename), ".phar/signature.bin", sizeof(".phar/signature.bin")-1)) {
+		if (zend_string_equals_literal(entry.filename, ".phar/signature.bin")) {
 			size_t read;
 			php_stream *sigfile;
 			char *sig;
@@ -627,7 +627,7 @@ int phar_parse_zipfile(php_stream *fp, char *fname, size_t fname_len, char *alia
 			ZVAL_UNDEF(&entry.metadata_tracker.val);
 		}
 
-		if (!actual_alias && ZSTR_LEN(entry.filename) == sizeof(".phar/alias.txt")-1 && !strncmp(ZSTR_VAL(entry.filename), ".phar/alias.txt", sizeof(".phar/alias.txt")-1)) {
+		if (!actual_alias && zend_string_equals_literal(entry.filename, ".phar/alias.txt")) {
 			php_stream_filter *filter;
 
 			/* archive alias found */