From: Paul Dreik Date: Thu, 24 Aug 2023 10:43:43 +0000 (+0100) Subject: libstdc++: Add test for illegal pointer arithmetic in format [PR111102] X-Git-Tag: basepoints/gcc-15~6681 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7564fe98657ad5ede34bd08f5279778fa8698865;p=thirdparty%2Fgcc.git 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. --- diff --git a/libstdc++-v3/testsuite/std/format/string.cc b/libstdc++-v3/testsuite/std/format/string.cc index fef55b9bcd9e..a472f8d588c2 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 +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