Fix an ereg_replace() crash bug

diff --git a/ext/ereg/ereg.c b/ext/ereg/ereg.c
index c839e1ab12167694e17d70137ad456f313d88e79..137393378049d8c78f50307a54995132e5bc321a 100644 (file)
--- a/ext/ereg/ereg.c
+++ b/ext/ereg/ereg.c
@@ -319,7 +319,7 @@ char *_php3_regreplace(const char *pattern, const char *replace, const char *str
 
        string_len = strlen(string);
        if (!string_len)
-               return (char *)string;
+               return estrndup("", 0);
 
        if (icase)
                copts = REG_ICASE;

diff --git a/ext/standard/reg.c b/ext/standard/reg.c
index c839e1ab12167694e17d70137ad456f313d88e79..137393378049d8c78f50307a54995132e5bc321a 100644 (file)
--- a/ext/standard/reg.c
+++ b/ext/standard/reg.c
@@ -319,7 +319,7 @@ char *_php3_regreplace(const char *pattern, const char *replace, const char *str
 
        string_len = strlen(string);
        if (!string_len)
-               return (char *)string;
+               return estrndup("", 0);
 
        if (icase)
                copts = REG_ICASE;