com php-src: Now we always ZVAL_DUP args[argnum] now (in ed8691b2): ext/standard/formatted_ print.c

From: Date: Mon, 24 Feb 2014 07:13:06 +0000
Subject: com php-src: Now we always ZVAL_DUP args[argnum] now (in ed8691b2): ext/standard/formatted_ print.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-77997@lists.php.net to get a copy of this message
Commit: 948a00ff59200ca003dfeb1d055a6f2de5244035 Author: Xinchen Hui <laruence@gmail.com> Mon, 24 Feb 2014 15:10:16 +0800 Parents: 737a84ed04e0f2e46fe2cf94abef95e7b480702e Branches: phpng Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=948a00ff59200ca003dfeb1d055a6f2de5244035 Log: Now we always ZVAL_DUP args[argnum] now (in ed8691b2) Changed paths: M ext/standard/formatted_print.c Diff: diff --git a/ext/standard/formatted_print.c b/ext/standard/formatted_print.c index d1ce7f9..6317c82 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++; } }

« previous php.cvs (#77997) next »