From: Xinchen Hui <laruence@gmail.com>
Date: Mon, 24 Feb 2014 07:10:16 +0000 (+0800)
Subject: Now we always ZVAL_DUP args[argnum] now (in ed8691b2)
X-Git-Tag: POST_PHPNG_MERGE~412^2~565^2~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=948a00ff59200ca003dfeb1d055a6f2de5244035;p=php

Now we always ZVAL_DUP args[argnum] now (in ed8691b2)
---

diff --git a/ext/standard/formatted_print.c b/ext/standard/formatted_print.c
index d1ce7f9c2b..6317c8214c 100644
--- a/ext/standard/formatted_print.c
+++ b/ext/standard/formatted_print.c
@@ -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++;
 		}
 	}