admin/hasherezade-bearparser
1
0
Fork 0
mirror of https://github.com/hasherezade/bearparser synced 2026-06-08 14:32:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

[BUGFIX] In AbstractByteBuffer::pasteBuffer - validate if source!=NULL

Browse Source
This commit is contained in:
hasherezade
2014-09-13 21:09:11 +02:00
parent 2387cb5997
commit 46caedef5f
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
parser/AbstractByteBuffer.cpp
+7 -7
View File
@@ -136,23 +136,23 @@ bool AbstractByteBuffer::fillContent(BYTE filling)
bool AbstractByteBuffer::pasteBuffer(offset_t rawOffset, AbstractByteBuffer *buf, bool allowTrunc)
{
if (isValid(buf) == false || isValid(this) == false) return false;
offset_t mySize = this->getContentSize();
if (buf == NULL || buf->getContent() == NULL) return false;
BYTE* source = buf->getContent();
bufsize_t sizeToFill = buf->getContentSize();
if (mySize <= rawOffset) {
bufsize_t mySize = this->getContentSize();
if (static_cast<offset_t>(mySize) <= rawOffset) {
if (DBG_LVL) printf("Too far offset requested: %llX while mySize: %llX\n", rawOffset, mySize);
return false;
}
bufsize_t sizeToFill = buf->getContentSize();
BYTE *target = this->getContentAt(rawOffset, sizeToFill);
if (target == NULL) {
if (allowTrunc == false) return false;
sizeToFill = mySize -rawOffset;
sizeToFill = mySize - rawOffset;
target = this->getContentAt(rawOffset, sizeToFill);
}
if (target == NULL) return false;
memcpy(target, buf->getContent(), sizeToFill);
memcpy(target, source, sizeToFill);
return true;
}