From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 7905) id 9D153385AC29; Tue, 31 Jan 2023 13:15:17 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9D153385AC29 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1675170917; bh=gLE/qXnIy5t7cWf6mUX/g1bej9H0bALWkA/beDDipSs=; h=From:To:Subject:Date:From; b=OxPJPLz3Dadzzhhzovu7beq6/JTo1KgeXzmL1vWthQzfJCzd0ppWNShxZUJPfGLB/ vgEurBFASDC+36OhZbeRVoAitFjy4uTGgCRXSa1WwdAdLZZqnGrUVrvdd1ojr+8HRa EXCjTU/p5DHnySxw2PWjf7i+OAuyKfN94ttH7nUc= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Arthur Cohen To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-5546] gccrs: Add guards against getting data from an empty vector X-Act-Checkin: gcc X-Git-Author: Philip Herron X-Git-Refname: refs/heads/master X-Git-Oldrev: 3663d7ef66624b267114db5c59a959cdc7816aaa X-Git-Newrev: 245ce6f26a1688ad69a1802ec50fa865db409eec Message-Id: <20230131131517.9D153385AC29@sourceware.org> Date: Tue, 31 Jan 2023 13:15:17 +0000 (GMT) List-Id: https://gcc.gnu.org/g:245ce6f26a1688ad69a1802ec50fa865db409eec commit r13-5546-g245ce6f26a1688ad69a1802ec50fa865db409eec Author: Philip Herron Date: Fri Aug 26 20:52:35 2022 +0100 gccrs: Add guards against getting data from an empty vector gcc/rust/ChangeLog: * typecheck/rust-tyctx.cc (TypeCheckContext::pop_return_type): Add guards around `std::vector.pop_back()`. (TypeCheckContext::peek_context): Likewise for `std::vector.back()`. Diff: --- gcc/rust/typecheck/rust-tyctx.cc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gcc/rust/typecheck/rust-tyctx.cc b/gcc/rust/typecheck/rust-tyctx.cc index ad5f67cc1dd..af86b064c6c 100644 --- a/gcc/rust/typecheck/rust-tyctx.cc +++ b/gcc/rust/typecheck/rust-tyctx.cc @@ -142,12 +142,14 @@ TypeCheckContext::push_return_type (TypeCheckContextItem item, void TypeCheckContext::pop_return_type () { + rust_assert (!return_type_stack.empty ()); return_type_stack.pop_back (); } TypeCheckContextItem & TypeCheckContext::peek_context () { + rust_assert (!return_type_stack.empty ()); return return_type_stack.back ().first; }