Browse Source

Merge pull request #30634 from Xrayez/fix-bmp-table-assertion

Fix BMP loader incorrectly interpreting color table size
Rémi Verschelde 6 years ago
parent
commit
c59c2871a2
1 changed files with 1 additions and 1 deletions
  1. 1 1
      modules/bmp/image_loader_bmp.cpp

+ 1 - 1
modules/bmp/image_loader_bmp.cpp

@@ -257,8 +257,8 @@ Error ImageLoaderBMP::load_image(Ref<Image> p_image, FileAccess *f,
 			if (bmp_header.bmp_info_header.bmp_bit_count <= 8) {
 			if (bmp_header.bmp_info_header.bmp_bit_count <= 8) {
 				// Support 256 colors max
 				// Support 256 colors max
 				color_table_size = 1 << bmp_header.bmp_info_header.bmp_bit_count;
 				color_table_size = 1 << bmp_header.bmp_info_header.bmp_bit_count;
+				ERR_FAIL_COND_V(color_table_size == 0, ERR_BUG);
 			}
 			}
-			ERR_FAIL_COND_V(color_table_size == 0, ERR_BUG);
 
 
 			PoolVector<uint8_t> bmp_color_table;
 			PoolVector<uint8_t> bmp_color_table;
 			// Color table is usually 4 bytes per color -> [B][G][R][0]
 			// Color table is usually 4 bytes per color -> [B][G][R][0]