diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-03-05 11:10:52 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-03-05 11:10:52 +0400 |
| commit | 040dea8b82a00083b3975351271f34f3775d9a60 (patch) | |
| tree | 0352d30dc79148003cda60a84adbb118ed153987 /ext/standard/string.c | |
| parent | 19670c2bbcd5fc1339e160929cc81db3ae940392 (diff) | |
| download | php-git-040dea8b82a00083b3975351271f34f3775d9a60.tar.gz | |
Arguments taken by internal functions using zend_parse_parameters() with "+" and "*" specifications must not be deallocated anymore.
Diffstat (limited to 'ext/standard/string.c')
| -rw-r--r-- | ext/standard/string.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/ext/standard/string.c b/ext/standard/string.c index 66e6a4c8a1..65522cc36f 100644 --- a/ext/standard/string.c +++ b/ext/standard/string.c @@ -4333,9 +4333,6 @@ PHP_FUNCTION(setlocale) php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid locale category name %s, must be one of LC_ALL, LC_COLLATE, LC_CTYPE, LC_MONETARY, LC_NUMERIC, or LC_TIME", category); zval_dtor(&tmp); - if (args) { - efree(args); - } RETURN_FALSE; } zval_dtor(&tmp); @@ -4385,9 +4382,6 @@ PHP_FUNCTION(setlocale) } zval_dtor(&tmp); - if (args) { - efree(args); - } RETURN_STRING(retval); } zval_dtor(&tmp); @@ -4400,9 +4394,6 @@ PHP_FUNCTION(setlocale) } #endif - if (args) { - efree(args); - } RETURN_FALSE; } /* }}} */ @@ -5272,10 +5263,6 @@ PHP_FUNCTION(sscanf) result = php_sscanf_internal(str, format, num_args, args, 0, return_value TSRMLS_CC); - if (args) { - efree(args); - } - if (SCAN_ERROR_WRONG_PARAM_COUNT == result) { WRONG_PARAM_COUNT; } |