r144 - trunk

[Petter Reinholdtsen]

Author: pere
Date: 2013-11-24 07:45:46 +0000 (Sun, 24 Nov 2013)
New Revision: 144

Modified:
   trunk/NEWS
   trunk/killrpath.c
Log:
Rewrite removal of RPATH/RUNPATH to make sure the entry in .dynamic is a NULL terminated string.  Based on patch found in Fedora credited Axel Thimm and Christian Krause.

Modified: trunk/NEWS
===================================================================
--- trunk/NEWS	2013-11-24 07:37:24 UTC (rev 143)
+++ trunk/NEWS	2013-11-24 07:45:46 UTC (rev 144)
@@ -6,6 +6,9 @@
    Matthias Klose.
  * Added missing help for -k|--keepgoing option, using patch by Petr
    Machata found in Fedora.
+ * Rewrite removal of RPATH/RUNPATH to make sure the entry in .dynamic
+   is a NULL terminated string.  Based on patch found in Fedora
+   credited Axel Thimm and Christian Krause.
 
 New in 0.14 released 2011-09-27:
  * Updated debian build rules from the current Debian package.

Modified: trunk/killrpath.c
===================================================================
--- trunk/killrpath.c	2013-11-24 07:37:24 UTC (rev 143)
+++ trunk/killrpath.c	2013-11-24 07:45:46 UTC (rev 144)
@@ -78,10 +78,13 @@
      }
    for (; dynpos < i; dynpos++)
      {
-       if (is_e32())
+       if (is_e32()) {
         ((Elf32_Dyn *)dyns)[dynpos].d_tag = DT_NULL;
-       else
+        ((Elf32_Dyn *)dyns)[dynpos].d_un.d_val = 0x0;
+       } else {
         ((Elf64_Dyn *)dyns)[dynpos].d_tag = DT_NULL;
+        ((Elf64_Dyn *)dyns)[dynpos].d_un.d_val = 0x0;
+       }
      }
 
    if (lseek(fd, PHDR(p_offset), SEEK_SET) == -1