From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 9866638582BD; Wed, 27 Sep 2023 16:19:29 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9866638582BD DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1695831569; bh=HKjxdgZKONR2uQivIhiR9OYphxS/pNTOYIZQvNbnRV8=; h=From:To:Subject:Date:From; b=vCCrlsjM/ws55Z8ZVmfaCylWhRRXvFN+BIzEYyqZxa3gzve5SR67K2V2oPKRICwai tc50ZaqoNKkgSUikxuetxSEvMhQEI4sy6HIK0YAXSWFSpVCdpnd955tLJQMDIwZCq8 uKnihXi/Rq4Bwdr01mi4Sm0YbiLgPC4DpaWnrEl8= 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 r13-7918] libstdc++: Add test for illegal pointer arithmetic in format [PR111102] X-Act-Checkin: gcc X-Git-Author: Paul Dreik X-Git-Refname: refs/heads/releases/gcc-13 X-Git-Oldrev: 0547f663ee09aa5887dcd1bb0ea48eba24a30485 X-Git-Newrev: 9853ad876bd3d9d4685126466f74402e567664b3 Message-Id: <20230927161929.9866638582BD@sourceware.org> Date: Wed, 27 Sep 2023 16:19:29 +0000 (GMT) List-Id: https://gcc.gnu.org/g:9853ad876bd3d9d4685126466f74402e567664b3 commit r13-7918-g9853ad876bd3d9d4685126466f74402e567664b3 Author: Paul Dreik Date: Thu Aug 24 11:43:43 2023 +0100 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. (cherry picked from commit 7564fe98657ad5ede34bd08f5279778fa8698865) Diff: --- libstdc++-v3/testsuite/std/format/string.cc | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/libstdc++-v3/testsuite/std/format/string.cc b/libstdc++-v3/testsuite/std/format/string.cc index fef55b9bcd9..a472f8d588c 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