diff options
| author | Kevin Enderby <enderby@apple.com> | 2017-02-07 21:20:44 +0000 |
|---|---|---|
| committer | Kevin Enderby <enderby@apple.com> | 2017-02-07 21:20:44 +0000 |
| commit | 86d8bd1da5eb34b922ff6d1d615bfbabd5d0f188 (patch) | |
| tree | 197ee5e48c961c712111d757d43602b7551b5a68 | |
| parent | d8f7f31121cdcf505a9bfcb4a95a1db78e6743fc (diff) | |
| download | bcm5719-llvm-86d8bd1da5eb34b922ff6d1d615bfbabd5d0f188.tar.gz bcm5719-llvm-86d8bd1da5eb34b922ff6d1d615bfbabd5d0f188.zip | |
Fix a typo in an error message for a check of invalid Mach-O files where
it was printing the field name fileoff instead of filesize. The original check
was added in r278557.
This was found in tracking down the problem that lead to the fix in
r293842 - [dsymutil] Fix __LINKEDIT vmsize in dsymutil upgrade path
rdar://30386075
llvm-svn: 294354
| -rw-r--r-- | llvm/lib/Object/MachOObjectFile.cpp | 2 | ||||
| -rw-r--r-- | llvm/test/Object/macho-invalid.test | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/llvm/lib/Object/MachOObjectFile.cpp b/llvm/lib/Object/MachOObjectFile.cpp index c0a7518d1e6..c6ce5b0a586 100644 --- a/llvm/lib/Object/MachOObjectFile.cpp +++ b/llvm/lib/Object/MachOObjectFile.cpp @@ -368,7 +368,7 @@ static Error parseSegmentLoadCommand( CmdName + " extends past the end of the file"); if (S.vmsize != 0 && S.filesize > S.vmsize) return malformedError("load command " + Twine(LoadCommandIndex) + - " fileoff field in " + CmdName + + " filesize field in " + CmdName + " greater than vmsize field"); IsPageZeroSegment |= StringRef("__PAGEZERO").equals(S.segname); } else diff --git a/llvm/test/Object/macho-invalid.test b/llvm/test/Object/macho-invalid.test index 93feaa11eda..e956680a2ce 100644 --- a/llvm/test/Object/macho-invalid.test +++ b/llvm/test/Object/macho-invalid.test @@ -117,7 +117,7 @@ RUN: not llvm-objdump -macho -private-headers %p/Inputs/macho-invalid-segment-fi INVALID-SEGMENT-FILESIZE: macho-invalid-segment-filesize': truncated or malformed object (load command 0 fileoff field plus filesize field in LC_SEGMENT extends past the end of the file) RUN: not llvm-objdump -macho -private-headers %p/Inputs/macho-invalid-segment-vmsize 2>&1 | FileCheck -check-prefix INVALID-SEGMENT-VMSIZE %s -INVALID-SEGMENT-VMSIZE: macho-invalid-segment-vmsize': truncated or malformed object (load command 0 fileoff field in LC_SEGMENT greater than vmsize field) +INVALID-SEGMENT-VMSIZE: macho-invalid-segment-vmsize': truncated or malformed object (load command 0 filesize field in LC_SEGMENT greater than vmsize field) RUN: not llvm-objdump -macho -private-headers %p/Inputs/macho-invalid-section-offset 2>&1 | FileCheck -check-prefix INVALID-SECTION-FILEOFF %s INVALID-SECTION-FILEOFF: macho-invalid-section-offset': truncated or malformed object (offset field of section 0 in LC_SEGMENT command 0 extends past the end of the file) |
