com php-src: Fixed segfault in ext/standard/tests/strings/fprin tf_variation_001.php: ext/standard/formatted_ print.c
| From: | Dmitry Stogov | Date: | Sun, 23 Feb 2014 14:33:10 +0000 |
| Subject: | com php-src: Fixed segfault in ext/standard/tests/strings/fprin tf_variation_001.php: ext/standard/formatted_ print.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-77992@lists.php.net to get a copy of this message | ||
Commit: ed8691b24be8673c2ab316991bfea885b1717f79
Author: Xinchen Hui <laruence@gmail.com> Sun, 23 Feb 2014 22:33:10 +0800
Parents: 69a93d2fd79b3e4719e0bb95ee75a6d13275ec3e
Branches: phpng
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ed8691b24be8673c2ab316991bfea885b1717f79
Log:
Fixed segfault in ext/standard/tests/strings/fprintf_variation_001.php
Changed paths:
M ext/standard/formatted_print.c
Diff:
diff --git a/ext/standard/formatted_print.c b/ext/standard/formatted_print.c
index cc5925b..d1ce7f9 100644
--- a/ext/standard/formatted_print.c
+++ b/ext/standard/formatted_print.c
@@ -540,12 +540,13 @@ php_formatted_print(int param_count, int use_array, int format_offset
TSRMLS_DC)
}
PRINTF_DEBUG(("sprintf: format character='%c'\n", format[inpos]));
/* now we expect to find a type specifier */
- if (multiuse) {
+ //???? We don't hold zval** in args anymore
+ //if (multiuse) {
ZVAL_DUP(&tmp, &args[argnum]);
- } else {
- SEPARATE_ZVAL(&args[argnum]);
- ZVAL_COPY_VALUE(&tmp, &args[argnum]);
- }
+ //} else {
+ // SEPARATE_ZVAL(&args[argnum]);
+ // ZVAL_COPY_VALUE(&tmp, &args[argnum]);
+ //}
switch (format[inpos]) {
case 's': {