This is an archive of the discontinued LLVM Phabricator instance.

Differential D6732

[Object] Don't crash on empty export lists.
ClosedPublic

Authored by ributzka on Dec 18 2014, 5:08 PM.

Details

Reviewers
kledzik
Bigcheese
Commits
rG4d7f70d47e02: [Object] Don't crash on empty export lists.
rL224563: [Object] Don't crash on empty export lists.
Summary

This fixes the exports iterator if the export list is empty.

Diff Detail

Repository
rL LLVM

Event Timeline

ributzka updated this revision to Diff 17476.Dec 18 2014, 5:08 PM
ributzka retitled this revision from to [Object] Don't crash on empty export lists..
ributzka updated this object.
ributzka edited the test plan for this revision. (Show Details)
ributzka added a reviewer: Bigcheese.
ributzka set the repository for this revision to rL LLVM.Dec 18 2014, 5:12 PM
ributzka added a subscriber: Unknown Object (MLST).
Bigcheese added a reviewer: kledzik.Dec 18 2014, 5:29 PM

Looks fine, but I'm not familiar with the export iterators. I've added Nick as a review.

kledzik edited edge metadata.Dec 18 2014, 6:19 PM

LGTM

Closed by commit rL224563: [Object] Don't crash on empty export lists. (authored by ributzka). · Explain WhyDec 18 2014, 6:31 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
llvm/
trunk/
lib/
Object/
5 lines
test/
Object/
Inputs/
4 lines

Diff 17477

llvm/trunk/lib/Object/MachOObjectFile.cpp

Show First 20 Lines • Show All 1,634 Lines • ▼ Show 20 Lines while (!Stack.empty()) {
} }
} }
Done = true; Done = true;
} }
iterator_range<export_iterator> iterator_range<export_iterator>
MachOObjectFile::exports(ArrayRef<uint8_t> Trie) { MachOObjectFile::exports(ArrayRef<uint8_t> Trie) {
ExportEntry Start(Trie); ExportEntry Start(Trie);
if (Trie.size() == 0)
Start.moveToEnd();
else
Start.moveToFirst(); Start.moveToFirst();
ExportEntry Finish(Trie); ExportEntry Finish(Trie);
Finish.moveToEnd(); Finish.moveToEnd();
return iterator_range<export_iterator>(export_iterator(Start), return iterator_range<export_iterator>(export_iterator(Start),
export_iterator(Finish)); export_iterator(Finish));
} }
▲ Show 20 Lines • Show All 885 Lines • Show Last 20 Lines

llvm/trunk/test/Object/Inputs/macho-no-exports.dylib

  • This is a binary file.
PropertyOld ValueNew Value
svn:executablenull*

llvm/trunk/test/Object/objdump-export-list.test

RUN: llvm-objdump -exports-trie %p/Inputs/macho-no-exports.dylib | FileCheck %s
; Test that we don't crash with an empty export list.
CHECK: macho-no-exports.dylib: file format Mach-O 64-bit x86-64