aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Dreik <gccpatches@pauldreik.se>2023-08-24 11:43:43 +0100
committerJonathan Wakely <jwakely@redhat.com>2023-08-24 13:44:39 +0100
commit7564fe98657ad5ede34bd08f5279778fa8698865 (patch)
tree6b1e91aa0838b1aa5dcc38e03f727c2389f50c58
parentdd4bdb9eea436bf06f175d8dbfc2190377455be4 (diff)
downloadgcc-7564fe98657ad5ede34bd08f5279778fa8698865.zip
gcc-7564fe98657ad5ede34bd08f5279778fa8698865.tar.gz
gcc-7564fe98657ad5ede34bd08f5279778fa8698865.tar.bz2
libstdc++: Add test for illegal pointer arithmetic in format [PR111102]
libstdc++-v3/ChangeLog: PR libstdc++/111102 * testsuite/std/format/string.cc: Check wide character format strings with out-of-range widths.
-rw-r--r--libstdc++-v3/testsuite/std/format/string.cc15
1 files changed, 15 insertions, 0 deletions
diff --git a/libstdc++-v3/testsuite/std/format/string.cc b/libstdc++-v3/testsuite/std/format/string.cc
index fef55b9..a472f8d 100644
--- a/libstdc++-v3/testsuite/std/format/string.cc
+++ b/libstdc++-v3/testsuite/std/format/string.cc
@@ -16,6 +16,18 @@ is_format_string_for(const char* str, Args&&... args)
}
}
+template<typename... Args>
+bool
+is_format_string_for(const wchar_t* str, Args&&... args)
+{
+ try {
+ (void) std::vformat(str, std::make_wformat_args(args...));
+ return true;
+ } catch (const std::format_error&) {
+ return false;
+ }
+}
+
void
test_no_args()
{
@@ -124,8 +136,11 @@ test_format_spec()
// Maximum integer value supported for widths and precisions is USHRT_MAX.
VERIFY( is_format_string_for("{:65535}", 1) );
+ VERIFY( is_format_string_for(L"{:65535}", 1) );
VERIFY( ! is_format_string_for("{:65536}", 1) );
+ VERIFY( ! is_format_string_for(L"{:65536}", 1) );
VERIFY( ! is_format_string_for("{:9999999}", 1) );
+ VERIFY( ! is_format_string_for(L"{:9999999}", 1) );
}
void