diff options
| author | Xinchen Hui <laruence@php.net> | 2014-06-01 23:14:31 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2014-06-01 23:14:31 +0800 |
| commit | 717b5661e7180053629658a90d7946e09c2fe2c8 (patch) | |
| tree | d6aadf90f14fc68fb91a4062bd916e9fec765619 | |
| parent | 91b2ddc8160d90c2e6db126f9733c6f543584d66 (diff) | |
| download | php-git-717b5661e7180053629658a90d7946e09c2fe2c8.tar.gz | |
Fixed merge
| -rw-r--r-- | ext/standard/formatted_print.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ext/standard/formatted_print.c b/ext/standard/formatted_print.c index 6c1f157cec..aa83b30c45 100644 --- a/ext/standard/formatted_print.c +++ b/ext/standard/formatted_print.c @@ -414,6 +414,7 @@ php_formatted_print(int param_count, int use_array, int format_offset TSRMLS_DC) } format = Z_STRVAL(args[format_offset]); + format_len = Z_STRLEN(args[format_offset]); result = STR_ALLOC(size, 0); currarg = 1; |