diff mbox series

[committed] libstdc++: Do not allow chrono::parse to overflow for %C [PR111162]

Message ID 20230901105519.226612-1-jwakely@redhat.com
State Unresolved
Headers
Series [committed] libstdc++: Do not allow chrono::parse to overflow for %C [PR111162] |

Checks

Context Check Description
snail/gcc-patch-check warning Git am fail log

Commit Message

Jonathan Wakely Sept. 1, 2023, 10:55 a.m. UTC 
  Tested x86_64-linux. Pushed to trunk.

-- >8 --

libstdc++-v3/ChangeLog:

	PR libstdc++/111162
	* include/bits/chrono_io.h (_Parser::Operator()): Check %C
	values are in range of year::min() to year::max().
	* testsuite/std/time/parse.cc: Check out of range centuries.
---
 libstdc++-v3/include/bits/chrono_io.h    |  9 ++++++++-
 libstdc++-v3/testsuite/std/time/parse.cc | 12 ++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/libstdc++-v3/include/bits/chrono_io.h b/libstdc++-v3/include/bits/chrono_io.h
index d558802e7d8..f359571b4db 100644
--- a/libstdc++-v3/include/bits/chrono_io.h
+++ b/libstdc++-v3/include/bits/chrono_io.h
@@ -3171,7 +3171,14 @@  namespace __detail
 		    {
 		      auto __v = __read_signed(__num ? __num : 2);
 		      if (!__is_failed(__err))
-			__century = __v * 100;
+			{
+			  int __cmin = (int)year::min() / 100;
+			  int __cmax = (int)year::max() / 100;
+			  if (__cmin <= __v && __v <= __cmax)
+			    __century = __v * 100;
+			  else
+			    __century = -2; // This prevents guessing century.
+			}
 		    }
 		  else if (__mod == 'E')
 		    {
diff --git a/libstdc++-v3/testsuite/std/time/parse.cc b/libstdc++-v3/testsuite/std/time/parse.cc
index 9b36c5d7db4..46eb7f28c85 100644
--- a/libstdc++-v3/testsuite/std/time/parse.cc
+++ b/libstdc++-v3/testsuite/std/time/parse.cc
@@ -251,6 +251,18 @@  test_errors()
   is >> parse("%H:%M %3y", y); // 61min is out of range but not needed
   VERIFY( is.eof() && ! is.fail() );
   VERIFY( y == 2010y );
+
+  is.clear();
+  is.str("328 00");
+  is >> parse("%3C %y", y); // 328 is out of range for %C (PR libstdc++/111162)
+  VERIFY( is.fail() );
+  VERIFY( y == 2010y );
+
+  is.clear();
+  is.str("-328 00");
+  is >> parse("%3C %y", y); // -328 is out of range for %C
+  VERIFY( is.fail() );
+  VERIFY( y == 2010y );
 }
 
 void