Fixed a bug in zend_memnistr

SakiTakamachi · SakiTakamachi · commit e28e41476272 · 2023-10-17T22:23:31.000+09:00
diff --git a/Zend/zend_operators.h b/Zend/zend_operators.h
@@ -945,7 +945,7 @@ zend_memnistr(const char *haystack, const char *needle, size_t needle_len, const
 	const char *p_upper = NULL;
 	if (first_lower != first_upper) {
 		// If the needle length is 1 we don't need to look beyond p_lower as it is a guaranteed match
-		size_t upper_search_length = end - (needle_len == 1 && p_lower != NULL ? p_lower : haystack);
+		size_t upper_search_length = needle_len == 1 && p_lower != NULL ? end - haystack : p_lower - haystack;
 		p_upper = (const char *)memchr(haystack, first_upper, upper_search_length);
 	}
 	const char *p = !p_upper || (p_lower && p_lower < p_upper) ? p_lower : p_upper;

Original file line number	Diff line number	Diff line change
`@@ -945,7 +945,7 @@ zend_memnistr(const char haystack, const char needle, size_t needle_len, const`
`945`	`945`	`const char *p_upper = NULL;`
`946`	`946`	`if (first_lower != first_upper) {`
`947`	`947`	`// If the needle length is 1 we don't need to look beyond p_lower as it is a guaranteed match`
`948`		`- size_t upper_search_length = end - (needle_len == 1 && p_lower != NULL ? p_lower : haystack);`
	`948`	`+ size_t upper_search_length = needle_len == 1 && p_lower != NULL ? end - haystack : p_lower - haystack;`
`949`	`949`	`p_upper = (const char *)memchr(haystack, first_upper, upper_search_length);`
`950`	`950`	`}`
`951`	`951`	`const char *p = !p_upper \|\| (p_lower && p_lower < p_upper) ? p_lower : p_upper;`