Add memory annotation in iccjpeg

third_party/iccjpeg/iccjpeg.c

@@ -20,6 +20,17 @@
 #include "iccjpeg.h"
 #include <stdlib.h>			/* define malloc() */
 
+#if defined(__clang__) && defined(__has_feature)
+#if __has_feature(memory_sanitizer)
+#include <sanitizer/msan_interface.h>
+#define AVIF_ANNOTATE_MEMORY_IS_INITIALIZED(address, size) __msan_unpoison(address, size)
+#endif
+#endif
+#if !defined(AVIF_ANNOTATE_MEMORY_IS_INITIALIZED)
+#define AVIF_ANNOTATE_MEMORY_IS_INITIALIZED(address, size) \
+    do {                                                   \
+    } while (0)
+#endif
 
 /*
  * Since an ICC profile can be larger than the maximum size of a JPEG marker
@@ -123,6 +134,9 @@ setup_read_icc_profile (j_decompress_ptr cinfo)
 static boolean
 marker_is_icc (jpeg_saved_marker_ptr marker)
 {
+  AVIF_ANNOTATE_MEMORY_IS_INITIALIZED(marker, sizeof(*marker));
+  if (marker->marker == ICC_MARKER && marker->data_length >= ICC_OVERHEAD_LEN)
+    AVIF_ANNOTATE_MEMORY_IS_INITIALIZED(marker->data, marker->data_length);
   return
     marker->marker == ICC_MARKER &&
     marker->data_length >= ICC_OVERHEAD_LEN &&