From 74609bca807e13587bfca1c2aaddbc0753008708 Mon Sep 17 00:00:00 2001 From: varkor Date: Sat, 23 Jun 2018 22:31:31 +0100 Subject: [PATCH 1/3] Add error for using null characters in export_name --- src/librustc_typeck/collect.rs | 13 ++++++++++--- src/librustc_typeck/diagnostics.rs | 8 ++++++++ src/test/ui/error-codes/E0648.rs | 14 ++++++++++++++ src/test/ui/error-codes/E0648.stderr | 9 +++++++++ 4 files changed, 41 insertions(+), 3 deletions(-) create mode 100644 src/test/ui/error-codes/E0648.rs create mode 100644 src/test/ui/error-codes/E0648.stderr diff --git a/src/librustc_typeck/collect.rs b/src/librustc_typeck/collect.rs index 824346dab94fc..3d66768c24a8b 100644 --- a/src/librustc_typeck/collect.rs +++ b/src/librustc_typeck/collect.rs @@ -1898,11 +1898,18 @@ fn codegen_fn_attrs<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>, id: DefId) -> Codegen } }); } else if attr.check_name("export_name") { - if let s @ Some(_) = attr.value_str() { - codegen_fn_attrs.export_name = s; + if let Some(s) = attr.value_str() { + if s.as_str().contains("\0") { + // `#[export_name = ...]` will be converted to a null-terminated string, + // so it may not contain any null characters. + struct_span_err!(tcx.sess, attr.span, E0648, + "`export_name` may not contain null characters") + .emit(); + } + codegen_fn_attrs.export_name = Some(s); } else { struct_span_err!(tcx.sess, attr.span, E0558, - "export_name attribute has invalid format") + "export_name attribute has invalid format") .span_label(attr.span, "did you mean #[export_name=\"*\"]?") .emit(); } diff --git a/src/librustc_typeck/diagnostics.rs b/src/librustc_typeck/diagnostics.rs index 3f7e3529e9648..75ff17241aaac 100644 --- a/src/librustc_typeck/diagnostics.rs +++ b/src/librustc_typeck/diagnostics.rs @@ -4545,6 +4545,14 @@ fn start(_: isize, _: *const *const u8) -> isize where (): Copy { ``` "##, +E0648: r##" +`export_name` attributes may not contain null characters (`\0`). + +```compile_fail,E0648 +#[export_name="\0foo"] // error: `export_name` may not contain null characters +``` +"##, + E0689: r##" This error indicates that the numeric value for the method being passed exists but the type of the numeric value or binding could not be identified. diff --git a/src/test/ui/error-codes/E0648.rs b/src/test/ui/error-codes/E0648.rs new file mode 100644 index 0000000000000..d3eac60de9979 --- /dev/null +++ b/src/test/ui/error-codes/E0648.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. + +#[export_name="\0foo"] //~ ERROR E0648 +pub fn bar() {} + +fn main() {} diff --git a/src/test/ui/error-codes/E0648.stderr b/src/test/ui/error-codes/E0648.stderr new file mode 100644 index 0000000000000..1e11705e9b980 --- /dev/null +++ b/src/test/ui/error-codes/E0648.stderr @@ -0,0 +1,9 @@ +error[E0648]: `export_name` may not contain null characters + --> $DIR/E0648.rs:11:1 + | +LL | #[export_name="/0foo"] //~ ERROR E0648 + | ^^^^^^^^^^^^^^^^^^^^^^ + +error: aborting due to previous error + +For more information about this error, try `rustc --explain E0648`. From 82803fd9bdb4f7e016b43f430ad043cdbdc452e8 Mon Sep 17 00:00:00 2001 From: varkor Date: Sat, 23 Jun 2018 22:33:36 +0100 Subject: [PATCH 2/3] Add backticks to E0558 --- src/librustc_codegen_llvm/diagnostics.rs | 5 ----- src/librustc_typeck/collect.rs | 2 +- src/librustc_typeck/diagnostics.rs | 2 +- src/test/ui/error-codes/E0558.stderr | 2 +- 4 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/librustc_codegen_llvm/diagnostics.rs b/src/librustc_codegen_llvm/diagnostics.rs index 57cc33d09bbea..94776f17c7989 100644 --- a/src/librustc_codegen_llvm/diagnostics.rs +++ b/src/librustc_codegen_llvm/diagnostics.rs @@ -48,8 +48,3 @@ unsafe { simd_add(i32x2(0, 0), i32x2(1, 2)); } // ok! "##, } - - -register_diagnostics! { - E0558 -} diff --git a/src/librustc_typeck/collect.rs b/src/librustc_typeck/collect.rs index 3d66768c24a8b..c24e20c569909 100644 --- a/src/librustc_typeck/collect.rs +++ b/src/librustc_typeck/collect.rs @@ -1909,7 +1909,7 @@ fn codegen_fn_attrs<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>, id: DefId) -> Codegen codegen_fn_attrs.export_name = Some(s); } else { struct_span_err!(tcx.sess, attr.span, E0558, - "export_name attribute has invalid format") + "`export_name` attribute has invalid format") .span_label(attr.span, "did you mean #[export_name=\"*\"]?") .emit(); } diff --git a/src/librustc_typeck/diagnostics.rs b/src/librustc_typeck/diagnostics.rs index 75ff17241aaac..cdfbb77071836 100644 --- a/src/librustc_typeck/diagnostics.rs +++ b/src/librustc_typeck/diagnostics.rs @@ -3709,7 +3709,7 @@ The `export_name` attribute was malformed. Erroneous code example: ```ignore (error-emitted-at-codegen-which-cannot-be-handled-by-compile_fail) -#[export_name] // error: export_name attribute has invalid format +#[export_name] // error: `export_name` attribute has invalid format pub fn something() {} fn main() {} diff --git a/src/test/ui/error-codes/E0558.stderr b/src/test/ui/error-codes/E0558.stderr index 0cb8af9929418..0777c44058fe8 100644 --- a/src/test/ui/error-codes/E0558.stderr +++ b/src/test/ui/error-codes/E0558.stderr @@ -1,4 +1,4 @@ -error[E0558]: export_name attribute has invalid format +error[E0558]: `export_name` attribute has invalid format --> $DIR/E0558.rs:11:1 | LL | #[export_name] From f94c075ab458c3839d34e97c77720ab01437f1c6 Mon Sep 17 00:00:00 2001 From: varkor Date: Sun, 24 Jun 2018 18:20:25 +0100 Subject: [PATCH 3/3] Add item after attribute --- src/librustc_typeck/diagnostics.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/librustc_typeck/diagnostics.rs b/src/librustc_typeck/diagnostics.rs index cdfbb77071836..b0b72256edccf 100644 --- a/src/librustc_typeck/diagnostics.rs +++ b/src/librustc_typeck/diagnostics.rs @@ -4550,6 +4550,7 @@ E0648: r##" ```compile_fail,E0648 #[export_name="\0foo"] // error: `export_name` may not contain null characters +pub fn bar() {} ``` "##,