Merge "Skip COMDAT sections when parsing COFF"

279dbb9a · Johann · Gerrit Code Review · cf479baa · 25eeac05 · 279dbb9a
Commit 279dbb9a authored Feb 12, 2014 by Johann Committed by Gerrit Code Review Feb 12, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

build/make/obj_int_extract.c build/make/obj_int_extract.c +5 -1

No files found.
--- a/build/make/obj_int_extract.c
+++ b/build/make/obj_int_extract.c
@@ -666,7 +666,11 @@ int parse_coff(uint8_t *buf, size_t sz) {
    }
    strcpy(sectionlist[i], sectionname);

-    if (!strcmp(sectionname, ".rdata")) sectionrawdata_ptr = get_le32(ptr + 20);
+    // check if it's .rdata and is not a COMDAT section.
+    if (!strcmp(sectionname, ".rdata") &&
+        (get_le32(ptr + 36) & 0x1000) == 0) {
+      sectionrawdata_ptr = get_le32(ptr + 20);
+    }

    ptr += 40;
  }