From 0dea46fe679ffb0c96e78d858a963bc031bf477e Mon Sep 17 00:00:00 2001 From: Reid Spencer Date: Wed, 17 Nov 2004 16:13:11 +0000 Subject: Despite documentation to the contrary, Mac OSX and BSD 4.4 archive formats *do* include the length of the long file in the length of the member and they are *not* null terminated. llvm-svn: 17909 --- llvm/lib/Bytecode/Archive/ArchiveReader.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'llvm/lib/Bytecode') diff --git a/llvm/lib/Bytecode/Archive/ArchiveReader.cpp b/llvm/lib/Bytecode/Archive/ArchiveReader.cpp index 8cec1383e67..2dae5b65397 100644 --- a/llvm/lib/Bytecode/Archive/ArchiveReader.cpp +++ b/llvm/lib/Bytecode/Archive/ArchiveReader.cpp @@ -97,7 +97,8 @@ Archive::parseMemberHeader(const char*& At, const char* End) { if (isdigit(Hdr->name[3])) { unsigned len = atoi(&Hdr->name[3]); pathname.assign(At,len); - At += len + 1; // terminated by \n + At += len; + MemberSize -= len; flags |= ArchiveMember::HasLongFilenameFlag; } else throw std::string("invalid long filename"); @@ -155,7 +156,7 @@ Archive::parseMemberHeader(const char*& At, const char* End) { default: char* slash = (char*) memchr(Hdr->name,'/',16); if (slash == 0) - throw std::string("missing name terminator"); + slash = Hdr->name + 16; pathname.assign(Hdr->name,slash-Hdr->name); break; } -- cgit v1.2.3