From 112aa491045d2001741ac157dc359f65a92ae260 Mon Sep 17 00:00:00 2001 From: Maksim Shabunin Date: Mon, 8 Feb 2016 17:11:35 +0300 Subject: [PATCH] ExifReader::getFormat : check buffer length before accessing, fixes 6059 --- modules/imgcodecs/src/jpeg_exif.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/imgcodecs/src/jpeg_exif.cpp b/modules/imgcodecs/src/jpeg_exif.cpp index 103e72ddec..ebc4f05352 100644 --- 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; } -- GitLab