From bc17aef0549005e319603d3d9cd2f3aeebf89674 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pa=CC=84vels=20Nadtoc=CC=8Cajevs?= <7645683+bruvzg@users.noreply.github.com> Date: Tue, 19 May 2026 14:02:42 +0300 Subject: [PATCH] Fail JPEG import on fatal errors only. --- modules/jpg/image_loader_libjpeg_turbo.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/jpg/image_loader_libjpeg_turbo.cpp b/modules/jpg/image_loader_libjpeg_turbo.cpp index 8a56d837f0..be3ea549c1 100644 --- a/modules/jpg/image_loader_libjpeg_turbo.cpp +++ b/modules/jpg/image_loader_libjpeg_turbo.cpp @@ -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);