Mirrors/rust-clippy
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-clippy synced 2024-11-26 14:40:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

Improve NOT_UNSAFE_PTR_ARG_DEREF with functions

Browse source
This commit is contained in:
mcarton 2016-06-07 17:29:22 +02:00 committed by Manish Goregaokar
parent 7781f1d7c5
commit 0e3dcd1376
No known key found for this signature in database
GPG key ID: 3BBF4D3E2EF79F98
3 changed files with 40 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -17,7 +17,7 @@ Table of contents:
## Lints
There are 157 lints included in this crate:
There are 158 lints included in this crate:
name | default | meaning
---------------------------------------------------------------------------------------------------------------------|---------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------

51
clippy_lints/src/functions.rs
View file

@ -88,7 +88,7 @@ impl LateLintPass for Functions {
self.check_arg_number(cx, decl, span);
}
self.check_raw_ptr(cx, unsafety, decl, block, span, nodeid);
self.check_raw_ptr(cx, unsafety, decl, block, nodeid);
}
fn check_trait_item(&mut self, cx: &LateContext, item: &hir::TraitItem) {
@ -96,7 +96,7 @@ impl LateLintPass for Functions {
self.check_arg_number(cx, &sig.decl, item.span);
if let Some(ref block) = *block {
self.check_raw_ptr(cx, sig.unsafety, &sig.decl, block, item.span, item.id);
self.check_raw_ptr(cx, sig.unsafety, &sig.decl, block, item.id);
}
}
}
@ -113,7 +113,7 @@ impl Functions {
}
}
fn check_raw_ptr(&self, cx: &LateContext, unsafety: hir::Unsafety, decl: &hir::FnDecl, block: &hir::Block, span: Span, nodeid: ast::NodeId) {
fn check_raw_ptr(&self, cx: &LateContext, unsafety: hir::Unsafety, decl: &hir::FnDecl, block: &hir::Block, nodeid: ast::NodeId) {
if unsafety == hir::Unsafety::Normal && cx.access_levels.is_exported(nodeid) {
let raw_ptrs = decl.inputs.iter().filter_map(|arg| raw_ptr_arg(cx, arg)).collect::<HashSet<_>>();
@ -144,32 +144,43 @@ struct DerefVisitor<'a, 'tcx: 'a> {
impl<'a, 'tcx, 'v> hir::intravisit::Visitor<'v> for DerefVisitor<'a, 'tcx> {
fn visit_expr(&mut self, expr: &'v hir::Expr) {
let ptr = match expr.node {
hir::ExprUnary(hir::UnDeref, ref ptr) => Some(ptr),
match expr.node {
hir::ExprCall(ref f, ref args) => {
let ty = self.cx.tcx.expr_ty(f);
if type_is_unsafe_function(ty) {
for arg in args {
self.check_arg(arg);
}
}
}
hir::ExprMethodCall(_, _, ref args) => {
let method_call = ty::MethodCall::expr(expr.id);
let base_type = self.cx.tcx.tables.borrow().method_map[&method_call].ty;
if type_is_unsafe_function(base_type) {
Some(&args[0])
} else {
None
}
}
_ => None,
};
if let Some(ptr) = ptr {
if let Some(def) = self.cx.tcx.def_map.borrow().get(&ptr.id) {
if self.ptrs.contains(&def.def_id()) {
span_lint(self.cx,
NOT_UNSAFE_PTR_ARG_DEREF,
ptr.span,
"this public function dereferences a raw pointer but is not marked `unsafe`");
for arg in args {
self.check_arg(arg);
}
}
}
hir::ExprUnary(hir::UnDeref, ref ptr) => self.check_arg(ptr),
_ => (),
}
hir::intravisit::walk_expr(self, expr);
}
}
impl<'a, 'tcx: 'a> DerefVisitor<'a, 'tcx> {
fn check_arg(&self, ptr: &hir::Expr) {
if let Some(def) = self.cx.tcx.def_map.borrow().get(&ptr.id) {
if self.ptrs.contains(&def.def_id()) {
span_lint(self.cx,
NOT_UNSAFE_PTR_ARG_DEREF,
ptr.span,
"this public function dereferences a raw pointer but is not marked `unsafe`");
}
}
}
}

8
tests/compile-fail/functions.rs
View file

@ -36,6 +36,10 @@ impl Foo for Bar {
fn ptr(p: *const u8) {
println!("{}", unsafe { *p });
//~^ ERROR: this public function dereferences a raw pointer but is not marked `unsafe`
println!("{:?}", unsafe { p.as_ref() });
//~^ ERROR: this public function dereferences a raw pointer but is not marked `unsafe`
unsafe { std::ptr::read(p) };
//~^ ERROR: this public function dereferences a raw pointer but is not marked `unsafe`
}
}
@ -50,6 +54,8 @@ pub fn public(p: *const u8) {
//~^ ERROR: this public function dereferences a raw pointer but is not marked `unsafe`
println!("{:?}", unsafe { p.as_ref() });
//~^ ERROR: this public function dereferences a raw pointer but is not marked `unsafe`
unsafe { std::ptr::read(p) };
//~^ ERROR: this public function dereferences a raw pointer but is not marked `unsafe`
}
impl Bar {
@ -62,6 +68,8 @@ impl Bar {
//~^ ERROR: this public function dereferences a raw pointer but is not marked `unsafe`
println!("{:?}", unsafe { p.as_ref() });
//~^ ERROR: this public function dereferences a raw pointer but is not marked `unsafe`
unsafe { std::ptr::read(p) };
//~^ ERROR: this public function dereferences a raw pointer but is not marked `unsafe`
}
pub fn public_ok(self, p: *const u8) {