2 files changed, 14 insertions, 7 deletions
diff --git a/src/printing/sections.c b/src/printing/sections.c
index 6241a73..be7a907 100644
--- a/src/printing/sections.c
+++ b/src/printing/sections.c
@@ -10,25 +10,28 @@
 void printSegmentsWithSection(Elf *e, Elf_Scn *scn)
 {
   GElf_Phdr phdr;
+  GElf_Shdr shdr;
   int i;
   size_t n;
 
 
+  if (gelf_getshdr(scn, &shdr) != &shdr) {
+    fprintf(stderr, "gelf_getshdr() failed: %s\n", elf_errmsg(-1));
+    return;
+  }
+
   if (elf_getphdrnum(e, &n)) {
     fprintf(stderr, "elf_getphdrnum() failed: %s\n", elf_errmsg(-1));
     return;
   }
 
   for (i = 0; i < n; i++) {
-    ELFU_BOOL isInSeg;
-
     if (gelf_getphdr(e, i, &phdr) != &phdr) {
       fprintf(stderr, "getphdr() failed for #%d: %s\n", i, elf_errmsg(-1));
       continue;
     }
 
-    isInSeg = elfu_segmentContainsSection(&phdr, scn);
-    if (isInSeg == ELFU_TRUE) {
+    if (elfu_segmentContainsSection(&phdr, &shdr)) {
       printf("     %d %s\n", i, segmentTypeStr(phdr.p_type));
     }
   }
diff --git a/src/printing/segments.c b/src/printing/segments.c
index 6d8cac7..1f431d6 100644
--- a/src/printing/segments.c
+++ b/src/printing/segments.c
@@ -26,10 +26,14 @@ void printSectionsInSegment(Elf *e, GElf_Phdr *phdr)
   scn = elf_getscn(e, 0);
 
   while (scn) {
-    ELFU_BOOL isInSeg;
+    GElf_Shdr shdr;
 
-    isInSeg = elfu_segmentContainsSection(phdr, scn);
-    if (isInSeg == ELFU_TRUE) {
+    if (gelf_getshdr(scn, &shdr) != &shdr) {
+      fprintf(stderr, "gelf_getshdr() failed: %s\n", elf_errmsg(-1));
+      continue;
+    }
+
+    if (elfu_segmentContainsSection(phdr, &shdr)) {
       printf("       %10u %s\n", elf_ndxscn(scn), elfu_sectionName(e, scn));
     }