com php-src: Fixed memory leak: ext/standard/string.c
| From: | Dmitry Stogov | Date: | Tue, 18 Feb 2014 13:11:57 +0000 |
| Subject: | com php-src: Fixed memory leak: ext/standard/string.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-78066@lists.php.net to get a copy of this message | ||
Commit: 246d50fd95c23545f8520175b6f8e3614f76b1ec
Author: Dmitry Stogov <dmitry@zend.com> Tue, 18 Feb 2014 17:11:57 +0400
Parents: 7428cac6e8d1d7aca3e156def8f13e184ebd0c35
Branches: phpng
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=246d50fd95c23545f8520175b6f8e3614f76b1ec
Log:
Fixed memory leak
Changed paths:
M ext/standard/string.c
Diff:
diff --git a/ext/standard/string..c b/ext/standard/string.c
index a052385..e5ac2c9 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);
}
/* }}} */