From dd95e8d71ec04cc91796c008773cd237a4ed107e Mon Sep 17 00:00:00 2001
From: Reid Spencer <rspencer@reidspencer.com>
Date: Wed, 17 Nov 2004 16:13:11 +0000
Subject: [PATCH] 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.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@17909 91177308-0d34-0410-b5e6-96231b3b80d8
---
 lib/Archive/ArchiveReader.cpp          | 5 +++--
 lib/Bytecode/Archive/ArchiveReader.cpp | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/Archive/ArchiveReader.cpp b/lib/Archive/ArchiveReader.cpp
index 8cec1383e67..2dae5b65397 100644
--- a/lib/Archive/ArchiveReader.cpp
+++ b/lib/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;
   }
diff --git a/lib/Bytecode/Archive/ArchiveReader.cpp b/lib/Bytecode/Archive/ArchiveReader.cpp
index 8cec1383e67..2dae5b65397 100644
--- a/lib/Bytecode/Archive/ArchiveReader.cpp
+++ b/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;
   }
-- 
2.34.1