fmtlib/fmt
1
0
Fork 1
mirror of https://github.com/fmtlib/fmt.git synced 2025-11-27 21:00:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Report error from parse_nonnegative_int via handler

Browse Source
This commit is contained in:
Victor Zverovich
2017-10-21 08:37:52 -07:00
parent 0ebdf41efa
commit 932ab2bfca
2 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/fmt/printf.h
View File

@@ -389,7 +389,8 @@ unsigned printf_context<Char, AF>::parse_header(
if (c >= '0' && c <= '9') {
// Parse an argument index (if followed by '$') or a width possibly
// preceded with '0' flag(s).
unsigned value = internal::parse_nonnegative_int(it);
internal::error_handler eh;
unsigned value = parse_nonnegative_int(it, eh);
if (*it == '$') { // value is an argument index
++it;
arg_index = value;
@@ -407,7 +408,8 @@ unsigned printf_context<Char, AF>::parse_header(
parse_flags(spec, it);
// Parse width.
if (*it >= '0' && *it <= '9') {
spec.width_ = internal::parse_nonnegative_int(it);
internal::error_handler eh;
spec.width_ = parse_nonnegative_int(it, eh);
} else if (*it == '*') {
++it;
spec.width_ = visit(internal::PrintfWidthHandler<Char>(spec), get_arg(it));
@@ -441,7 +443,8 @@ void printf_context<Char, AF>::format(basic_buffer<Char> &buffer) {
if (*it == '.') {
++it;
if ('0' <= *it && *it <= '9') {
spec.precision_ = static_cast<int>(internal::parse_nonnegative_int(it));
internal::error_handler eh;
spec.precision_ = static_cast<int>(parse_nonnegative_int(it, eh));
} else if (*it == '*') {
++it;
spec.precision_ =