Added check for the number of layers to the jp2 coder.

ImageMagick · Apr 30, 2024 · a056a15 · a056a15
1 parent 87e13b5
commit a056a15
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/coders/jp2.c b/coders/jp2.c
@@ -283,6 +283,9 @@ static Image *ReadJP2Image(const ImageInfo *image_info,ExceptionInfo *exception)
   opj_codec_t
     *jp2_codec;
 
+  opj_codestream_info_v2_t
+    *jp2_codestream_info;
+
   opj_dparameters_t
     parameters;
 
@@ -363,6 +366,14 @@ static Image *ReadJP2Image(const ImageInfo *image_info,ExceptionInfo *exception)
       opj_destroy_codec(jp2_codec);
       ThrowReaderException(DelegateError,"UnableToDecodeImageFile");
     }
+  jp2_codestream_info=opj_get_cstr_info(jp2_codec);
+  if (AcquireMagickResource(ListLengthResource,(MagickSizeType)
+       jp2_codestream_info->m_default_tile_info.numlayers) == MagickFalse)
+    {
+      opj_stream_destroy(jp2_stream);
+      opj_destroy_codec(jp2_codec);
+      ThrowReaderException(ResourceLimitError,"ListLengthExceedsLimit");
+    }
   jp2_status=OPJ_TRUE;
   if ((AcquireMagickResource(WidthResource,(size_t) jp2_image->comps[0].w) == MagickFalse) ||
       (AcquireMagickResource(WidthResource,(size_t) jp2_image->x1) == MagickFalse) ||