From: Jonathan Wakely <jwakely@redhat.com>
To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org
Subject: [committed] libstdc++: Handle invalid values in std::chrono pretty printers
Date: Fri, 11 Aug 2023 15:03:12 +0100 [thread overview]
Message-ID: <20230811140332.1390523-1-jwakely@redhat.com> (raw)
Tested x86_64-linux, Pushed to trunk. I'll backport this to gcc-13 too.
-- >8 --
This avoids an IndexError exception when printing invalid chrono::month
or chrono::weekday values.
libstdc++-v3/ChangeLog:
* python/libstdcxx/v6/printers.py (StdChronoCalendarPrinter):
Check for out-of-range month an weekday indices.
* testsuite/libstdc++-prettyprinters/chrono.cc: Check invalid
month and weekday values.
---
libstdc++-v3/python/libstdcxx/v6/printers.py | 7 ++++++-
libstdc++-v3/testsuite/libstdc++-prettyprinters/chrono.cc | 7 +++++++
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/libstdc++-v3/python/libstdcxx/v6/printers.py b/libstdc++-v3/python/libstdcxx/v6/printers.py
index b4c427d487c..0187c4b60e6 100644
--- a/libstdc++-v3/python/libstdcxx/v6/printers.py
+++ b/libstdc++-v3/python/libstdcxx/v6/printers.py
@@ -2021,11 +2021,16 @@ class StdChronoCalendarPrinter:
if typ == 'std::chrono::day':
return '{}'.format(int(val['_M_d']))
if typ == 'std::chrono::month':
+ if m < 1 or m >= len(months):
+ return "%d is not a valid month" % m
return months[m]
if typ == 'std::chrono::year':
return '{}y'.format(y)
if typ == 'std::chrono::weekday':
- return '{}'.format(weekdays[val['_M_wd']])
+ wd = val['_M_wd']
+ if wd < 0 or wd >= len(weekdays):
+ return "%d is not a valid weekday" % wd
+ return '{}'.format(weekdays[wd])
if typ == 'std::chrono::weekday_indexed':
return '{}[{}]'.format(val['_M_wd'], int(val['_M_index']))
if typ == 'std::chrono::weekday_last':
diff --git a/libstdc++-v3/testsuite/libstdc++-prettyprinters/chrono.cc b/libstdc++-v3/testsuite/libstdc++-prettyprinters/chrono.cc
index b5314e025cc..9aa284aea2f 100644
--- a/libstdc++-v3/testsuite/libstdc++-prettyprinters/chrono.cc
+++ b/libstdc++-v3/testsuite/libstdc++-prettyprinters/chrono.cc
@@ -75,6 +75,13 @@ main()
[[maybe_unused]] year_month_weekday_last donnerstag = 2017y/July/Thursday[last];
// { dg-final { note-test donnerstag {2017y/July/Thursday[last]} } }
+ [[maybe_unused]] month nam(13);
+ // { dg-final { note-test nam {13 is not a valid month} } }
+ [[maybe_unused]] month nam0(0);
+ // { dg-final { note-test nam0 {0 is not a valid month} } }
+ [[maybe_unused]] weekday nawd(8);
+ // { dg-final { note-test nawd {8 is not a valid weekday} } }
+ //
hh_mm_ss<seconds> hms(4h + 3min + 2s);
// { dg-final { note-test hms {04:03:02} } }
--
2.41.0
reply other threads:[~2023-08-11 14:03 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230811140332.1390523-1-jwakely@redhat.com \
--to=jwakely@redhat.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=libstdc++@gcc.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).