Simplify the expression with same semantics

m4b · Oct 23, 2024 · e32101c · e32101c
1 parent 180cbb2
commit e32101c
Showing 1 changed file with 2 additions and 11 deletions.
diff --git a/src/pe/tls.rs b/src/pe/tls.rs
@@ -190,17 +190,8 @@ impl<'a> TlsData<'a> {
 
             // VA to RVA
             let rva = itd.address_of_index as usize - image_base;
-            let offset = utils::find_offset(rva, sections, file_alignment, opts).ok_or_else(|| {
-                error::Error::Malformed(format!(
-                    "cannot map tls address_of_index rva ({:#x}) into offset",
-                    rva
-                ))
-            });
-
-            slot = match offset {
-                Ok(offset) => Some(bytes.pread_with::<u32>(offset, scroll::LE)?),
-                Err(_) => None,
-            };
+            let offset = utils::find_offset(rva, sections, file_alignment, opts);
+            slot = offset.and_then(|x| bytes.pread_with::<u32>(x, scroll::LE).ok());
         }
 
         // Parse the callbacks if any