From 61a6ea8eac9fbaa36e10d5e6a4701d01a3faa8a8 Mon Sep 17 00:00:00 2001 From: Lucas Ly Ba Date: Thu, 6 Nov 2025 14:57:45 +0000 Subject: [PATCH] gccrs: fix segfault with empty cfg attribute gcc/rust/ChangeLog: * ast/rust-ast.cc (Attribute::check_cfg_predicate): add cfg path in condition gcc/testsuite/ChangeLog: * rust/compile/issue-4261.rs: New test. Signed-off-by: Lucas Ly Ba --- gcc/rust/ast/rust-ast.cc | 7 ++++--- gcc/testsuite/rust/compile/issue-4261.rs | 3 +++ 2 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 gcc/testsuite/rust/compile/issue-4261.rs diff --git a/gcc/rust/ast/rust-ast.cc b/gcc/rust/ast/rust-ast.cc index 337a338f9a3..7a9c1085bed 100644 --- a/gcc/rust/ast/rust-ast.cc +++ b/gcc/rust/ast/rust-ast.cc @@ -4179,10 +4179,11 @@ Attribute::check_cfg_predicate (const Session &session) const auto &meta_item = static_cast (*attr_input); if (meta_item.get_items ().empty () - && string_path == Values::Attributes::CFG_ATTR) + && (string_path == Values::Attributes::CFG + || string_path == Values::Attributes::CFG_ATTR)) { - rust_error_at (path.get_locus (), - "malformed % attribute input"); + rust_error_at (path.get_locus (), "malformed %<%s%> attribute input", + string_path.c_str ()); return false; } return meta_item.get_items ().front ()->check_cfg_predicate (session); diff --git a/gcc/testsuite/rust/compile/issue-4261.rs b/gcc/testsuite/rust/compile/issue-4261.rs new file mode 100644 index 00000000000..32beafade54 --- /dev/null +++ b/gcc/testsuite/rust/compile/issue-4261.rs @@ -0,0 +1,3 @@ +#[cfg()] +// { dg-error "malformed .cfg. attribute input" "" { target *-*-* } .-1 } +fn a() {}