Quick fix for an use after free.

espindola · espindola · commit 4b67b5a95838 · 2014-08-20T15:19:37.000Z
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@216071 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/tools/lli/lli.cpp b/tools/lli/lli.cpp
@@ -529,14 +529,17 @@ int main(int argc, char **argv, char * const *envp) {
     EE->addModule(std::move(XMod));
   }
 
+  std::vector<std::unique_ptr<MemoryBuffer>> Buffers;
   for (unsigned i = 0, e = ExtraObjects.size(); i != e; ++i) {
     ErrorOr<object::OwningBinary<object::ObjectFile>> Obj =
         object::ObjectFile::createObjectFile(ExtraObjects[i]);
     if (!Obj) {
       Err.print(argv[0], errs());
       return 1;
     }
-    EE->addObjectFile(std::move(Obj.get().getBinary()));
+    object::OwningBinary<object::ObjectFile> &O = Obj.get();
+    EE->addObjectFile(std::move(O.getBinary()));
+    Buffers.push_back(std::move(O.getBuffer()));
   }
 
   for (unsigned i = 0, e = ExtraArchives.size(); i != e; ++i) {

Original file line number	Diff line number	Diff line change
`@@ -529,14 +529,17 @@ int main(int argc, char *argv, char const *envp) {`
`529`	`529`	`EE->addModule(std::move(XMod));`
`530`	`530`	`}`
`531`	`531`
	`532`	`+ std::vector<std::unique_ptr<MemoryBuffer>> Buffers;`
`532`	`533`	`for (unsigned i = 0, e = ExtraObjects.size(); i != e; ++i) {`
`533`	`534`	`ErrorOr<object::OwningBinary<object::ObjectFile>> Obj =`
`534`	`535`	`object::ObjectFile::createObjectFile(ExtraObjects[i]);`
`535`	`536`	`if (!Obj) {`
`536`	`537`	`Err.print(argv[0], errs());`
`537`	`538`	`return 1;`
`538`	`539`	`}`
`539`		`- EE->addObjectFile(std::move(Obj.get().getBinary()));`
	`540`	`+ object::OwningBinary<object::ObjectFile> &O = Obj.get();`
	`541`	`+ EE->addObjectFile(std::move(O.getBinary()));`
	`542`	`+ Buffers.push_back(std::move(O.getBuffer()));`
`540`	`543`	`}`
`541`	`544`
`542`	`545`	`for (unsigned i = 0, e = ExtraArchives.size(); i != e; ++i) {`