From 3f1b2bdf5d379cb9dc29f359033f567b921926ff Mon Sep 17 00:00:00 2001
From: Alex Lorenz <arphaman@gmail.com>
Date: Wed, 20 May 2015 20:41:27 +0000
Subject: [PATCH] AsmParser: Require a terminating null character when creating
 memory buffer.

This commit modifies the memory buffer creation in the AsmParser library so
that it requires a terminating null character. The LLLexer in the AsmParser
library checks for EOF only when it sees a null character, thus it would
be best to require it when creating a memory buffer so that the memory
buffer constructor can verify that a terminating null character is indeed
present.

Reviewers: Duncan P. N. Exon Smith, Matthias Braun

Differential Revision: http://reviews.llvm.org/D9883


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@237833 91177308-0d34-0410-b5e6-96231b3b80d8
---
 lib/AsmParser/Parser.cpp              |  2 +-
 unittests/AsmParser/AsmParserTest.cpp | 47 +++++++++++++++++++++++++++
 unittests/AsmParser/CMakeLists.txt    |  9 +++++
 unittests/AsmParser/Makefile          | 15 +++++++++
 unittests/CMakeLists.txt              |  1 +
 unittests/Makefile                    |  5 +--
 6 files changed, 76 insertions(+), 3 deletions(-)
 create mode 100644 unittests/AsmParser/AsmParserTest.cpp
 create mode 100644 unittests/AsmParser/CMakeLists.txt
 create mode 100644 unittests/AsmParser/Makefile

diff --git a/lib/AsmParser/Parser.cpp b/lib/AsmParser/Parser.cpp
index 2e76c0ecc45..c55a6a1e243 100644
--- a/lib/AsmParser/Parser.cpp
+++ b/lib/AsmParser/Parser.cpp
@@ -24,7 +24,7 @@ using namespace llvm;
 
 bool llvm::parseAssemblyInto(MemoryBufferRef F, Module &M, SMDiagnostic &Err) {
   SourceMgr SM;
-  std::unique_ptr<MemoryBuffer> Buf = MemoryBuffer::getMemBuffer(F, false);
+  std::unique_ptr<MemoryBuffer> Buf = MemoryBuffer::getMemBuffer(F);
   SM.AddNewSourceBuffer(std::move(Buf), SMLoc());
 
   return LLParser(F.getBuffer(), SM, Err, &M).Run();
diff --git a/unittests/AsmParser/AsmParserTest.cpp b/unittests/AsmParser/AsmParserTest.cpp
new file mode 100644
index 00000000000..8847b187167
--- /dev/null
+++ b/unittests/AsmParser/AsmParserTest.cpp
@@ -0,0 +1,47 @@
+//===- llvm/unittest/AsmParser/AsmParserTest.cpp - asm parser unittests ---===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#include "llvm/ADT/StringRef.h"
+#include "llvm/AsmParser/Parser.h"
+#include "llvm/IR/LLVMContext.h"
+#include "llvm/IR/Module.h"
+#include "llvm/Support/SourceMgr.h"
+#include "gtest/gtest.h"
+
+using namespace llvm;
+
+namespace {
+
+TEST(AsmParserTest, NullTerminatedInput) {
+  LLVMContext &Ctx = getGlobalContext();
+  StringRef Source = "; Empty module \n";
+  SMDiagnostic Error;
+  auto Mod = parseAssemblyString(Source, Error, Ctx);
+
+  EXPECT_TRUE(Mod != nullptr);
+  EXPECT_TRUE(Error.getMessage().empty());
+}
+
+#ifdef GTEST_HAS_DEATH_TEST
+#ifndef NDEBUG
+
+TEST(AsmParserTest, NonNullTerminatedInput) {
+  LLVMContext &Ctx = getGlobalContext();
+  StringRef Source = "; Empty module \n\1\2";
+  SMDiagnostic Error;
+  std::unique_ptr<Module> Mod;
+  EXPECT_DEATH(Mod = parseAssemblyString(Source.substr(0, Source.size() - 2),
+                                         Error, Ctx),
+               "Buffer is not null terminated!");
+}
+
+#endif
+#endif
+
+} // end anonymous namespace
diff --git a/unittests/AsmParser/CMakeLists.txt b/unittests/AsmParser/CMakeLists.txt
new file mode 100644
index 00000000000..1920bfaa3aa
--- /dev/null
+++ b/unittests/AsmParser/CMakeLists.txt
@@ -0,0 +1,9 @@
+set(LLVM_LINK_COMPONENTS
+  AsmParser
+  Core
+  Support
+  )
+
+add_llvm_unittest(AsmParserTests
+  AsmParserTest.cpp
+  )
diff --git a/unittests/AsmParser/Makefile b/unittests/AsmParser/Makefile
new file mode 100644
index 00000000000..41eadd43043
--- /dev/null
+++ b/unittests/AsmParser/Makefile
@@ -0,0 +1,15 @@
+##===- unittests/AsmParser/Makefile ------------------------*- Makefile -*-===##
+#
+#                     The LLVM Compiler Infrastructure
+#
+# This file is distributed under the University of Illinois Open Source
+# License. See LICENSE.TXT for details.
+#
+##===----------------------------------------------------------------------===##
+
+LEVEL = ../..
+TESTNAME = AsmParser
+LINK_COMPONENTS := AsmParser Core Support
+
+include $(LEVEL)/Makefile.config
+include $(LLVM_SRC_ROOT)/unittests/Makefile.unittest
diff --git a/unittests/CMakeLists.txt b/unittests/CMakeLists.txt
index a1272edcc97..e5befcec6e0 100644
--- a/unittests/CMakeLists.txt
+++ b/unittests/CMakeLists.txt
@@ -13,6 +13,7 @@ endfunction()
 
 add_subdirectory(ADT)
 add_subdirectory(Analysis)
+add_subdirectory(AsmParser)
 add_subdirectory(Bitcode)
 add_subdirectory(CodeGen)
 add_subdirectory(DebugInfo)
diff --git a/unittests/Makefile b/unittests/Makefile
index fefef0748b9..bf2ed22efea 100644
--- a/unittests/Makefile
+++ b/unittests/Makefile
@@ -9,8 +9,9 @@
 
 LEVEL = ..
 
-PARALLEL_DIRS = ADT Analysis Bitcode CodeGen DebugInfo ExecutionEngine IR \
-		LineEditor Linker MC Option ProfileData Support Transforms
+PARALLEL_DIRS = ADT Analysis AsmParser Bitcode CodeGen DebugInfo \
+                ExecutionEngine IR LineEditor Linker MC Option ProfileData \
+                Support Transforms
 
 include $(LEVEL)/Makefile.config
 include $(LLVM_SRC_ROOT)/unittests/Makefile.unittest