From 7f58de2b991cb8dff4d1bd3e8c9ece9ea2ba639c Mon Sep 17 00:00:00 2001 From: Misha Brukman Date: Wed, 8 Oct 2003 19:55:47 +0000 Subject: [PATCH] Destroy allocated resources on exception. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@8969 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Bytecode/Reader/ReaderWrappers.cpp | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/lib/Bytecode/Reader/ReaderWrappers.cpp b/lib/Bytecode/Reader/ReaderWrappers.cpp index 99c0e6be9ee..9b6327437d8 100644 --- a/lib/Bytecode/Reader/ReaderWrappers.cpp +++ b/lib/Bytecode/Reader/ReaderWrappers.cpp @@ -59,8 +59,13 @@ BytecodeFileReader::BytecodeFileReader(const std::string &Filename) { if (Buffer == (unsigned char*)MAP_FAILED) throw std::string("Error mmapping file!"); - // Parse the bytecode we mmapped in - ParseBytecode(Buffer, Length, Filename); + try { + // Parse the bytecode we mmapped in + ParseBytecode(Buffer, Length, Filename); + } catch (...) { + munmap((char*)Buffer, Length); + throw; + } } BytecodeFileReader::~BytecodeFileReader() { @@ -106,7 +111,12 @@ BytecodeBufferReader::BytecodeBufferReader(const unsigned char *Buf, ParseBegin = Buffer = Buf; MustDelete = false; } - ParseBytecode(ParseBegin, Length, ModuleID); + try { + ParseBytecode(ParseBegin, Length, ModuleID); + } catch (...) { + if (MustDelete) delete [] Buffer; + throw; + } } BytecodeBufferReader::~BytecodeBufferReader() { -- 2.34.1