]> granicus.if.org Git - php/commitdiff
Now we always ZVAL_DUP args[argnum] now (in ed8691b2)
authorXinchen Hui <laruence@gmail.com>
Mon, 24 Feb 2014 07:10:16 +0000 (15:10 +0800)
committerXinchen Hui <laruence@gmail.com>
Mon, 24 Feb 2014 07:13:06 +0000 (15:13 +0800)
ext/standard/formatted_print.c

index d1ce7f9c2b171af7e7b5058af54fdc5e671d86e8..6317c8214cdb398784566652d45ef6da6dd0c866 100644 (file)
@@ -422,7 +422,7 @@ php_formatted_print(int param_count, int use_array, int format_offset TSRMLS_DC)
        currarg = 1;
 
        while (inpos<Z_STRLEN(args[format_offset])) {
-               int expprec = 0, multiuse = 0;
+               int expprec = 0;
                zval tmp;
 
                PRINTF_DEBUG(("sprintf: format[%d]='%c'\n", inpos, format[inpos]));
@@ -456,7 +456,6 @@ php_formatted_print(int param_count, int use_array, int format_offset TSRMLS_DC)
                                                return NULL;
                                        }
 
-                                       multiuse = 1;
                                        inpos++;  /* skip the '$' */
                                } else {
                                        argnum = currarg++;
@@ -646,9 +645,7 @@ php_formatted_print(int param_count, int use_array, int format_offset TSRMLS_DC)
                                default:
                                        break;
                        }
-                       if (multiuse) {
-                               zval_ptr_dtor(&tmp);
-                       }
+                       zval_ptr_dtor(&tmp);
                        inpos++;
                }
        }