From aa9cf268db5ad766fbdc0384f9c33f4713791016 Mon Sep 17 00:00:00 2001 From: Rui Hirokawa Date: Sun, 21 Apr 2002 22:06:55 +0000 Subject: [PATCH] small performance improvement when pass is selected as input encoding. --- ext/mbstring/mbstring.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c index 67a4501474..4245191be8 100644 --- a/ext/mbstring/mbstring.c +++ b/ext/mbstring/mbstring.c @@ -1060,8 +1060,8 @@ php_mbstr_encoding_handler(zval *arg, char *res, char *separator TSRMLS_DC) int n, num, val_len, *len_list, *elist, elistsz; enum mbfl_no_encoding from_encoding, to_encoding; mbfl_string string, resvar, resval; - mbfl_encoding_detector *identd; - mbfl_buffer_converter *convd; + mbfl_encoding_detector *identd = NULL; + mbfl_buffer_converter *convd = NULL; mbfl_string_init_set(&string, MBSTRG(current_language), MBSTRG(current_internal_encoding)); mbfl_string_init_set(&resvar, MBSTRG(current_language), MBSTRG(current_internal_encoding)); @@ -1174,8 +1174,10 @@ php_mbstr_encoding_handler(zval *arg, char *res, char *separator TSRMLS_DC) n++; /* add variable to symbol table */ php_register_variable_safe(var, val, val_len, array_ptr TSRMLS_CC); - mbfl_string_clear(&resvar); - mbfl_string_clear(&resval); + if (convd != NULL){ + mbfl_string_clear(&resvar); + mbfl_string_clear(&resval); + } } MBSTRG(http_input_identify) = from_encoding; -- 2.50.1