6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-06-21 02:24:22 +00:00
Code Issues Projects Releases Wiki Activity

If new[] fails, return 0 rather then trying to dereference a null pointer.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@64444 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Evan Cheng
2009-02-13 07:54:34 +00:00
parent 8968a07768
commit 726135ad1a
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/Support/MemoryBuffer.cpp
View File

@ -109,6 +109,7 @@ MemoryBuffer *MemoryBuffer::getMemBufferCopy(const char *StartPtr,
MemoryBuffer *MemoryBuffer::getNewUninitMemBuffer(size_t Size, MemoryBuffer *MemoryBuffer::getNewUninitMemBuffer(size_t Size,
const char *BufferName) { const char *BufferName) {
char *Buf = new char[Size+1]; char *Buf = new char[Size+1];
if (!Buf) return 0;
Buf[Size] = 0; Buf[Size] = 0;
MemoryBufferMem *SB = new MemoryBufferMem(Buf, Buf+Size, BufferName); MemoryBufferMem *SB = new MemoryBufferMem(Buf, Buf+Size, BufferName);
// The memory for this buffer is owned by the MemoryBuffer. // The memory for this buffer is owned by the MemoryBuffer.
@ -123,6 +124,7 @@ MemoryBuffer *MemoryBuffer::getNewUninitMemBuffer(size_t Size,
MemoryBuffer *MemoryBuffer::getNewMemBuffer(size_t Size, MemoryBuffer *MemoryBuffer::getNewMemBuffer(size_t Size,
const char *BufferName) { const char *BufferName) {
MemoryBuffer *SB = getNewUninitMemBuffer(Size, BufferName); MemoryBuffer *SB = getNewUninitMemBuffer(Size, BufferName);
if (!SB) return 0;
memset(const_cast<char*>(SB->getBufferStart()), 0, Size+1); memset(const_cast<char*>(SB->getBufferStart()), 0, Size+1);
return SB; return SB;
} }
@ -209,9 +211,16 @@ MemoryBuffer *MemoryBuffer::getFile(const char *Filename, std::string *ErrStr,
return new MemoryBufferMMapFile(Filename, Pages, FileSize); return new MemoryBufferMMapFile(Filename, Pages, FileSize);
} }
} }
OwningPtr<MemoryBuffer> SB; MemoryBuffer *Buf = MemoryBuffer::getNewUninitMemBuffer(FileSize, Filename);
SB.reset(MemoryBuffer::getNewUninitMemBuffer(FileSize, Filename)); if (!Buf) {
// Failed to create a buffer.
if (ErrStr) *ErrStr = "could not allocate buffer";
::close(FD);
return 0;
}
OwningPtr<MemoryBuffer> SB(Buf);
char *BufPtr = const_cast<char*>(SB->getBufferStart()); char *BufPtr = const_cast<char*>(SB->getBufferStart());
size_t BytesLeft = FileSize; size_t BytesLeft = FileSize;