From: Xinchen Hui <laruence@gmail.com>
Date: Mon, 24 Feb 2014 08:14:46 +0000 (+0800)
Subject: Fixed memory leak in ext/standard/tests/strings/bug24098.phpt
X-Git-Tag: POST_PHPNG_MERGE~412^2~565^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6c3c1f0949a33dc948b388535678288612e0f526;p=php

Fixed memory leak in ext/standard/tests/strings/bug24098.phpt
---

diff --git a/ext/standard/string.c b/ext/standard/string.c
index c834130ec3..6d81fbf5df 100644
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -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);
 	}