fix memleak in php_domxslt_string_to_xpathexpr

diff --git a/ext/domxml/php_domxml.c b/ext/domxml/php_domxml.c
index 7b34a5f3799b36d0607e8284a3e39e7b62ced802..14e0d1d939aabcd4e6d36203610f3aa7d12f701d 100644 (file)
--- a/ext/domxml/php_domxml.c
+++ b/ext/domxml/php_domxml.c
@@ -5051,20 +5051,21 @@ static char *php_domxslt_string_to_xpathexpr(const char *str TSRMLS_DC)
        const xmlChar *string = (const xmlChar *)str;
 
        xmlChar *value;
-
+       int str_len;
+       
+       str_len = xmlStrlen(string) + 3;
+       
        if (xmlStrchr(string, '"')) {
                if (xmlStrchr(string, '\'')) {
                        php_error(E_WARNING, "%s(): Cannot create XPath expression (string contains both quote and double-quotes)",
                                          get_active_function_name(TSRMLS_C));
                        return NULL;
                }
-               value = xmlStrdup((const xmlChar *)"'");
-               value = xmlStrcat(value, string);
-               value = xmlStrcat(value, (const xmlChar *)"'");
+               value = (xmlChar*) emalloc (str_len * sizeof(xmlChar *) );
+               snprintf(value, str_len, "'%s'", string);
        } else {
-               value = xmlStrdup((const xmlChar *)"\"");
-               value = xmlStrcat(value, string);
-               value = xmlStrcat(value, (const xmlChar *)"\"");
+               value = (xmlChar*) emalloc (str_len * sizeof(xmlChar *) );
+               snprintf(value, str_len, "\"%s\"", string);
        }
 
        return (char *)value;