JP2 module: Tests during encoding if the number of components respects the JPEG 2000...

diff --git a/libopenjpeg/jp2.c b/libopenjpeg/jp2.c
index c411f7e0c8478ae449d66e51693210c292a9e439..b34a36d70405d226246760ee64d668bf26cda330 100644 (file)
--- a/libopenjpeg/jp2.c
+++ b/libopenjpeg/jp2.c
@@ -619,6 +619,12 @@ void jp2_setup_encoder(opj_jp2_t *jp2, opj_cparameters_t *parameters, opj_image_
        /* setup the J2K codec */
        /* ------------------- */
 
+       /* Check if number of components respects standard */
+       if (image->numcomps < 1 || image->numcomps > 16384) {
+               opj_event_msg(jp2->cinfo, EVT_ERROR, "Invalid number of components specified while setting up JP2 encoder\n");
+               return;
+       }
+
        j2k_setup_encoder(jp2->j2k, parameters, image);
 
        /* setup the JP2 codec */