asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #20046 from SaracenOne/bmp_fix

Browse source 
Fix bits_per_pixel validation in BMP and TGA loader modules.
This commit is contained in:
Max Hilbrunner 2018-07-10 13:35:14 +02:00 committed by GitHub
commit 04d9f8dbd6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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;
}
if (bits_per_pixel != 24 || bits_per_pixel != 32) {
if (!(bits_per_pixel == 24 || bits_per_pixel == 32)) {
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)
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;
}
if (err == OK) {
f->seek(f->get_position() + tga_header.id_length);