apply suggestions

Author: LamentXU123

Zend/zend_string.h

@@ -127,8 +127,6 @@ END_EXTERN_C()
 
 /*---*/
 
-static zend_always_inline void *zend_mempcpy(void *dest, const void *src, size_t n);
-
 static zend_always_inline zend_ulong zend_string_hash_val(zend_string *s)
 {
 	return ZSTR_H(s) ? ZSTR_H(s) : zend_string_hash_func(s);
@@ -329,7 +327,9 @@ static zend_always_inline char *zend_cstr_append_char(const char *str, size_t le
 }
 
 static zend_always_inline char *zend_cstr_concat(const char *s1, size_t len1, const char *s2, size_t len2) {
-	char *res = (char *)safe_emalloc(len1, 1, len2 + 1);
+	size_t size = zend_safe_address_guarded(1, len1, len2);
+	size = zend_safe_address_guarded(1, size, 1);
+	char *res = (char *)emalloc(size);
 	if (len1 > 0) {
 		memcpy(res, s1, len1);
 	}
@@ -341,7 +341,10 @@ static zend_always_inline char *zend_cstr_concat(const char *s1, size_t len1, co
 }
 
 static zend_always_inline char *zend_cstr_concat3(const char *s1, size_t len1, const char *s2, size_t len2, const char *s3, size_t len3) {
-	char *res = (char *)safe_emalloc(len1, 1, len2 + len3 + 1);
+	size_t size = zend_safe_address_guarded(1, len1, len2);
+	size = zend_safe_address_guarded(1, size, len3);
+	size = zend_safe_address_guarded(1, size, 1);
+	char *res = (char *)emalloc(size);
 	if (len1 > 0) {
 		memcpy(res, s1, len1);
 	}