[PATCH] D14451: [ELF2] - Fixed crash for case when section sh_entsize is set to zero for SHF_MERGE type of sections.
George Rimar via llvm-commits
llvm-commits at lists.llvm.org
Mon Nov 9 00:43:28 PST 2015
This revision was automatically updated to reflect the committed changes.
Closed by commit rL252454: [ELF2] - Fixed crash for case when section sh_entsize is set to zero for… (authored by grimar).
Changed prior to commit:
http://reviews.llvm.org/D14451?vs=39546&id=39669#toc
Repository:
rL LLVM
http://reviews.llvm.org/D14451
Files:
lld/trunk/ELF/InputFiles.cpp
lld/trunk/test/elf2/Inputs/invalid-shentsize-zero.elf
lld/trunk/test/elf2/invalid-elf.test
Index: lld/trunk/test/elf2/invalid-elf.test
===================================================================
--- lld/trunk/test/elf2/invalid-elf.test
+++ lld/trunk/test/elf2/invalid-elf.test
@@ -23,4 +23,8 @@
# RUN: not ld.lld2 %p/Inputs/invalid-shstrndx.so -o %t2 2>&1 | \
# RUN: FileCheck --check-prefix=INVALID-SECTION-INDEX %s
+# RUN: not ld.lld2 %p/Inputs/invalid-shentsize-zero.elf -o %t2 2>&1 | \
+# RUN: FileCheck --check-prefix=INVALID-SHENTSIZE-ZERO %s
+# INVALID-SHENTSIZE-ZERO: SHF_MERGE section size must be a multiple of sh_entsize
+
.long foo
Index: lld/trunk/ELF/InputFiles.cpp
===================================================================
--- lld/trunk/ELF/InputFiles.cpp
+++ lld/trunk/ELF/InputFiles.cpp
@@ -143,7 +143,7 @@
if (Flags & SHF_WRITE)
error("Writable SHF_MERGE sections are not supported");
uintX_t EntSize = Sec.sh_entsize;
- if (Sec.sh_size % EntSize)
+ if (!EntSize || Sec.sh_size % EntSize)
error("SHF_MERGE section size must be a multiple of sh_entsize");
// Don't try to merge if the aligment is larger than the sh_entsize.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D14451.39669.patch
Type: text/x-patch
Size: 1101 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20151109/8b65374d/attachment.bin>
More information about the llvm-commits
mailing list