detect broken ICC when encoding jpg (libjxl#3833)

* detect broken ICC when encoding jpg * Update lib/jxl/encode.cc Co-authored-by: Jon Sneyers <jon@cloudinary.com> * fix format --------- Co-authored-by: Jon Sneyers <jon@cloudinary.com> (cherry picked from commit 635eb58)
libsdl-org · Nov 26, 2024 · 23f992e · 23f992e
1 parent 9212d84
commit 23f992e
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 8 deletions.
diff --git a/lib/jxl/encode.cc b/lib/jxl/encode.cc
@@ -2097,8 +2097,13 @@ JxlEncoderStatus JxlEncoderAddJPEGFrame(
   }
 
   if (!frame_settings->enc->color_encoding_set) {
-    SetColorEncodingFromJpegData(
-        *io.Main().jpeg_data, &frame_settings->enc->metadata.m.color_encoding);
+    if (!SetColorEncodingFromJpegData(
+            *io.Main().jpeg_data,
+            &frame_settings->enc->metadata.m.color_encoding)) {
+      return JXL_API_ERROR(
+          frame_settings->enc, JXL_ENC_ERR_BAD_INPUT,
+          "Error decoding the ICC profile embedded in the input JPEG");
+    }
     frame_settings->enc->color_encoding_set = true;
   }
 

diff --git a/lib/jxl/jpeg/enc_jpeg_data.cc b/lib/jxl/jpeg/enc_jpeg_data.cc
@@ -6,6 +6,7 @@
 #include "lib/jxl/jpeg/enc_jpeg_data.h"
 
 #include <brotli/encode.h>
+#include <jxl/cms.h>
 #include <jxl/memory_manager.h>
 #include <jxl/types.h>
 
@@ -222,8 +223,8 @@ inline bool IsJPG(const Span<const uint8_t> bytes) {
 
 }  // namespace
 
-void SetColorEncodingFromJpegData(const jpeg::JPEGData& jpg,
-                                  ColorEncoding* color_encoding) {
+Status SetColorEncodingFromJpegData(const jpeg::JPEGData& jpg,
+                                    ColorEncoding* color_encoding) {
   IccBytes icc_profile;
   if (!ParseChunkedMarker(jpg, kApp2, ByteSpan(kIccProfileTag), &icc_profile)) {
     JXL_WARNING("ReJPEG: corrupted ICC profile\n");
@@ -234,8 +235,10 @@ void SetColorEncodingFromJpegData(const jpeg::JPEGData& jpg,
     bool is_gray = (jpg.components.size() == 1);
     *color_encoding = ColorEncoding::SRGB(is_gray);
   } else {
-    color_encoding->SetICCRaw(std::move(icc_profile));
+    JXL_RETURN_IF_ERROR(
+        color_encoding->SetICC(std::move(icc_profile), JxlGetDefaultCms()));
   }
+  return true;
 }
 
 Status SetChromaSubsamplingFromJpegData(const JPEGData& jpg,
@@ -398,7 +401,8 @@ Status DecodeImageJPG(const Span<const uint8_t> bytes, CodecInOut* io) {
                       jpeg_data)) {
     return JXL_FAILURE("Error reading JPEG");
   }
-  SetColorEncodingFromJpegData(*jpeg_data, &io->metadata.m.color_encoding);
+  JXL_RETURN_IF_ERROR(
+      SetColorEncodingFromJpegData(*jpeg_data, &io->metadata.m.color_encoding));
   JXL_RETURN_IF_ERROR(SetBlobsFromJpegData(*jpeg_data, &io->blobs));
   JXL_RETURN_IF_ERROR(SetChromaSubsamplingFromJpegData(
       *jpeg_data, &io->Main().chroma_subsampling));

diff --git a/lib/jxl/jpeg/enc_jpeg_data.h b/lib/jxl/jpeg/enc_jpeg_data.h
@@ -27,8 +27,8 @@ Status EncodeJPEGData(JxlMemoryManager* memory_manager, JPEGData& jpeg_data,
                       std::vector<uint8_t>* bytes,
                       const CompressParams& cparams);
 
-void SetColorEncodingFromJpegData(const jpeg::JPEGData& jpg,
-                                  ColorEncoding* color_encoding);
+Status SetColorEncodingFromJpegData(const jpeg::JPEGData& jpg,
+                                    ColorEncoding* color_encoding);
 Status SetChromaSubsamplingFromJpegData(const JPEGData& jpg,
                                         YCbCrChromaSubsampling* cs);
 Status SetColorTransformFromJpegData(const JPEGData& jpg,