Merge pull request #25864 from vrabaud:legacy

vrabaud · web-flow · commit dfbd18e9aa12 · 2024-07-05T08:53:28.000+03:00
Make sure all the lines of a JPEG are read #25864 In case of corrupted JPEG, imread would still return a JPEG of the proper size (as indicated by the header) but with some uninitialized values. I do not have a short reproducer I can add as a test as this was found by our fuzzers. ### Pull Request Readiness Checklist See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request - [x] I agree to contribute to the project under Apache 2 License. - [x] To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV - [x] The PR is proposed to the proper branch
diff --git a/modules/imgcodecs/src/grfmt_jpeg.cpp b/modules/imgcodecs/src/grfmt_jpeg.cpp
@@ -499,7 +499,7 @@ bool  JpegDecoder::readData( Mat& img )
                 for( int iy = 0 ; iy < m_height; iy ++ )
                 {
                     uchar* data = img.ptr<uchar>(iy);
-                    jpeg_read_scanlines( cinfo, &data, 1 );
+                    if (jpeg_read_scanlines( cinfo, &data, 1 ) != 1) return false;
                 }
             }
             else
@@ -510,7 +510,7 @@ bool  JpegDecoder::readData( Mat& img )
                 for( int iy = 0 ; iy < m_height; iy ++ )
                 {
                     uchar* data = img.ptr<uchar>(iy);
-                    jpeg_read_scanlines( cinfo, buffer, 1 );
+                    if (jpeg_read_scanlines( cinfo, buffer, 1 ) != 1) return false;
 
                     if( color )
                     {

Original file line number	Diff line number	Diff line change
`@@ -499,7 +499,7 @@ bool JpegDecoder::readData( Mat& img )`
`499`	`499`	`for( int iy = 0 ; iy < m_height; iy ++ )`
`500`	`500`	`{`
`501`	`501`	`uchar* data = img.ptr<uchar>(iy);`
`502`		`- jpeg_read_scanlines( cinfo, &data, 1 );`
	`502`	`+ if (jpeg_read_scanlines( cinfo, &data, 1 ) != 1) return false;`
`503`	`503`	`}`
`504`	`504`	`}`
`505`	`505`	`else`
`@@ -510,7 +510,7 @@ bool JpegDecoder::readData( Mat& img )`
`510`	`510`	`for( int iy = 0 ; iy < m_height; iy ++ )`
`511`	`511`	`{`
`512`	`512`	`uchar* data = img.ptr<uchar>(iy);`
`513`		`- jpeg_read_scanlines( cinfo, buffer, 1 );`
	`513`	`+ if (jpeg_read_scanlines( cinfo, buffer, 1 ) != 1) return false;`
`514`	`514`
`515`	`515`	`if( color )`
`516`	`516`	`{`