From 9b5b2a9cfd693594c292e8dff778fe1f83d92621 Mon Sep 17 00:00:00 2001 From: jmacey Date: Fri, 6 Oct 2023 11:28:58 +0100 Subject: [PATCH] updated stbimage load routines to remove potential memory leak --- src/Image.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/Image.cpp b/src/Image.cpp index 8303050a..cf63b617 100644 --- a/src/Image.cpp +++ b/src/Image.cpp @@ -390,8 +390,9 @@ bool Image::load(std::string_view _fname,bool _flipY) noexcept } m_data=std::make_unique< unsigned char []>(m_width * m_height * m_channels); memcpy(m_data.get(), img, m_width * m_height * m_channels); + return true; } - else + else if(img == nullptr) { NGLMessage::addError("Image load failed this version only supports PNG,JPEG,GIF,TGA,BMP "); NGLMessage::addError("Have generated a Red Checkerboard pattern instead."); @@ -422,9 +423,14 @@ bool Image::load(std::string_view _fname,bool _flipY) noexcept } } } - } + return true; - return true; + } + else + { + return false; + } + } #endif } // namespace ngl