]> granicus.if.org Git - php/commitdiff
Fixed memory leak in ext/standard/tests/strings/bug24098.phpt
authorXinchen Hui <laruence@gmail.com>
Mon, 24 Feb 2014 08:14:46 +0000 (16:14 +0800)
committerXinchen Hui <laruence@gmail.com>
Mon, 24 Feb 2014 08:14:46 +0000 (16:14 +0800)
ext/standard/string.c

index c834130ec3e0c6395bab44fbc4b4fdd3d771c79b..6d81fbf5df0fa7248882e6c8ee04184aea6e3c0a 100644 (file)
@@ -1521,7 +1521,7 @@ PHP_FUNCTION(pathinfo)
        char *path, *dirname;
        int path_len, have_basename;
        long opt = PHP_PATHINFO_ALL;
-       zend_string *ret;
+       zend_string *ret = NULL;
 
        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &path, &path_len, &opt) == FAILURE) {
                return;
@@ -1576,7 +1576,7 @@ PHP_FUNCTION(pathinfo)
                add_assoc_stringl(&tmp, "filename", ret->val, idx, 1);
        }
 
-       if (!have_basename && ret) {
+       if (ret) {
                STR_RELEASE(ret);
        }