Added check for empty data

Cisco-Talos · Jul 8, 2024 · 16fadc2 · 16fadc2
1 parent 87e4a34
commit 16fadc2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/libclamav_rust/src/alz.rs b/libclamav_rust/src/alz.rs
@@ -358,7 +358,9 @@ impl AlzLocalFileHeader {
             data: buffer.to_vec(),
         };
 
-        files.push(extracted_file);
+        if 0 != extracted_file.data.len() {
+            files.push(extracted_file);
+        }
     }
 
     fn extract_file_nocomp(

diff --git a/libclamav_rust/src/scanners.rs b/libclamav_rust/src/scanners.rs
@@ -49,8 +49,8 @@ pub fn magic_scan(ctx: *mut cli_ctx, buf: &[u8], name: Option<String>) -> cl_err
     let ptr = buf.as_ptr();
     let len = buf.len();
 
-    if 0 == len{
-        return cl_error_t_CL_SUCCESS ;
+    if 0 == len {
+        return cl_error_t_CL_SUCCESS;
     }
 
     match &name {
@@ -79,7 +79,7 @@ pub fn magic_scan(ctx: *mut cli_ctx, buf: &[u8], name: Option<String>) -> cl_err
     }
 
     // Okay now safe to drop the name CString.
-    if !name_ptr.is_null(){
+    if !name_ptr.is_null() {
         let _ = unsafe { CString::from_raw(name_ptr) };
     }