gccrs: fix crash in parse repr options and missing delete call

Fixes Rust-GCC#3606

gcc/rust/ChangeLog:

	* typecheck/rust-hir-type-check-base.cc (TypeCheckBase::parse_repr_options):
	check for null and empty and add missing delete call

gcc/testsuite/ChangeLog:

	* rust/compile/issue-3606.rs: New test.

Signed-off-by: Philip Herron <herron.philip@googlemail.com>

diff --git a/gcc/rust/typecheck/rust-hir-type-check-base.cc b/gcc/rust/typecheck/rust-hir-type-check-base.cc
index f60b540cd8c100e381ed0ecd8f54e398ee6ae788..378ef02eda123c1243e5b93bc665f57443ff9b95 100644 (file)
--- a/gcc/rust/typecheck/rust-hir-type-check-base.cc
+++ b/gcc/rust/typecheck/rust-hir-type-check-base.cc
@@ -321,8 +321,22 @@ TypeCheckBase::parse_repr_options (const AST::AttrVec &attrs, location_t locus)
          AST::AttrInputMetaItemContainer *meta_items
            = option.parse_to_meta_item ();
 
-         const std::string inline_option
-           = meta_items->get_items ().at (0)->as_string ();
+         if (meta_items == nullptr)
+           {
+             rust_error_at (attr.get_locus (), "malformed %qs attribute",
+                            "repr");
+             continue;
+           }
+
+         auto &items = meta_items->get_items ();
+         if (items.size () == 0)
+           {
+             // nothing to do with this its empty
+             delete meta_items;
+             continue;
+           }
+
+         const std::string inline_option = items.at (0)->as_string ();
 
          // TODO: it would probably be better to make the MetaItems more aware
          // of constructs with nesting like #[repr(packed(2))] rather than
@@ -359,6 +373,8 @@ TypeCheckBase::parse_repr_options (const AST::AttrVec &attrs, location_t locus)
          else if (is_align)
            repr.align = value;
 
+         delete meta_items;
+
          // Multiple repr options must be specified with e.g. #[repr(C,
          // packed(2))].
          break;

diff --git a/gcc/testsuite/rust/compile/issue-3606.rs b/gcc/testsuite/rust/compile/issue-3606.rs
new file mode 100644 (file)
index 0000000..73b0bd6
--- /dev/null
+++ b/gcc/testsuite/rust/compile/issue-3606.rs
@@ -0,0 +1,6 @@
+// { dg-options "-w" }
+#[repr()]
+pub struct Coord {
+    x: u32,
+    y: u32,
+}