small performance improvement when pass is selected as input encoding.

diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index 67a4501474ba119ba85d3ae6c1342cd2ca79dcaa..4245191be8f7b317a3db4eb49adbdf19b7db2ea0 100644 (file)
--- 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;