projects
/
php
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
69a93d2
)
Fixed segfault in ext/standard/tests/strings/fprintf_variation_001.php
author
Xinchen Hui
<laruence@gmail.com>
Sun, 23 Feb 2014 14:33:10 +0000
(22:33 +0800)
committer
Xinchen Hui
<laruence@gmail.com>
Sun, 23 Feb 2014 14:33:10 +0000
(22:33 +0800)
ext/standard/formatted_print.c
patch
|
blob
|
history
diff --git
a/ext/standard/formatted_print.c
b/ext/standard/formatted_print.c
index cc5925bee7a29b3d27a461a77136750493fa0488..d1ce7f9c2b171af7e7b5058af54fdc5e671d86e8 100644
(file)
--- 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': {