[llvm] r187698 - MachObjectFile: Don't leak on error.
Benjamin Kramer
benny.kra at googlemail.com
Sat Aug 3 15:16:37 PDT 2013
Author: d0k
Date: Sat Aug 3 17:16:37 2013
New Revision: 187698
URL: http://llvm.org/viewvc/llvm-project?rev=187698&view=rev
Log:
MachObjectFile: Don't leak on error.
Modified:
llvm/trunk/lib/Object/MachOObjectFile.cpp
Modified: llvm/trunk/lib/Object/MachOObjectFile.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Object/MachOObjectFile.cpp?rev=187698&r1=187697&r2=187698&view=diff
==============================================================================
--- llvm/trunk/lib/Object/MachOObjectFile.cpp (original)
+++ llvm/trunk/lib/Object/MachOObjectFile.cpp Sat Aug 3 17:16:37 2013
@@ -1599,21 +1599,23 @@ void MachOObjectFile::ReadULEB128s(uint6
ObjectFile *ObjectFile::createMachOObjectFile(MemoryBuffer *Buffer) {
StringRef Magic = Buffer->getBuffer().slice(0, 4);
error_code ec;
- ObjectFile *Ret;
+ OwningPtr<ObjectFile> Ret;
if (Magic == "\xFE\xED\xFA\xCE")
- Ret = new MachOObjectFile(Buffer, false, false, ec);
+ Ret.reset(new MachOObjectFile(Buffer, false, false, ec));
else if (Magic == "\xCE\xFA\xED\xFE")
- Ret = new MachOObjectFile(Buffer, true, false, ec);
+ Ret.reset(new MachOObjectFile(Buffer, true, false, ec));
else if (Magic == "\xFE\xED\xFA\xCF")
- Ret = new MachOObjectFile(Buffer, false, true, ec);
+ Ret.reset(new MachOObjectFile(Buffer, false, true, ec));
else if (Magic == "\xCF\xFA\xED\xFE")
- Ret = new MachOObjectFile(Buffer, true, true, ec);
- else
+ Ret.reset(new MachOObjectFile(Buffer, true, true, ec));
+ else {
+ delete Buffer;
return NULL;
+ }
if (ec)
return NULL;
- return Ret;
+ return Ret.take();
}
} // end namespace object
More information about the llvm-commits
mailing list