Use zval_get_string in implode

Also get rid of separate case for IS_OBJECT - this is already
handled by the default branch.

diff --git a/ext/standard/string.c b/ext/standard/string.c
index 674bd588b9242ad20c11236ad5881b1427e1b8f2..a600fc800ea6ce61de0698d95cd29e54acb41d5e 100644 (file)
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -1123,8 +1123,7 @@ PHPAPI void php_implode(zval *delim, zval *arr, zval *return_value TSRMLS_DC)
        zval          *tmp;
        smart_str      implstr = {0};
        int            numelems, i = 0;
-       zval tmp_val;
-       int str_len;
+       zend_string *str;
 
        numelems = zend_hash_num_elements(Z_ARRVAL_P(arr));
 
@@ -1153,30 +1152,20 @@ again:
 
                        case IS_DOUBLE: {
                                char *stmp;
-                               str_len = spprintf(&stmp, 0, "%.*G", (int) EG(precision), Z_DVAL_P(tmp));
+                               int str_len = spprintf(&stmp, 0, "%.*G", (int) EG(precision), Z_DVAL_P(tmp));
                                smart_str_appendl(&implstr, stmp, str_len);
                                efree(stmp);
                        }
                                break;
 
-                       case IS_OBJECT: {
-                               int copy;
-                               zval expr;
-                               zend_make_printable_zval(tmp, &expr, &copy);
-                               smart_str_appendl(&implstr, Z_STRVAL(expr), Z_STRLEN(expr));
-                               if (copy) {
-                                       zval_dtor(&expr);
-                               }
-                       }
-                               break;
                        case IS_REFERENCE:
                                tmp = Z_REFVAL_P(tmp);
                                goto again;
+
                        default:
-                               ZVAL_DUP(&tmp_val, tmp);
-                               convert_to_string(&tmp_val);
-                               smart_str_appendl(&implstr, Z_STRVAL(tmp_val), Z_STRLEN(tmp_val));
-                               zval_dtor(&tmp_val);
+                               str = zval_get_string(tmp);
+                               smart_str_appendl(&implstr, str->val, str->len);
+                               STR_RELEASE(str);
                                break;
 
                }