Feat/fix memory leak #64
Conversation
interfaces/datastructure/Image.h
Outdated
| @@ -37,7 +37,7 @@ class SOLARFRAMEWORK_API ImageInternal { | |||
| ImageInternal() = default; | |||
| explicit ImageInternal(uint32_t size); | |||
| explicit ImageInternal(void* data, uint32_t size); | |||
| ~ImageInternal() = default; | |||
| ~ImageInternal(); | |||
src/datastructure/Image.cpp
Outdated
| @@ -419,14 +428,15 @@ FrameworkReturnCode Image::load(std::string imagePath) | |||
| m_internalImpl = utils::make_shared<ImageInternal>(); | |||
| m_internalImpl->setData(pixels, spec.image_bytes(true)); | |||
| in->close(); | |||
| delete[] pixels; | |||
There was a problem hiding this comment.
Here you fixed a case, if everything went OK, but at line 402, for exemple, where there is a return statement, resulting in a memory leak (same thing if any exception occurs). You could put everything in a try block and put the delete[] in a finally, but we should avoid using new/delete as much as possible.
Solutions might be to either
-
use a
std::unique_ptr<unsigned char[]>(I think that might require a trick consisiting in explicitely give a deallocator, but I'm not sure).
Here a code snippet with an array of ints. Or better:std::make_unique<unsigned char[]>(buffersize). -
use a
std::vectoryou initialize with thebuffersizecapacity, and give access to openimageio to the internal array withdata.
There was a problem hiding this comment.
It is a good idea to use std::unique_ptr<unsigned char[]> pixels(new unsigned char[size]).
src/datastructure/Image.cpp
Outdated
| @@ -467,6 +477,9 @@ void Image::load(Archive & ar, const unsigned int version) | |||
| m_internalImpl = utils::make_shared<ImageInternal>(); | |||
| m_internalImpl->setData(pixels, spec.image_bytes(true)); | |||
| in->close(); | |||
| decodingBuffer.clear(); | |||
| memreader.close(); | |||
| delete[] pixels; | |||
No description provided.