Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport memory fixes found by ASAN #340

Merged
merged 2 commits into from
Jun 15, 2021
Merged

Backport memory fixes found by ASAN #340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a07613d
Fix heap overflow when reading (#337)
darksylinc Jun 14, 2021
c253240
Fix new [] / delete mismatch (#338)
darksylinc Jun 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions ogre2/src/Ogre2SelectionBuffer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,9 +175,12 @@ void Ogre2SelectionBuffer::CreateRTTBuffer()
const_cast<Ogre::CompositorPassSceneDef *>(scenePass)->mVisibilityMask =
IGN_VISIBILITY_SELECTABLE;

// buffer to store render texture data
size_t bufferSize = Ogre::PixelUtil::getMemorySize(width, height, 1, format);
// buffer to store render texture data. Ensure it's at least 4 bytes
size_t bufferSize = std::max<size_t>(
Ogre::PixelUtil::getMemorySize(width, height, 1, format),
4u);
this->dataPtr->buffer = new uint8_t[bufferSize];
memset(this->dataPtr->buffer, 0, 4u);
this->dataPtr->pixelBox = new Ogre::PixelBox(width,
height, 1, format, this->dataPtr->buffer);
}
Expand Down
12 changes: 11 additions & 1 deletion src/Image.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,16 @@
using namespace ignition;
using namespace rendering;

//////////////////////////////////////////////////
template <class T>
struct ArrayDeleter
{
void operator () (T const * p)
{
delete [] p;
}
};

//////////////////////////////////////////////////
Image::Image(unsigned int _width, unsigned int _height,
PixelFormat _format) :
Expand All @@ -27,7 +37,7 @@ Image::Image(unsigned int _width, unsigned int _height,
{
this->format = PixelUtil::Sanitize(_format);
unsigned int size = this->MemorySize();
this->data = DataPtr(new unsigned char[size]);
this->data = DataPtr(new unsigned char[size], ArrayDeleter<unsigned char>());
}

//////////////////////////////////////////////////
Expand Down