Fixed segfault and memory leak in the new implementation of implode()

diff --git a/ext/standard/string.c b/ext/standard/string.c
index a29c9b52a637914af0bfa79f974f9c8cb49ec721..eed9184d7bef7679b2047d5eccd58f446de82512 100644 (file)
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -825,6 +825,10 @@ PHPAPI void php_implode(zval *delim, zval *arr, zval *return_value)
 
        numelems = zend_hash_num_elements(Z_ARRVAL_P(arr));
 
+       if(numelems == 0) {
+               RETURN_EMPTY_STRING();
+       }
+
        zend_hash_internal_pointer_reset_ex(Z_ARRVAL_P(arr), &pos);
        while (zend_hash_get_current_data_ex(Z_ARRVAL_P(arr), 
                                                                                 (void **) &tmp,
@@ -888,6 +892,8 @@ PHP_FUNCTION(implode)
        zval_ptr_dtor(arg1);
        if (arg2) {
                zval_ptr_dtor(arg2);
+       } else {
+               FREE_ZVAL(delim);
        }
 }
 /* }}} */