godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix bits_per_pixel validation in BMP and TGA loader modules.

This commit is contained in:
Saracen 2018-07-08 18:51:20 +01:00
parent ecee0c92ff
commit 115f6d14a0
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/bmp/image_loader_bmp.cpp
View File

@ -53,7 +53,7 @@ Error ImageLoaderBMP::convert_to_image(Ref<Image> p_image,
err = FAILED; err = FAILED;
} }
if (bits_per_pixel != 24 || bits_per_pixel != 32) { if (!(bits_per_pixel == 24 || bits_per_pixel == 32)) {
err = FAILED; err = FAILED;
} }

3
modules/tga/image_loader_tga.cpp
View File

@ -250,8 +250,9 @@ Error ImageLoaderTGA::load_image(Ref<Image> p_image, FileAccess *f, bool p_force
if (tga_header.image_width <= 0 || tga_header.image_height <= 0) if (tga_header.image_width <= 0 || tga_header.image_height <= 0)
err = FAILED; err = FAILED;
if (tga_header.pixel_depth != 8 && tga_header.pixel_depth != 24 && tga_header.pixel_depth != 32) if (!(tga_header.pixel_depth == 8 || tga_header.pixel_depth == 24 || tga_header.pixel_depth == 32)) {
err = FAILED; err = FAILED;
}
if (err == OK) { if (err == OK) {
f->seek(f->get_position() + tga_header.id_length); f->seek(f->get_position() + tga_header.id_length);