From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTP id 1D594385843A for ; Tue, 31 Aug 2021 18:14:26 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 1D594385843A Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-438-bNsdpXN6OAeAkDgo_np6Kg-1; Tue, 31 Aug 2021 14:14:23 -0400 X-MC-Unique: bNsdpXN6OAeAkDgo_np6Kg-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id EC81B87D542; Tue, 31 Aug 2021 18:14:22 +0000 (UTC) Received: from localhost (unknown [10.33.36.214]) by smtp.corp.redhat.com (Postfix) with ESMTP id 75609380; Tue, 31 Aug 2021 18:14:22 +0000 (UTC) Date: Tue, 31 Aug 2021 19:14:21 +0100 From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Add valid range checks to std::span constructors [PR98421] Message-ID: MIME-Version: 1.0 X-Clacks-Overhead: GNU Terry Pratchett X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: multipart/mixed; boundary="tOzxUy7Bpufb3zcX" Content-Disposition: inline X-Spam-Status: No, score=-14.1 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libstdc++@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++ mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 Aug 2021 18:14:29 -0000 --tOzxUy7Bpufb3zcX Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Signed-off-by: Jonathan Wakely libstdc++-v3/ChangeLog: PR libstdc++/98421 * include/std/span (span(Iter, size_type), span(Iter, Iter)): Add valid range checks. * testsuite/23_containers/span/cons_1_assert_neg.cc: New test. * testsuite/23_containers/span/cons_2_assert_neg.cc: New test. Tested x86_64-linux. Committed to trunk. --tOzxUy7Bpufb3zcX Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="patch.txt" commit ef7becc9c8a48804d3fd9dac032f7b33e561a612 Author: Jonathan Wakely Date: Tue Aug 31 17:34:51 2021 libstdc++: Add valid range checks to std::span constructors [PR98421] Signed-off-by: Jonathan Wakely libstdc++-v3/ChangeLog: PR libstdc++/98421 * include/std/span (span(Iter, size_type), span(Iter, Iter)): Add valid range checks. * testsuite/23_containers/span/cons_1_assert_neg.cc: New test. * testsuite/23_containers/span/cons_2_assert_neg.cc: New test. diff --git a/libstdc++-v3/include/std/span b/libstdc++-v3/include/std/span index 21d8f6a43a6..be053e8ef38 100644 --- a/libstdc++-v3/include/std/span +++ b/libstdc++-v3/include/std/span @@ -160,6 +160,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { __glibcxx_assert(__count == _Extent); } + __glibcxx_requires_valid_range(__first, __first + __count); } template _End> @@ -175,6 +176,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { __glibcxx_assert((__last - __first) == _Extent); } + __glibcxx_requires_valid_range(__first, __last); } template diff --git a/libstdc++-v3/testsuite/23_containers/span/cons_1_assert_neg.cc b/libstdc++-v3/testsuite/23_containers/span/cons_1_assert_neg.cc new file mode 100644 index 00000000000..2f555125453 --- /dev/null +++ b/libstdc++-v3/testsuite/23_containers/span/cons_1_assert_neg.cc @@ -0,0 +1,14 @@ +// { dg-options "-std=gnu++2a" } +// { dg-do run { xfail *-*-* } } +// { dg-require-effective-target c++2a } + +#undef _GLIBCXX_DEBUG +#define _GLIBCXX_DEBUG +#include +#include + +int main() +{ + std::vector v(2); + std::span s(v.begin(), 3); +} diff --git a/libstdc++-v3/testsuite/23_containers/span/cons_2_assert_neg.cc b/libstdc++-v3/testsuite/23_containers/span/cons_2_assert_neg.cc new file mode 100644 index 00000000000..efef0e608ba --- /dev/null +++ b/libstdc++-v3/testsuite/23_containers/span/cons_2_assert_neg.cc @@ -0,0 +1,14 @@ +// { dg-options "-std=gnu++2a" } +// { dg-do run { xfail *-*-* } } +// { dg-require-effective-target c++2a } + +#undef _GLIBCXX_DEBUG +#define _GLIBCXX_DEBUG +#include +#include + +int main() +{ + std::vector v(2), w(1); + std::span s(v.begin(), w.end()); +} --tOzxUy7Bpufb3zcX--