From 19d34e93046f4a4c9c6f200d36fed56bf125eb8b Mon Sep 17 00:00:00 2001 From: Ilia Alshanetsky Date: Thu, 27 Nov 2003 01:08:51 +0000 Subject: [PATCH] MFH: Removed dead code. # This fixes memory corruption reported by valgrind. --- ext/standard/string.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/ext/standard/string.c b/ext/standard/string.c index be5e273721..914cac5395 100644 --- a/ext/standard/string.c +++ b/ext/standard/string.c @@ -861,7 +861,6 @@ PHP_FUNCTION(implode) { zval **arg1 = NULL, **arg2 = NULL, *delim, *arr; int argc = ZEND_NUM_ARGS(); - int arg1_separated = 0, arg2_separated = 0, delim_needs_dtor = 0; if (argc < 1 || argc > 2 || zend_get_parameters_ex(argc, &arg1, &arg2) == FAILURE) { @@ -879,19 +878,15 @@ PHP_FUNCTION(implode) ZVAL_STRINGL(delim, _IMPL_EMPTY, sizeof(_IMPL_EMPTY) - 1, 0); SEPARATE_ZVAL(arg1); - arg1_separated = 1; - delim_needs_dtor = 1; arr = *arg1; } else { if (Z_TYPE_PP(arg1) == IS_ARRAY) { SEPARATE_ZVAL(arg1); - arg1_separated = 1; arr = *arg1; convert_to_string_ex(arg2); delim = *arg2; } else if (Z_TYPE_PP(arg2) == IS_ARRAY) { SEPARATE_ZVAL(arg2); - arg2_separated = 1; arr = *arg2; convert_to_string_ex(arg1); delim = *arg1; @@ -903,13 +898,7 @@ PHP_FUNCTION(implode) php_implode(delim, arr, return_value); - if (arg1 != NULL && arg1_separated) { - zval_ptr_dtor(arg1); - } - if (arg2 != NULL && arg2_separated) { - zval_ptr_dtor(arg2); - } - if (delim_needs_dtor) { + if (argc == 1) { FREE_ZVAL(delim); } } -- 2.40.0