From: Dmitry Stogov <dmitry@zend.com>
Date: Tue, 18 Feb 2014 13:11:57 +0000 (+0400)
Subject: Fixed memory leak
X-Git-Tag: POST_PHPNG_MERGE~412^2~628
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=246d50fd95c23545f8520175b6f8e3614f76b1ec;p=php

Fixed memory leak
---

diff --git a/ext/standard/string.c b/ext/standard/string.c
index a0523851c6..e5ac2c96fc 100644
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -1516,19 +1516,17 @@ PHPAPI size_t php_dirname(char *path, size_t len)
 PHP_FUNCTION(dirname)
 {
 	char *str;
-	char *ret;
+	zend_string *ret;
 	int str_len;
-	size_t ret_len;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &str, &str_len) == FAILURE) {
 		return;
 	}
 
-	ret = estrndup(str, str_len);
-	ret_len = php_dirname(ret, str_len);
+	ret = STR_INIT(str, str_len, 0);
+	ret->len = zend_dirname(ret->val, str_len);
 
-//???	RETURN_STRINGL(ret, ret_len, 0);
-	RETURN_STRINGL(ret, ret_len);
+	RETURN_STR(ret);
 }
 /* }}} */