From: Ilia Alshanetsky <iliaa@php.net>
Date: Mon, 1 Dec 2003 23:21:25 +0000 (+0000)
Subject: MFH: Optimize substr_replace
X-Git-Tag: php-4.3.5RC1~127
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=da55f714a9bf3a8fa806329bb26c161b9b27fb96;p=php

MFH: Optimize substr_replace
---

diff --git a/ext/standard/string.c b/ext/standard/string.c
index 914cac5395..fe8989c0f9 100644
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -1739,11 +1739,12 @@ PHP_FUNCTION(substr_replace)
 	}
 
 	result_len = Z_STRLEN_PP(str) - l + Z_STRLEN_PP(repl);
-	result = ecalloc(result_len + 1, sizeof(char *));
+	result = emalloc(result_len + 1);
 
 	memcpy(result, Z_STRVAL_PP(str), f);
-	memcpy(&result[f], Z_STRVAL_PP(repl), Z_STRLEN_PP(repl));
-	memcpy(&result[f + Z_STRLEN_PP(repl)], Z_STRVAL_PP(str) + f + l, Z_STRLEN_PP(str) - f - l);
+	memcpy((result + f), Z_STRVAL_PP(repl), Z_STRLEN_PP(repl));
+	memcpy((result + f + Z_STRLEN_PP(repl)), Z_STRVAL_PP(str) + f + l, Z_STRLEN_PP(str) - f - l);
+	result[result_len] = '\0';
 
 	RETURN_STRINGL(result, result_len, 0);
 }