com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/standard/ formatted_print.c ext/standard/tests/strings/bug672 49.phpt

From: Date: Wed, 28 May 2014 08:00:33 +0000
Subject: com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/standard/ formatted_print.c ext/standard/tests/strings/bug672 49.phpt
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-78602@lists.php.net to get a copy of this message
Commit: 8a904ba8a5bd3b0c3feda1dfed6fd3b3072e5af6 Author: Stanislav Malyshev <stas@php.net> Tue, 27 May 2014 12:10:03 -0700 Committer: Julien Pauli <jpauli@php.net> Wed, 28 May 2014 10:00:33 +0200 Parents: 3ef354e4cf225e171333b27346f344982103ca94 Branches: PHP-5.5.13 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=8a904ba8a5bd3b0c3feda1dfed6fd3b3072e5af6 Log: Merge branch 'PHP-5.4' into PHP-5.5 * PHP-5.4: update NEWS Fix bug #67249: printf out-of-bounds read Bugs: https://bugs.php.net/67249 Changed paths: M ext/standard/formatted_print.c A ext/standard/tests/strings/bug67249.phpt Diff: diff --git a/ext/standard/formatted_print.c b/ext/standard/formatted_print.c index 3cd5839..2592b16 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 0000000..6ea7528 --- /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) ""

« previous php.cvs (#78602) next »