diff options
| author | Ondřej Surý <ondrej@sury.org> | 2014-06-07 09:49:55 +0200 |
|---|---|---|
| committer | Ondřej Surý <ondrej@sury.org> | 2014-06-07 09:49:55 +0200 |
| commit | c63e1a09f5cbd757f59beb729fb0fb36516819a9 (patch) | |
| tree | 901250de5d55280e0163cd59e99b05cd07d4db0b /ext/standard | |
| parent | 32c3fbba663e5b1da38bdd2d84b0a9a78271ddfa (diff) | |
| download | php-c63e1a09f5cbd757f59beb729fb0fb36516819a9.tar.gz | |
New upstream version 5.6.0~beta4+dfsgupstream/5.6.0_beta4+dfsg
Diffstat (limited to 'ext/standard')
| -rw-r--r-- | ext/standard/formatted_print.c | 6 | ||||
| -rw-r--r-- | ext/standard/tests/strings/bug67249.phpt | 8 |
2 files changed, 12 insertions, 2 deletions
diff --git a/ext/standard/formatted_print.c b/ext/standard/formatted_print.c index 3cd583931..2592b1655 100644 --- a/ext/standard/formatted_print.c +++ b/ext/standard/formatted_print.c @@ -376,6 +376,7 @@ php_formatted_print(int ht, int *len, int use_array, int format_offset TSRMLS_DC int alignment, currarg, adjusting, argnum, width, precision; char *format, *result, padding; int always_sign; + int format_len; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "+", &args, &argc) == FAILURE) { return NULL; @@ -414,11 +415,12 @@ php_formatted_print(int ht, int *len, int use_array, int format_offset TSRMLS_DC convert_to_string_ex(args[format_offset]); format = Z_STRVAL_PP(args[format_offset]); + format_len = Z_STRLEN_PP(args[format_offset]); result = emalloc(size); currarg = 1; - while (inpos<Z_STRLEN_PP(args[format_offset])) { + while (inpos<format_len) { int expprec = 0, multiuse = 0; zval *tmp; @@ -473,7 +475,7 @@ php_formatted_print(int ht, int *len, 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")); diff --git a/ext/standard/tests/strings/bug67249.phpt b/ext/standard/tests/strings/bug67249.phpt new file mode 100644 index 000000000..6ea75289e --- /dev/null +++ b/ext/standard/tests/strings/bug67249.phpt @@ -0,0 +1,8 @@ +--TEST-- +Bug #67249 (printf out-of-bounds read) +--FILE-- +<?php +var_dump(sprintf("%'", "foo")); +?> +--EXPECT-- +string(0) "" |