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

Merge pull request #45702 from hpvb/fix-tga-crash-32

Browse source 
[3.2] Fix a crash in the TGA loader with malformed input
This commit is contained in:
Rémi Verschelde 2021-02-04 14:47:37 +01:00 committed by GitHub
commit f42f6ed01c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
modules/tga/image_loader_tga.cpp
View file

@ -55,6 +55,10 @@ Error ImageLoaderTGA::decode_tga_rle(const uint8_t *p_compressed_buffer, size_t
compressed_pos += 1; compressed_pos += 1;
count = (c & 0x7f) + 1; count = (c & 0x7f) + 1;
if (output_pos + count * p_pixel_size > output_pos) {
return ERR_PARSE_ERROR;
}
if (c & 0x80) { if (c & 0x80) {
for (size_t i = 0; i < p_pixel_size; i++) { for (size_t i = 0; i < p_pixel_size; i++) {
pixels_w.ptr()[i] = p_compressed_buffer[compressed_pos]; pixels_w.ptr()[i] = p_compressed_buffer[compressed_pos];
@ -78,7 +82,7 @@ Error ImageLoaderTGA::decode_tga_rle(const uint8_t *p_compressed_buffer, size_t
return OK; return OK;
} }
Error ImageLoaderTGA::convert_to_image(Ref<Image> p_image, const uint8_t *p_buffer, const tga_header_s &p_header, const uint8_t *p_palette, const bool p_is_monochrome) { Error ImageLoaderTGA::convert_to_image(Ref<Image> p_image, const uint8_t *p_buffer, const tga_header_s &p_header, const uint8_t *p_palette, const bool p_is_monochrome, size_t p_output_size) {
#define TGA_PUT_PIXEL(r, g, b, a) \ #define TGA_PUT_PIXEL(r, g, b, a) \
int image_data_ofs = ((y * width) + x); \ int image_data_ofs = ((y * width) + x); \
@ -130,6 +134,9 @@ Error ImageLoaderTGA::convert_to_image(Ref<Image> p_image, const uint8_t *p_buff
if (p_is_monochrome) { if (p_is_monochrome) {
while (y != y_end) { while (y != y_end) {
while (x != x_end) { while (x != x_end) {
if (i > p_output_size) {
return ERR_PARSE_ERROR;
}
uint8_t shade = p_buffer[i]; uint8_t shade = p_buffer[i];
TGA_PUT_PIXEL(shade, shade, shade, 0xff) TGA_PUT_PIXEL(shade, shade, shade, 0xff)
@ -143,6 +150,9 @@ Error ImageLoaderTGA::convert_to_image(Ref<Image> p_image, const uint8_t *p_buff
} else { } else {
while (y != y_end) { while (y != y_end) {
while (x != x_end) { while (x != x_end) {
if (i > p_output_size) {
return ERR_PARSE_ERROR;
}
uint8_t index = p_buffer[i]; uint8_t index = p_buffer[i];
uint8_t r = 0x00; uint8_t r = 0x00;
uint8_t g = 0x00; uint8_t g = 0x00;
@ -171,6 +181,10 @@ Error ImageLoaderTGA::convert_to_image(Ref<Image> p_image, const uint8_t *p_buff
} else if (p_header.pixel_depth == 24) { } else if (p_header.pixel_depth == 24) {
while (y != y_end) { while (y != y_end) {
while (x != x_end) { while (x != x_end) {
if (i + 2 > p_output_size) {
return ERR_PARSE_ERROR;
}
uint8_t r = p_buffer[i + 2]; uint8_t r = p_buffer[i + 2];
uint8_t g = p_buffer[i + 1]; uint8_t g = p_buffer[i + 1];
uint8_t b = p_buffer[i + 0]; uint8_t b = p_buffer[i + 0];
@ -186,6 +200,10 @@ Error ImageLoaderTGA::convert_to_image(Ref<Image> p_image, const uint8_t *p_buff
} else if (p_header.pixel_depth == 32) { } else if (p_header.pixel_depth == 32) {
while (y != y_end) { while (y != y_end) {
while (x != x_end) { while (x != x_end) {
if (i + 3 > p_output_size) {
return ERR_PARSE_ERROR;
}
uint8_t a = p_buffer[i + 3]; uint8_t a = p_buffer[i + 3];
uint8_t r = p_buffer[i + 2]; uint8_t r = p_buffer[i + 2];
uint8_t g = p_buffer[i + 1]; uint8_t g = p_buffer[i + 1];
@ -280,7 +298,7 @@ Error ImageLoaderTGA::load_image(Ref<Image> p_image, FileAccess *f, bool p_force
PoolVector<uint8_t>::Read src_image_r = src_image.read(); PoolVector<uint8_t>::Read src_image_r = src_image.read();
const size_t pixel_size = tga_header.pixel_depth >> 3; const size_t pixel_size = tga_header.pixel_depth >> 3;
const size_t buffer_size = (tga_header.image_width * tga_header.image_height) * pixel_size; size_t buffer_size = (tga_header.image_width * tga_header.image_height) * pixel_size;
PoolVector<uint8_t> uncompressed_buffer; PoolVector<uint8_t> uncompressed_buffer;
uncompressed_buffer.resize(buffer_size); uncompressed_buffer.resize(buffer_size);
@ -299,11 +317,12 @@ Error ImageLoaderTGA::load_image(Ref<Image> p_image, FileAccess *f, bool p_force
} }
} else { } else {
buffer = src_image_r.ptr(); buffer = src_image_r.ptr();
buffer_size = src_image_len;
}; };
if (err == OK) { if (err == OK) {
PoolVector<uint8_t>::Read palette_r = palette.read(); PoolVector<uint8_t>::Read palette_r = palette.read();
err = convert_to_image(p_image, buffer, tga_header, palette_r.ptr(), is_monochrome); err = convert_to_image(p_image, buffer, tga_header, palette_r.ptr(), is_monochrome, buffer_size);
} }
} }

2
modules/tga/image_loader_tga.h
View file

@ -73,7 +73,7 @@ class ImageLoaderTGA : public ImageFormatLoader {
uint8_t image_descriptor; uint8_t image_descriptor;
}; };
static Error decode_tga_rle(const uint8_t *p_compressed_buffer, size_t p_pixel_size, uint8_t *p_uncompressed_buffer, size_t p_output_size); static Error decode_tga_rle(const uint8_t *p_compressed_buffer, size_t p_pixel_size, uint8_t *p_uncompressed_buffer, size_t p_output_size);
static Error convert_to_image(Ref<Image> p_image, const uint8_t *p_buffer, const tga_header_s &p_header, const uint8_t *p_palette, const bool p_is_monochrome); static Error convert_to_image(Ref<Image> p_image, const uint8_t *p_buffer, const tga_header_s &p_header, const uint8_t *p_palette, const bool p_is_monochrome, size_t p_output_size);
public: public:
virtual Error load_image(Ref<Image> p_image, FileAccess *f, bool p_force_linear, float p_scale); virtual Error load_image(Ref<Image> p_image, FileAccess *f, bool p_force_linear, float p_scale);