From d5a8bb2d0b8cbd7eaabcf4b238a9cbb30b9a8bdf Mon Sep 17 00:00:00 2001 From: Ilia Alshanetsky Date: Sun, 5 Jan 2003 04:29:14 +0000 Subject: [PATCH] Fixed a memory leak in setlocale() & localeconv(). --- ext/standard/string.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ext/standard/string.c b/ext/standard/string.c index 722812c56e..ba361ff509 100644 --- a/ext/standard/string.c +++ b/ext/standard/string.c @@ -3199,6 +3199,7 @@ PHP_FUNCTION(setlocale) cat = LC_TIME; else { 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); + efree(args); RETURN_FALSE; } } @@ -3742,14 +3743,14 @@ PHP_FUNCTION(localeconv) zval *grouping, *mon_grouping; int len, i; - MAKE_STD_ZVAL(grouping); - MAKE_STD_ZVAL(mon_grouping); - /* We don't need no stinkin' parameters... */ if (ZEND_NUM_ARGS() > 0) { WRONG_PARAM_COUNT; } + MAKE_STD_ZVAL(grouping); + MAKE_STD_ZVAL(mon_grouping); + array_init(return_value); array_init(grouping); array_init(mon_grouping); -- 2.50.1