From d088b25d7e3a317e98b59d49c262a314fb2bbd26 Mon Sep 17 00:00:00 2001 From: Seiichi Uchida Date: Fri, 12 Jan 2018 11:41:33 +0900 Subject: [PATCH] Avoid panicking when invalid argument is passed to cfg(..) Closes #43925. Closes #43926. --- src/librustc_metadata/native_libs.rs | 16 +++++++++++++--- src/test/compile-fail/issue-43925.rs | 16 ++++++++++++++++ src/test/compile-fail/issue-43926.rs | 14 ++++++++++++++ 3 files changed, 43 insertions(+), 3 deletions(-) create mode 100644 src/test/compile-fail/issue-43925.rs create mode 100644 src/test/compile-fail/issue-43926.rs diff --git a/src/librustc_metadata/native_libs.rs b/src/librustc_metadata/native_libs.rs index cc332acb5b0..c0ce32cc970 100644 --- a/src/librustc_metadata/native_libs.rs +++ b/src/librustc_metadata/native_libs.rs @@ -92,9 +92,19 @@ impl<'a, 'tcx> ItemLikeVisitor<'tcx> for Collector<'a, 'tcx> { let cfg = items.iter().find(|k| { k.check_name("cfg") }).and_then(|a| a.meta_item_list()); - let cfg = cfg.map(|list| { - list[0].meta_item().unwrap().clone() - }); + let cfg = if let Some(list) = cfg { + if list.is_empty() { + self.tcx.sess.span_err(m.span(), "`cfg()` must have an argument"); + return; + } else if let cfg @ Some(..) = list[0].meta_item() { + cfg.cloned() + } else { + self.tcx.sess.span_err(list[0].span(), "invalid argument for `cfg(..)`"); + return; + } + } else { + None + }; let foreign_items = fm.items.iter() .map(|it| self.tcx.hir.local_def_id(it.id)) .collect(); diff --git a/src/test/compile-fail/issue-43925.rs b/src/test/compile-fail/issue-43925.rs new file mode 100644 index 00000000000..8ad57647290 --- /dev/null +++ b/src/test/compile-fail/issue-43925.rs @@ -0,0 +1,16 @@ +// Copyright 2018 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. +// +// Licensed under the Apache License, Version 2.0 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +#![feature(attr_literals)] + +#[link(name="foo", cfg("rlib"))] //~ ERROR invalid argument for `cfg(..)` +extern {} + +fn main() {} diff --git a/src/test/compile-fail/issue-43926.rs b/src/test/compile-fail/issue-43926.rs new file mode 100644 index 00000000000..5d510b643a3 --- /dev/null +++ b/src/test/compile-fail/issue-43926.rs @@ -0,0 +1,14 @@ +// Copyright 2018 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. +// +// Licensed under the Apache License, Version 2.0 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +#[link(name="foo", cfg())] //~ ERROR `cfg()` must have an argument +extern {} + +fn main() {}