From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 693973853D34; Fri, 28 Jul 2023 17:32:41 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 693973853D34 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1690565561; bh=h5/ZqP8nJ3cS7WRDO8A6vnCSAjzOPBQ4UwW+fWEM6Xw=; h=From:To:Subject:Date:From; b=nks+BwG5K3if7Z1vvEfEmQNl/nQSrLGk95t+1OrK9aIKGaiyql6A3KXUOM+22ZUC6 IV2yTlRp46CQJVGLegiRkTA/Ze9gMK3OlREgTlXktflIH2wYJAqq6WitaZT7wrRw4N DN3qzGSyyNDt3qewo1LYcRtTLByoS75e6Zlxuo58= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r13-7629] libstdc++: Check for multiple modifiers in chrono format string [PR110708] X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/releases/gcc-13 X-Git-Oldrev: 6302b8b7ed2e1cb67dec5d7d20e34d4c8e35161c X-Git-Newrev: 74f1c016f44daf18e4bed76b283cd5bfd0b5c8c7 Message-Id: <20230728173241.693973853D34@sourceware.org> Date: Fri, 28 Jul 2023 17:32:41 +0000 (GMT) List-Id: https://gcc.gnu.org/g:74f1c016f44daf18e4bed76b283cd5bfd0b5c8c7 commit r13-7629-g74f1c016f44daf18e4bed76b283cd5bfd0b5c8c7 Author: Jonathan Wakely Date: Tue Jul 18 10:36:37 2023 +0100 libstdc++: Check for multiple modifiers in chrono format string [PR110708] The logic for handling modified chrono specs like %Ey was just restarting the loop after each modifier, and not checking whether we'd already seen a modifier. libstdc++-v3/ChangeLog: PR libstdc++/110708 * include/bits/chrono_io.h (__formatter_chrono::_M_parse): Only allow a single modifier. * testsuite/std/time/format.cc: Check multiple modifiers. (cherry picked from commit 52bfec7ea0eb0f1a4c5bfa55b0d6b9b6c8808e26) Diff: --- libstdc++-v3/include/bits/chrono_io.h | 5 +++++ libstdc++-v3/testsuite/std/time/format.cc | 10 ++++++++++ 2 files changed, 15 insertions(+) diff --git a/libstdc++-v3/include/bits/chrono_io.h b/libstdc++-v3/include/bits/chrono_io.h index 87caa30b83a..5f06a6d76b4 100644 --- a/libstdc++-v3/include/bits/chrono_io.h +++ b/libstdc++-v3/include/bits/chrono_io.h @@ -426,6 +426,11 @@ namespace __format break; case 'O': case 'E': + if (__mod) [[unlikely]] + { + __allowed_mods = _Mod_none; + break; + } __mod = __c; continue; default: diff --git a/libstdc++-v3/testsuite/std/time/format.cc b/libstdc++-v3/testsuite/std/time/format.cc index b05e5da1af8..0dc45d58dce 100644 --- a/libstdc++-v3/testsuite/std/time/format.cc +++ b/libstdc++-v3/testsuite/std/time/format.cc @@ -68,6 +68,16 @@ test_bad_format_strings() // modifier not valid for conversion specifier VERIFY( not is_format_string_for("{:%Ea}", t) ); VERIFY( not is_format_string_for("{:%Oa}", t) ); + + // more than one modifier (PR libstdc++/110708) + VERIFY( not is_format_string_for("{:%EEc}", t) ); + VERIFY( not is_format_string_for("{:%EEEc}", t) ); + VERIFY( not is_format_string_for("{:%OOd}", t) ); + VERIFY( not is_format_string_for("{:%OOOd}", t) ); + VERIFY( not is_format_string_for("{:%EEy}", t) ); + VERIFY( not is_format_string_for("{:%OOy}", t) ); + VERIFY( not is_format_string_for("{:%OEy}", t) ); + VERIFY( not is_format_string_for("{:%EOy}", t) ); } template