From 52a80694c995898d5e73636081e824d09160fa01 Mon Sep 17 00:00:00 2001
From: Gabriele Svelto <gsvelto@mozilla.com>
Date: Tue, 11 Jun 2024 14:59:29 +0200
Subject: [PATCH] Check if an entry in the TLS callback list is the terminator
 before trying to load it

This fixes issue #412.
---
 src/pe/tls.rs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/pe/tls.rs b/src/pe/tls.rs
index ad24c50a..bd116ded 100644
--- 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;
             }