From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 462C43858C66; Wed, 19 Jul 2023 10:11:50 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 462C43858C66 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1689761510; bh=GNH8qUE6LSjBlHNGWkuj5yJqhGyTKfxuPe20GstEfrQ=; h=From:To:Subject:Date:From; b=SlmZf2IS88bkmSj7herWsRS5C4nRQEAGjiho/2gJqaJWSxvHeLB8j7DQpd4//6n2c 3zHMywmQcPwaf3x2hlQt9gUVAUOyq1QGDfrNJ+qhJfBxVrxWtuEs6Fc5EICUmtwDOx 7juNxzM1I/UywoAEK83hd7+dEPQfjCPk/yrQzgu0= 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 r14-2638] libstdc++: Check for multiple modifiers in chrono format string [PR110708] X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: f07136af570b145fe0df6b142defc9558998bf53 X-Git-Newrev: 52bfec7ea0eb0f1a4c5bfa55b0d6b9b6c8808e26 Message-Id: <20230719101150.462C43858C66@sourceware.org> Date: Wed, 19 Jul 2023 10:11:50 +0000 (GMT) List-Id: https://gcc.gnu.org/g:52bfec7ea0eb0f1a4c5bfa55b0d6b9b6c8808e26 commit r14-2638-g52bfec7ea0eb0f1a4c5bfa55b0d6b9b6c8808e26 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. 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