From 333a2882488827ba7246c00cf4541d076642227e Mon Sep 17 00:00:00 2001
From: John Reiser <jreiser@BitWagon.com>
Date: Sun, 11 Apr 2021 15:16:34 -0700
Subject: [PATCH] shlib: Don't compress below xct_off (except Elf headers)

	modified:   p_lx_elf.cpp
---
 src/p_lx_elf.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/p_lx_elf.cpp b/src/p_lx_elf.cpp
index 18b6fae1..c146ba1c 100644
--- a/src/p_lx_elf.cpp
+++ b/src/p_lx_elf.cpp
@@ -4198,7 +4198,7 @@ int PackLinuxElf64::pack2(OutputFile *fo, Filter &ft)
     uip->ui_total_passes -= !!is_shlib;  // not .data of shlib
 
     // compress extents
-    unsigned hdr_u_len = (is_shlib ? xct_off : (sizeof(Elf64_Ehdr) + sz_phdrs));
+    unsigned hdr_u_len = sizeof(Elf64_Ehdr) + sz_phdrs;
 
     total_in =  (is_shlib ?           0 : xct_off);
     total_out = (is_shlib ? sz_elf_hdrs : xct_off);
@@ -4226,7 +4226,7 @@ int PackLinuxElf64::pack2(OutputFile *fo, Filter &ft)
         x.size   = get_te64(&phdri[k].p_filesz);
         if (!is_shlib || hdr_u_len < (u64_t)x.size) {
             if (0 == nx) { // 1st PT_LOAD64 must cover Ehdr at 0==p_offset
-                unsigned const delta = hdr_u_len;
+                unsigned const delta = (is_shlib ? xct_off : hdr_u_len);
                 if (ft.id < 0x40) {
                     // FIXME: ??     ft.addvalue += asl_delta;
                 }
@@ -4236,6 +4236,7 @@ int PackLinuxElf64::pack2(OutputFile *fo, Filter &ft)
                     // &ft arg to packExtent will be zero becaue (k != nk_f)
                 }
                 else {
+                    total_in += delta - hdr_u_len;
                     x.offset += delta;
                     x.size   -= delta;
                 }