GitHub-Proxy/tinygltf
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/syoyo/tinygltf.git synced 2025-07-08 02:41:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix memory leak of stb_image data.

Browse Source
This commit is contained in:
Syoyo Fujita 2016-11-24 16:20:34 +09:00
parent 15eb9bdf67
commit 4be2f888f7
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tiny_gltf_loader.h
View File

@ -893,6 +893,7 @@ static bool LoadImageData(Image *image, std::string *err, int req_width,
} }
if (w < 1 || h < 1) { if (w < 1 || h < 1) {
free(data);
if (err) { if (err) {
(*err) += "Unknown image format.\n"; (*err) += "Unknown image format.\n";
} }
@ -901,6 +902,7 @@ static bool LoadImageData(Image *image, std::string *err, int req_width,
if (req_width > 0) { if (req_width > 0) {
if (req_width != w) { if (req_width != w) {
free(data);
if (err) { if (err) {
(*err) += "Image width mismatch.\n"; (*err) += "Image width mismatch.\n";
} }
@ -910,6 +912,7 @@ static bool LoadImageData(Image *image, std::string *err, int req_width,
if (req_height > 0) { if (req_height > 0) {
if (req_height != h) { if (req_height != h) {
free(data);
if (err) { if (err) {
(*err) += "Image height mismatch.\n"; (*err) += "Image height mismatch.\n";
} }
@ -923,6 +926,8 @@ static bool LoadImageData(Image *image, std::string *err, int req_width,
image->image.resize(static_cast<size_t>(w * h * comp)); image->image.resize(static_cast<size_t>(w * h * comp));
std::copy(data, data + w * h * comp, image->image.begin()); std::copy(data, data + w * h * comp, image->image.begin());
free(data);
return true; return true;
} }