From 55ba8d8f6b4633cc3d3a5cd56e7aa958e8eeb397 Mon Sep 17 00:00:00 2001
From: Anhad Singh <andypython@protonmail.com>
Date: Thu, 5 Dec 2024 14:59:00 +1100
Subject: [PATCH] misc(load_objs_recursive): do not add empty masters

Signed-off-by: Anhad Singh <andypython@protonmail.com>
---
 src/ld_so/linker.rs | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/ld_so/linker.rs b/src/ld_so/linker.rs
index 16e2711a1c..998a3bdb7e 100644
--- a/src/ld_so/linker.rs
+++ b/src/ld_so/linker.rs
@@ -260,7 +260,6 @@ impl Linker {
         objects_data.push(data);
 
         self.next_object_id += 1;
-        self.next_tls_module_id += 1;
 
         if let Some(master) = tcb_master {
             if !dlopened {
@@ -268,12 +267,7 @@ impl Linker {
             }
 
             tcb_masters.push(master);
-        } else {
-            tcb_masters.push(Master {
-                ptr: ptr::null_mut(),
-                len: 0,
-                offset: 0,
-            });
+            self.next_tls_module_id += 1;
         }
 
         let (runpath, dependencies) = {