For PR1050:
Convert asserts into error messages.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@32607 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Archive/ArchiveReader.cpp b/lib/Archive/ArchiveReader.cpp
index e4769ca..82ff9ed 100644
--- a/lib/Archive/ArchiveReader.cpp
+++ b/lib/Archive/ArchiveReader.cpp
@@ -68,7 +68,11 @@
ArchiveMember*
Archive::parseMemberHeader(const char*& At, const char* End, std::string* error)
{
- assert(At + sizeof(ArchiveMemberHeader) < End && "Not enough data");
+ if (At + sizeof(ArchiveMemberHeader) >= End) {
+ if (error)
+ *error = "Unexpected end of file";
+ return 0;
+ }
// Cast archive member header
ArchiveMemberHeader* Hdr = (ArchiveMemberHeader*)At;
@@ -498,7 +502,12 @@
std::set<ModuleProvider*>& result,
std::string* error)
{
- assert(mapfile && base && "Can't findModulesDefiningSymbols on new archive");
+ if (!mapfile || !base) {
+ if (error)
+ *error = "Empty archive invalid for finding modules defining symbols";
+ return false;
+ }
+
if (symTab.empty()) {
// We don't have a symbol table, so we must build it now but lets also
// make sure that we populate the modules table as we do this to ensure