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

e4dc479e · Alexander Alekhin · afdcfccd · 112aa491 · e4dc479e
Commit e4dc479e authored Feb 08, 2016 by Alexander Alekhin
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

jpeg_exif.cpp modules/imgcodecs/src/jpeg_exif.cpp +4 -1

No files found.
--- 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;
    }