From a983359f59ba1c12e40a5556bb1196870ec15f99 Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Sat, 4 Oct 2003 19:19:37 +0000 Subject: [PATCH] Do not leak the ModuleProvider if releaseModule() throws. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@8847 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Bytecode/Reader/ReaderWrappers.cpp | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/lib/Bytecode/Reader/ReaderWrappers.cpp b/lib/Bytecode/Reader/ReaderWrappers.cpp index c1d091800e7..a936c0f72aa 100644 --- a/lib/Bytecode/Reader/ReaderWrappers.cpp +++ b/lib/Bytecode/Reader/ReaderWrappers.cpp @@ -166,17 +166,14 @@ getBytecodeBufferModuleProvider(const unsigned char *Buffer, unsigned Length, /// 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 + 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 @@ getBytecodeModuleProvider(const std::string &Filename) { /// 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 + AMP(getBytecodeModuleProvider(Filename)); + return AMP->releaseModule(); } catch (std::string &err) { if (ErrorStr) *ErrorStr = err; return 0; } - return M; } -- 2.11.0