Merge pull request #119570 from bruvzg/jpg_fatal

Fail JPEG import on fatal errors only.
This commit is contained in:
Thaddeus Crews committed 2026-05-19 11:18:31 -05:00
commit f294c68bb5
1 file changed
+6 -2
+6 -2
View File
@@ -73,8 +73,12 @@ Error jpeg_turbo_load_image_from_buffer(Image *p_image, const uint8_t *p_buffer,
data.resize(width * height * tjPixelSize[tj_pixel_format]);
if (tj3Decompress8(tj_instance, p_buffer, p_buffer_len, data.ptrw(), 0, tj_pixel_format) < 0) {
tj3Destroy(tj_instance);
return ERR_FILE_CORRUPT;
if (tj3GetErrorCode(tj_instance) == TJERR_FATAL) {
tj3Destroy(tj_instance);
return ERR_FILE_CORRUPT;
} else {
WARN_PRINT(String::utf8(tj3GetErrorStr(tj_instance)));
}
}
tj3Destroy(tj_instance);