Detect Asio\join calls while scanning

slackhq · Apr 25, 2024 · 7fc6f61 · 7fc6f61
1 parent 1802209
commit 7fc6f61
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 0 deletions.
diff --git a/src/code_info/functionlike_info.rs b/src/code_info/functionlike_info.rs
@@ -91,6 +91,8 @@ pub struct FunctionLikeInfo {
 
     pub is_async: bool,
 
+    pub has_asio_join: bool,
+
     pub must_use: bool,
 
     pub mutation_free: bool,
@@ -179,6 +181,7 @@ impl FunctionLikeInfo {
             attributes: Vec::new(),
             method_info: None,
             is_async: false,
+            has_asio_join: false,
             must_use: false,
             ignore_taint_path: false,
             dynamically_callable: false,

diff --git a/src/code_info_builder/lib.rs b/src/code_info_builder/lib.rs
@@ -37,6 +37,7 @@ struct Context {
     function_name: Option<StrId>,
     member_name: Option<StrId>,
     has_yield: bool,
+    has_asio_join: bool,
     has_static_field_access: bool,
     uses_position: Option<(usize, usize)>,
     namespace_position: Option<(usize, usize)>,
@@ -478,6 +479,15 @@ impl<'ast> Visitor<'ast> for Scanner<'_> {
             c.has_yield = false;
         }
 
+        if c.has_asio_join {
+            self.codebase
+                .functionlike_infos
+                .get_mut(&(*c.classlike_name.as_ref().unwrap(), method_name))
+                .unwrap()
+                .has_asio_join = true;
+            c.has_asio_join = false;
+        }
+
         if !c.has_static_field_access && m.static_ {
             self.codebase
                 .functionlike_infos
@@ -566,6 +576,15 @@ impl<'ast> Visitor<'ast> for Scanner<'_> {
                     c.has_static_field_access = true;
                 }
             }
+            aast::Expr_::Call(boxed) => {
+                if let aast::Expr_::Id(boxed_id) = &boxed.func.2 {
+                    if let Some(&StrId::ASIO_JOIN) =
+                        self.resolved_names.get(&(boxed_id.0.start_offset() as u32))
+                    {
+                        c.has_asio_join = true;
+                    }
+                }
+            }
             _ => (),
         }
 
@@ -838,6 +857,7 @@ pub fn collect_info_for_aast(
         function_name: None,
         member_name: None,
         has_yield: false,
+        has_asio_join: false,
         has_static_field_access: false,
         uses_position: None,
         namespace_position: None,