Check if an entry in the TLS callback list is the terminator before t…

…rying to load it This fixes issue #412.
m4b · Jun 11, 2024 · 52a8069 · 52a8069
1 parent 6177758
commit 52a8069
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/pe/tls.rs b/src/pe/tls.rs
@@ -227,6 +227,11 @@ impl<'a> TlsData<'a> {
                 } else {
                     bytes.pread_with::<u32>(offset + i * 4, scroll::LE)? as u64
                 };
+
+                if callback == 0 {
+                    break;
+                }
+
                 // Each callback is an VA so convert it to RVA
                 let callback_rva = callback as usize - image_base;
                 // Check if the callback is in the image
@@ -236,9 +241,6 @@ impl<'a> TlsData<'a> {
                         callback
                     )));
                 }
-                if callback == 0 {
-                    break;
-                }
                 callbacks.push(callback);
                 i += 1;
             }