Merge pull request #6088 from mshabunin:fix-exif-parsing

2016-02-08 16:01:07 +00:00 · 2016-02-08 16:01:07 +00:00 · e4dc479e95
commit e4dc479e95
parent afdcfccdae 112aa49104
1 changed files with 4 additions and 1 deletions
--- a/modules/imgcodecs/src/jpeg_exif.cpp
+++ b/modules/imgcodecs/src/jpeg_exif.cpp
@ -245,7 +245,10 @@ void ExifReader::parseExif()
 */
 Endianess_t ExifReader::getFormat() const
 {
-    if( m_data[0] != m_data[1] )
+    if (m_data.size() < 1)
+        return NONE;
+
+    if( m_data.size() > 1 && m_data[0] != m_data[1] )
    {
        return NONE;
    }