Merge pull request #212 from taka-no-me/fix_2602

Prevent imread from illegal memory access (Bug #2602)
12 years ago · 60ad505a63
parent 2bf56961c0 1821d21f5b
commit 60ad505a63
1 changed files with 9 additions and 5 deletions
--- a/modules/highgui/src/grfmt_jpeg.cpp
+++ b/modules/highgui/src/grfmt_jpeg.cpp
@ -229,12 +229,16 @@ bool  JpegDecoder::readHeader()
            if( m_f )
                jpeg_stdio_src( &state->cinfo, m_f );
        }
-        jpeg_read_header( &state->cinfo, TRUE );

-        m_width = state->cinfo.image_width;
-        m_height = state->cinfo.image_height;
-        m_type = state->cinfo.num_components > 1 ? CV_8UC3 : CV_8UC1;
-        result = true;
+        if (state->cinfo.src != 0)
+        {
+            jpeg_read_header( &state->cinfo, TRUE );
+
+            m_width = state->cinfo.image_width;
+            m_height = state->cinfo.image_height;
+            m_type = state->cinfo.num_components > 1 ? CV_8UC3 : CV_8UC1;
+            result = true;
+        }
    }

    if( !result )