From 4568b11461f80bbc5fa0fb2c522205683ea14ec7 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 8 Dec 2022 16:52:09 +0100 Subject: Adding upstream version 1.12~rc1. Signed-off-by: Daniel Baumann --- zcmpdiff.cc | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'zcmpdiff.cc') diff --git a/zcmpdiff.cc b/zcmpdiff.cc index 5688ee2..31b3f86 100644 --- a/zcmpdiff.cc +++ b/zcmpdiff.cc @@ -54,11 +54,13 @@ void parse_format_types2( const std::string & arg, const char * const pn, int format_types[2] ) { const unsigned i = std::min( arg.find( ',' ), arg.size() ); - if( i > 0 ) format_types[0] = parse_format_type( arg.substr( 0, i ), pn ); - else format_types[0] = -1; - if( i + 1 < arg.size() ) format_types[1] = - parse_format_type( arg.substr( i + 1 ), pn ); - else format_types[1] = -1; + if( i != std::min( arg.rfind( ',' ), arg.size() ) ) + { show_option_error( arg.c_str(), "Too many formats in", pn ); + std::exit( 1 ); } + format_types[0] = + ( i > 0 ) ? parse_format_type( arg.substr( 0, i ), pn ) : -1; + format_types[1] = + ( i + 1 < arg.size() ) ? parse_format_type( arg.substr( i + 1 ), pn ) : -1; } -- cgit v1.2.3