Make sure the Archive gets deleted if there's an error.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@18869 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Archive/ArchiveReader.cpp b/lib/Archive/ArchiveReader.cpp
index a813371958d4f0b482e3ea6c6bfdd86aab96f430..d4a4921854e4bcdfc55c5d2b5b88df33e46524a6 100644 (file)
--- a/lib/Archive/ArchiveReader.cpp
+++ b/lib/Archive/ArchiveReader.cpp
@@ -282,9 +282,9 @@ Archive::loadArchive() {
 Archive*
 Archive::OpenAndLoad(const sys::Path& file, std::string* ErrorMessage) {
   try {
-    Archive* result = new Archive(file, true);
+    std::auto_ptr<Archive> result ( new Archive(file, true));
     result->loadArchive();
-    return result;
+    return result.release();
   } catch (const std::string& msg) {
     if (ErrorMessage) {
       *ErrorMessage = msg;
@@ -377,9 +377,9 @@ Archive::loadSymbolTable() {
 Archive*
 Archive::OpenAndLoadSymbols(const sys::Path& file, std::string* ErrorMessage) {
   try {
-    Archive* result = new Archive(file, true);
+    std::auto_ptr<Archive> result ( new Archive(file, true) );
     result->loadSymbolTable();
-    return result;
+    return result.release();
   } catch (const std::string& msg) {
     if (ErrorMessage) {
       *ErrorMessage = msg;

diff --git a/lib/Bytecode/Archive/ArchiveReader.cpp b/lib/Bytecode/Archive/ArchiveReader.cpp
index a813371958d4f0b482e3ea6c6bfdd86aab96f430..d4a4921854e4bcdfc55c5d2b5b88df33e46524a6 100644 (file)
--- a/lib/Bytecode/Archive/ArchiveReader.cpp
+++ b/lib/Bytecode/Archive/ArchiveReader.cpp
@@ -282,9 +282,9 @@ Archive::loadArchive() {
 Archive*
 Archive::OpenAndLoad(const sys::Path& file, std::string* ErrorMessage) {
   try {
-    Archive* result = new Archive(file, true);
+    std::auto_ptr<Archive> result ( new Archive(file, true));
     result->loadArchive();
-    return result;
+    return result.release();
   } catch (const std::string& msg) {
     if (ErrorMessage) {
       *ErrorMessage = msg;
@@ -377,9 +377,9 @@ Archive::loadSymbolTable() {
 Archive*
 Archive::OpenAndLoadSymbols(const sys::Path& file, std::string* ErrorMessage) {
   try {
-    Archive* result = new Archive(file, true);
+    std::auto_ptr<Archive> result ( new Archive(file, true) );
     result->loadSymbolTable();
-    return result;
+    return result.release();
   } catch (const std::string& msg) {
     if (ErrorMessage) {
       *ErrorMessage = msg;