Zend/zend_string: add zend_string_equals_str()

MaxKellermann · MaxKellermann · commit 329d66825ba2 · 2022-03-18T13:32:49.000+01:00
diff --git a/Zend/zend_attributes.c b/Zend/zend_attributes.c
@@ -112,10 +112,8 @@ static zend_attribute *get_attribute_str(HashTable *attributes, const char *str,
 		zend_attribute *attr;
 
 		ZEND_HASH_PACKED_FOREACH_PTR(attributes, attr) {
-			if (attr->offset == offset && ZSTR_LEN(attr->lcname) == len) {
-				if (0 == memcmp(ZSTR_VAL(attr->lcname), str, len)) {
-					return attr;
-				}
+			if (attr->offset == offset && zend_string_equals_str(attr->lcname, str, len)) {
+				return attr;
 			}
 		} ZEND_HASH_FOREACH_END();
 	}
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
@@ -266,9 +266,7 @@ static zend_always_inline bool zend_is_confusable_type(const zend_string *name,
 	/* Intentionally using case-sensitive comparison here, because "integer" is likely intended
 	 * as a scalar type, while "Integer" is likely a class type. */
 	for (; info->name; ++info) {
-		if (ZSTR_LEN(name) == info->name_len
-			&& memcmp(ZSTR_VAL(name), info->name, info->name_len) == 0
-		) {
+		if (zend_string_equals_str(name, info->name, info->name_len)) {
 			*correct_name = info->correct_name;
 			return 1;
 		}
@@ -3378,8 +3376,7 @@ static uint32_t zend_get_arg_num(zend_function *fn, zend_string *arg_name) {
 	} else {
 		for (uint32_t i = 0; i < fn->common.num_args; i++) {
 			zend_internal_arg_info *arg_info = &fn->internal_function.arg_info[i];
-			size_t len = strlen(arg_info->name);
-			if (len == ZSTR_LEN(arg_name) && !memcmp(arg_info->name, ZSTR_VAL(arg_name), len)) {
+			if (zend_string_equals_cstr(arg_name, arg_info->name)) {
 				return i + 1;
 			}
 		}
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
@@ -4674,8 +4674,7 @@ static zend_always_inline uint32_t zend_get_arg_offset_by_name(
 	} else {
 		for (uint32_t i = 0; i < num_args; i++) {
 			zend_internal_arg_info *arg_info = &fbc->internal_function.arg_info[i];
-			size_t len = strlen(arg_info->name);
-			if (len == ZSTR_LEN(arg_name) && !memcmp(arg_info->name, ZSTR_VAL(arg_name), len)) {
+			if (zend_string_equals_cstr(arg_name, arg_info->name)) {
 				*cache_slot = fbc;
 				*(uintptr_t *)(cache_slot + 1) = i;
 				return i;
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
@@ -1817,8 +1817,7 @@ ZEND_API zend_result zend_set_local_var_str(const char *name, size_t len, zval *
 
 				do {
 					if (ZSTR_H(*str) == h &&
-					    ZSTR_LEN(*str) == len &&
-					    memcmp(ZSTR_VAL(*str), name, len) == 0) {
+					    zend_string_equals_str(*str, name, len)) {
 						zval *var = EX_VAR_NUM(str - op_array->vars);
 						zval_ptr_dtor(var);
 						ZVAL_COPY_VALUE(var, value);
diff --git a/Zend/zend_hash.c b/Zend/zend_hash.c
@@ -711,8 +711,7 @@ static zend_always_inline Bucket *zend_hash_str_find_bucket(const HashTable *ht,
 		p = HT_HASH_TO_BUCKET_EX(arData, idx);
 		if ((p->h == h)
 			 && p->key
-			 && (ZSTR_LEN(p->key) == len)
-			 && !memcmp(ZSTR_VAL(p->key), str, len)) {
+			 && zend_string_equals_str(p->key, str, len)) {
 			return p;
 		}
 		idx = Z_NEXT(p->val);
@@ -1556,8 +1555,7 @@ ZEND_API zend_result ZEND_FASTCALL zend_hash_str_del_ind(HashTable *ht, const ch
 		p = HT_HASH_TO_BUCKET(ht, idx);
 		if ((p->h == h)
 			 && p->key
-			 && (ZSTR_LEN(p->key) == len)
-			 && !memcmp(ZSTR_VAL(p->key), str, len)) {
+			 && zend_string_equals_str(p->key, str, len)) {
 			if (Z_TYPE(p->val) == IS_INDIRECT) {
 				zval *data = Z_INDIRECT(p->val);
 
@@ -1602,8 +1600,7 @@ ZEND_API zend_result ZEND_FASTCALL zend_hash_str_del(HashTable *ht, const char *
 		p = HT_HASH_TO_BUCKET(ht, idx);
 		if ((p->h == h)
 			 && p->key
-			 && (ZSTR_LEN(p->key) == len)
-			 && !memcmp(ZSTR_VAL(p->key), str, len)) {
+			 && zend_string_equals_str(p->key, str, len)) {
 			zend_string_release(p->key);
 			p->key = NULL;
 			_zend_hash_del_el_ex(ht, idx, p, prev);
diff --git a/Zend/zend_string.c b/Zend/zend_string.c
@@ -135,10 +135,8 @@ static zend_always_inline zend_string *zend_interned_string_ht_lookup_ex(zend_ul
 	idx = HT_HASH(interned_strings, nIndex);
 	while (idx != HT_INVALID_IDX) {
 		p = HT_HASH_TO_BUCKET(interned_strings, idx);
-		if ((p->h == h) && (ZSTR_LEN(p->key) == size)) {
-			if (!memcmp(ZSTR_VAL(p->key), str, size)) {
-				return p->key;
-			}
+		if ((p->h == h) && zend_string_equals_str(p->key, str, size)) {
+			return p->key;
 		}
 		idx = Z_NEXT(p->val);
 	}
diff --git a/Zend/zend_string.h b/Zend/zend_string.h
@@ -339,6 +339,16 @@ static zend_always_inline void zend_string_release_ex(zend_string *s, bool persi
 	}
 }
 
+static zend_always_inline bool zend_string_equals_str(const zend_string *s1, const char *s2, size_t s2_length)
+{
+	return ZSTR_LEN(s1) == s2_length && !memcmp(ZSTR_VAL(s1), s2, s2_length);
+}
+
+static zend_always_inline bool zend_string_equals_cstr(const zend_string *s1, const char *s2)
+{
+	return zend_string_equals_str(s1, s2, strlen(s2));
+}
+
 #if defined(__GNUC__) && (defined(__i386__) || (defined(__x86_64__) && !defined(__ILP32__)))
 BEGIN_EXTERN_C()
 ZEND_API bool ZEND_FASTCALL zend_string_equal_val(zend_string *s1, zend_string *s2);
@@ -367,7 +377,7 @@ static zend_always_inline bool zend_string_equals(zend_string *s1, zend_string *
 	(ZSTR_LEN(str) == sizeof(c) - 1 && !zend_binary_strcasecmp(ZSTR_VAL(str), ZSTR_LEN(str), (c), sizeof(c) - 1))
 
 #define zend_string_equals_literal(str, literal) \
-	(ZSTR_LEN(str) == sizeof(literal)-1 && !memcmp(ZSTR_VAL(str), literal, sizeof(literal) - 1))
+	zend_string_equals_str(str, literal, sizeof(literal) - 1)
 
 /*
  * DJBX33A (Daniel J. Bernstein, Times 33 with Addition)
diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c
@@ -556,10 +556,8 @@ static zend_always_inline zend_string *accel_find_interned_string_ex(zend_ulong
 	if (EXPECTED(pos != STRTAB_INVALID_POS)) {
 		do {
 			s = STRTAB_POS_TO_STR(&ZCSG(interned_strings), pos);
-			if (EXPECTED(ZSTR_H(s) == h) && EXPECTED(ZSTR_LEN(s) == size)) {
-				if (!memcmp(ZSTR_VAL(s), str, size)) {
-					return s;
-				}
+			if (EXPECTED(ZSTR_H(s) == h) && zend_string_equals_str(s, str, size)) {
+				return s;
 			}
 			pos = STRTAB_COLLISION(s);
 		} while (pos != STRTAB_INVALID_POS);
diff --git a/ext/standard/string.c b/ext/standard/string.c
@@ -4738,14 +4738,14 @@ static zend_string *try_setlocale_str(zend_long cat, zend_string *loc) {
 				/* C locale is represented as NULL. */
 				BG(ctype_string) = NULL;
 				return ZSTR_CHAR('C');
-			} else if (len == ZSTR_LEN(loc) && !memcmp(ZSTR_VAL(loc), retval, len)) {
+			} else if (zend_string_equals_str(loc, retval, len)) {
 				BG(ctype_string) = zend_string_copy(loc);
 				return zend_string_copy(BG(ctype_string));
 			} else {
 				BG(ctype_string) = zend_string_init(retval, len, 0);
 				return zend_string_copy(BG(ctype_string));
 			}
-		} else if (len == ZSTR_LEN(loc) && !memcmp(ZSTR_VAL(loc), retval, len)) {
+		} else if (zend_string_equals_str(loc, retval, len)) {
 			return zend_string_copy(loc);
 		}
 	}
diff --git a/main/output.c b/main/output.c
@@ -584,7 +584,7 @@ PHPAPI int php_output_handler_started(const char *name, size_t name_len)
 		handlers = (php_output_handler **) zend_stack_base(&OG(handlers));
 
 		for (i = 0; i < count; ++i) {
-			if (name_len == ZSTR_LEN(handlers[i]->name) && !memcmp(ZSTR_VAL(handlers[i]->name), name, name_len)) {
+			if (zend_string_equals_str(handlers[i]->name, name, name_len)) {
 				return 1;
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -112,10 +112,8 @@ static zend_attribute get_attribute_str(HashTable attributes, const char *str,`
`112`	`112`	`zend_attribute *attr;`
`113`	`113`
`114`	`114`	`ZEND_HASH_PACKED_FOREACH_PTR(attributes, attr) {`
`115`		`- if (attr->offset == offset && ZSTR_LEN(attr->lcname) == len) {`
`116`		`- if (0 == memcmp(ZSTR_VAL(attr->lcname), str, len)) {`
`117`		`- return attr;`
`118`		`- }`
	`115`	`+ if (attr->offset == offset && zend_string_equals_str(attr->lcname, str, len)) {`
	`116`	`+ return attr;`
`119`	`117`	`}`
`120`	`118`	`} ZEND_HASH_FOREACH_END();`
`121`	`119`	`}`
Original file line number	Diff line number	Diff line change
`@@ -135,10 +135,8 @@ static zend_always_inline zend_string *zend_interned_string_ht_lookup_ex(zend_ul`
`135`	`135`	`idx = HT_HASH(interned_strings, nIndex);`
`136`	`136`	`while (idx != HT_INVALID_IDX) {`
`137`	`137`	`p = HT_HASH_TO_BUCKET(interned_strings, idx);`
`138`		`- if ((p->h == h) && (ZSTR_LEN(p->key) == size)) {`
`139`		`- if (!memcmp(ZSTR_VAL(p->key), str, size)) {`
`140`		`- return p->key;`
`141`		`- }`
	`138`	`+ if ((p->h == h) && zend_string_equals_str(p->key, str, size)) {`
	`139`	`+ return p->key;`
`142`	`140`	`}`
`143`	`141`	`idx = Z_NEXT(p->val);`
`144`	`142`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4738,14 +4738,14 @@ static zend_string try_setlocale_str(zend_long cat, zend_string loc) {`
`4738`	`4738`	`/* C locale is represented as NULL. */`
`4739`	`4739`	`BG(ctype_string) = NULL;`
`4740`	`4740`	`return ZSTR_CHAR('C');`
`4741`		`- } else if (len == ZSTR_LEN(loc) && !memcmp(ZSTR_VAL(loc), retval, len)) {`
	`4741`	`+ } else if (zend_string_equals_str(loc, retval, len)) {`
`4742`	`4742`	`BG(ctype_string) = zend_string_copy(loc);`
`4743`	`4743`	`return zend_string_copy(BG(ctype_string));`
`4744`	`4744`	`} else {`
`4745`	`4745`	`BG(ctype_string) = zend_string_init(retval, len, 0);`
`4746`	`4746`	`return zend_string_copy(BG(ctype_string));`
`4747`	`4747`	`}`
`4748`		`- } else if (len == ZSTR_LEN(loc) && !memcmp(ZSTR_VAL(loc), retval, len)) {`
	`4748`	`+ } else if (zend_string_equals_str(loc, retval, len)) {`
`4749`	`4749`	`return zend_string_copy(loc);`
`4750`	`4750`	`}`
`4751`	`4751`	`}`
Original file line number	Diff line number	Diff line change
`@@ -584,7 +584,7 @@ PHPAPI int php_output_handler_started(const char *name, size_t name_len)`
`584`	`584`	`handlers = (php_output_handler **) zend_stack_base(&OG(handlers));`
`585`	`585`
`586`	`586`	`for (i = 0; i < count; ++i) {`
`587`		`- if (name_len == ZSTR_LEN(handlers[i]->name) && !memcmp(ZSTR_VAL(handlers[i]->name), name, name_len)) {`
	`587`	`+ if (zend_string_equals_str(handlers[i]->name, name, name_len)) {`
`588`	`588`	`return 1;`
`589`	`589`	`}`
`590`	`590`	`}`