[llvm-commits] CVS: llvm/lib/Bytecode/Reader/ReaderWrappers.cpp

[Chris Lattner]

Changes in directory llvm/lib/Bytecode/Reader:

ReaderWrappers.cpp updated: 1.9 -> 1.10

---
Log message:

Do not leak the ModuleProvider if releaseModule() throws.


---
Diffs of the changes:

Index: llvm/lib/Bytecode/Reader/ReaderWrappers.cpp
diff -u llvm/lib/Bytecode/Reader/ReaderWrappers.cpp:1.9 llvm/lib/Bytecode/Reader/ReaderWrappers.cpp:1.10
--- llvm/lib/Bytecode/Reader/ReaderWrappers.cpp:1.9	Wed Sep 24 23:13:53 2003
+++ llvm/lib/Bytecode/Reader/ReaderWrappers.cpp	Sat Oct  4 14:19:37 2003
@@ -166,17 +166,14 @@
 ///
 Module *ParseBytecodeBuffer(const unsigned char *Buffer, unsigned Length,
                             const std::string &ModuleID, std::string *ErrorStr){
-  Module *M = 0;
   try {
-    AbstractModuleProvider *AMP = 
-      getBytecodeBufferModuleProvider(Buffer, Length, ModuleID);
-    M = AMP->releaseModule();
-    delete AMP;
+    std::auto_ptr<AbstractModuleProvider>
+      AMP(getBytecodeBufferModuleProvider(Buffer, Length, ModuleID));
+    return AMP->releaseModule();
   } catch (std::string &err) {
     if (ErrorStr) *ErrorStr = err;
     return 0;
   }
-  return M;
 }
 
 /// getBytecodeModuleProvider - lazy function-at-a-time loading from a file
@@ -192,14 +189,12 @@
 /// ParseBytecodeFile - Parse the given bytecode file
 ///
 Module *ParseBytecodeFile(const std::string &Filename, std::string *ErrorStr) {
-  Module *M = 0;
   try {
-    AbstractModuleProvider *AMP = getBytecodeModuleProvider(Filename);
-    M = AMP->releaseModule();
-    delete AMP;
+    std::auto_ptr<AbstractModuleProvider>
+      AMP(getBytecodeModuleProvider(Filename));
+    return AMP->releaseModule();
   } catch (std::string &err) {
     if (ErrorStr) *ErrorStr = err;
     return 0;
   }
-  return M;
 }