feedback

Author: devnexen

main/streams/streams.c

@@ -142,14 +142,9 @@ PHPAPI int php_stream_from_persistent_id(const char *persistent_id, php_stream *
 
 zend_string *php_stream_escape_persistent_key(const char *host, size_t hostlen)
 {
-	size_t escaped_len = 0, i;
-	for (i = 0; i < hostlen; i++) {
-		escaped_len += (host[i] == '\0' || host[i] == '\\') ? 2 : 1;
-	}
-
-	zend_string *escaped = zend_string_alloc(escaped_len, 0);
+	zend_string *escaped = zend_string_safe_alloc(hostlen, 2, 0, 0);
 	char *ptr = ZSTR_VAL(escaped);
-	for (i = 0; i < hostlen; i++) {
+	for (size_t i = 0; i < hostlen; i++) {
 		if (host[i] == '\0') {
 			*ptr++ = '\\';
 			*ptr++ = '0';
@@ -161,6 +156,7 @@ zend_string *php_stream_escape_persistent_key(const char *host, size_t hostlen)
 		}
 	}
 	*ptr = '\0';
+	ZSTR_LEN(escaped) = ptr - ZSTR_VAL(escaped);
 
 	return escaped;
 }