diff options
| author | Xinchen Hui <laruence@php.net> | 2014-06-01 22:29:41 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2014-06-01 22:43:06 +0800 |
| commit | 91b2ddc8160d90c2e6db126f9733c6f543584d66 (patch) | |
| tree | bc9ffe0451b1a3b1aabed3c78b5c310895dc0614 /ext/standard/formatted_print.c | |
| parent | 032bdbba735d1def5e305b1d486604e5f215617a (diff) | |
| parent | d196ac6a48448d654f478192970e07c6bae3e051 (diff) | |
| download | php-git-91b2ddc8160d90c2e6db126f9733c6f543584d66.tar.gz | |
Merge branch 'master' into phpng
Conflicts:
ext/spl/spl_array.c
ext/spl/spl_directory.c
ext/standard/formatted_print.c
Diffstat (limited to 'ext/standard/formatted_print.c')
| -rw-r--r-- | ext/standard/formatted_print.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ext/standard/formatted_print.c b/ext/standard/formatted_print.c index 2942daaad3..6c1f157cec 100644 --- a/ext/standard/formatted_print.c +++ b/ext/standard/formatted_print.c @@ -378,6 +378,7 @@ php_formatted_print(int param_count, int use_array, int format_offset TSRMLS_DC) char *format, padding; zend_string *result; int always_sign; + int format_len; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "+", &args, &argc) == FAILURE) { return NULL; @@ -473,7 +474,7 @@ php_formatted_print(int param_count, int use_array, int format_offset TSRMLS_DC) /* space padding, the default */ } else if (format[inpos] == '+') { always_sign = 1; - } else if (format[inpos] == '\'') { + } else if (format[inpos] == '\'' && inpos+1<format_len) { padding = format[++inpos]; } else { PRINTF_DEBUG(("sprintf: end of modifiers\n")); |