imgcodecs(tiff): add more checks

alalek · alalek · commit f6230ae0198e · 2019-06-10T21:00:20.000Z
https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=15154
diff --git a/modules/imgcodecs/src/grfmt_tiff.cpp b/modules/imgcodecs/src/grfmt_tiff.cpp
@@ -537,13 +537,15 @@ bool  TiffDecoder::readData( Mat& img )
                                     }
                                     else
                                     {
+                                        CV_CheckEQ(wanted_channels, 3, "TIFF-8bpp: BGR/BGRA images are supported only");
                                         icvCvt_BGRA2BGR_8u_C4C3R(bstart + i*tile_width0*4, 0,
                                                 img.ptr(img_y + tile_height - i - 1, x), 0,
                                                 Size(tile_width, 1), 2);
                                     }
                                 }
                                 else
                                 {
+                                    CV_CheckEQ(wanted_channels, 1, "");
                                     icvCvt_BGRA2Gray_8u_C4C1R( bstart + i*tile_width0*4, 0,
                                             img.ptr(img_y + tile_height - i - 1, x), 0,
                                             Size(tile_width, 1), 2);
@@ -569,12 +571,14 @@ bool  TiffDecoder::readData( Mat& img )
                                 {
                                     if (ncn == 1)
                                     {
+                                        CV_CheckEQ(wanted_channels, 3, "");
                                         icvCvt_Gray2BGR_16u_C1C3R(buffer16 + i*tile_width0*ncn, 0,
                                                 img.ptr<ushort>(img_y + i, x), 0,
                                                 Size(tile_width, 1));
                                     }
                                     else if (ncn == 3)
                                     {
+                                        CV_CheckEQ(wanted_channels, 3, "");
                                         icvCvt_RGB2BGR_16u_C3R(buffer16 + i*tile_width0*ncn, 0,
                                                 img.ptr<ushort>(img_y + i, x), 0,
                                                 Size(tile_width, 1));
@@ -589,20 +593,20 @@ bool  TiffDecoder::readData( Mat& img )
                                         }
                                         else
                                         {
+                                            CV_CheckEQ(wanted_channels, 3, "TIFF-16bpp: BGR/BGRA images are supported only");
                                             icvCvt_BGRA2BGR_16u_C4C3R(buffer16 + i*tile_width0*ncn, 0,
                                                 img.ptr<ushort>(img_y + i, x), 0,
                                                 Size(tile_width, 1), 2);
                                         }
                                     }
                                     else
                                     {
-                                        icvCvt_BGRA2BGR_16u_C4C3R(buffer16 + i*tile_width0*ncn, 0,
-                                                img.ptr<ushort>(img_y + i, x), 0,
-                                                Size(tile_width, 1), 2);
+                                        CV_Error(Error::StsError, "Not supported");
                                     }
                                 }
                                 else
                                 {
+                                    CV_CheckEQ(wanted_channels, 1, "");
                                     if( ncn == 1 )
                                     {
                                         memcpy(img.ptr<ushort>(img_y + i, x),

Original file line number	Diff line number	Diff line change
`@@ -537,13 +537,15 @@ bool TiffDecoder::readData( Mat& img )`
`537`	`537`	`}`
`538`	`538`	`else`
`539`	`539`	`{`
	`540`	`+ CV_CheckEQ(wanted_channels, 3, "TIFF-8bpp: BGR/BGRA images are supported only");`
`540`	`541`	`icvCvt_BGRA2BGR_8u_C4C3R(bstart + itile_width04, 0,`
`541`	`542`	`img.ptr(img_y + tile_height - i - 1, x), 0,`
`542`	`543`	`Size(tile_width, 1), 2);`
`543`	`544`	`}`
`544`	`545`	`}`
`545`	`546`	`else`
`546`	`547`	`{`
	`548`	`+ CV_CheckEQ(wanted_channels, 1, "");`
`547`	`549`	`icvCvt_BGRA2Gray_8u_C4C1R( bstart + itile_width04, 0,`
`548`	`550`	`img.ptr(img_y + tile_height - i - 1, x), 0,`
`549`	`551`	`Size(tile_width, 1), 2);`
`@@ -569,12 +571,14 @@ bool TiffDecoder::readData( Mat& img )`
`569`	`571`	`{`
`570`	`572`	`if (ncn == 1)`
`571`	`573`	`{`
	`574`	`+ CV_CheckEQ(wanted_channels, 3, "");`
`572`	`575`	`icvCvt_Gray2BGR_16u_C1C3R(buffer16 + itile_width0ncn, 0,`
`573`	`576`	`img.ptr<ushort>(img_y + i, x), 0,`
`574`	`577`	`Size(tile_width, 1));`
`575`	`578`	`}`
`576`	`579`	`else if (ncn == 3)`
`577`	`580`	`{`
	`581`	`+ CV_CheckEQ(wanted_channels, 3, "");`
`578`	`582`	`icvCvt_RGB2BGR_16u_C3R(buffer16 + itile_width0ncn, 0,`
`579`	`583`	`img.ptr<ushort>(img_y + i, x), 0,`
`580`	`584`	`Size(tile_width, 1));`
`@@ -589,20 +593,20 @@ bool TiffDecoder::readData( Mat& img )`
`589`	`593`	`}`
`590`	`594`	`else`
`591`	`595`	`{`
	`596`	`+ CV_CheckEQ(wanted_channels, 3, "TIFF-16bpp: BGR/BGRA images are supported only");`
`592`	`597`	`icvCvt_BGRA2BGR_16u_C4C3R(buffer16 + itile_width0ncn, 0,`
`593`	`598`	`img.ptr<ushort>(img_y + i, x), 0,`
`594`	`599`	`Size(tile_width, 1), 2);`
`595`	`600`	`}`
`596`	`601`	`}`
`597`	`602`	`else`
`598`	`603`	`{`
`599`		`- icvCvt_BGRA2BGR_16u_C4C3R(buffer16 + itile_width0ncn, 0,`
`600`		`- img.ptr<ushort>(img_y + i, x), 0,`
`601`		`- Size(tile_width, 1), 2);`
	`604`	`+ CV_Error(Error::StsError, "Not supported");`
`602`	`605`	`}`
`603`	`606`	`}`
`604`	`607`	`else`
`605`	`608`	`{`
	`609`	`+ CV_CheckEQ(wanted_channels, 1, "");`
`606`	`610`	`if( ncn == 1 )`
`607`	`611`	`{`
`608`	`612`	`memcpy(img.ptr<ushort>(img_y + i, x),`