diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-02-18 17:11:57 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-02-18 17:11:57 +0400 |
| commit | 246d50fd95c23545f8520175b6f8e3614f76b1ec (patch) | |
| tree | a27ace5a84b682112439d2e9716bb8622774d825 /ext/standard/string.c | |
| parent | 7428cac6e8d1d7aca3e156def8f13e184ebd0c35 (diff) | |
| download | php-git-246d50fd95c23545f8520175b6f8e3614f76b1ec.tar.gz | |
Fixed memory leak
Diffstat (limited to 'ext/standard/string.c')
| -rw-r--r-- | ext/standard/string.c | 10 |
1 files changed, 4 insertions, 6 deletions
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); } /* }}} */ |