[llvm-commits] CVS: llvm/lib/Bytecode/Archive/ArchiveReader.cpp

[Reid Spencer]

Changes in directory llvm/lib/Bytecode/Archive:

ArchiveReader.cpp updated: 1.35 -> 1.36
---
Log message:

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


---
Diffs of the changes:  (+4 -4)

Index: llvm/lib/Bytecode/Archive/ArchiveReader.cpp
diff -u llvm/lib/Bytecode/Archive/ArchiveReader.cpp:1.35 llvm/lib/Bytecode/Archive/ArchiveReader.cpp:1.36
--- llvm/lib/Bytecode/Archive/ArchiveReader.cpp:1.35	Sun Dec 12 20:59:03 2004
+++ llvm/lib/Bytecode/Archive/ArchiveReader.cpp	Sun Dec 12 21:22:31 2004
@@ -282,9 +282,9 @@
 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*
 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;