Merge pull request #16159 from alalek:imgcodecs_bmp_ubsan_enum_handling

5 years ago · 90a17cf964
parent 60ba6ef916 d1c35e7b61
commit 90a17cf964
1 changed files with 3 additions and 1 deletions
--- a/modules/imgcodecs/src/grfmt_bmp.cpp
+++ b/modules/imgcodecs/src/grfmt_bmp.cpp
@ -102,7 +102,9 @@ bool  BmpDecoder::readHeader()
            m_width  = m_strm.getDWord();
            m_height = m_strm.getDWord();
            m_bpp    = m_strm.getDWord() >> 16;
-            m_rle_code = (BmpCompression)m_strm.getDWord();
+            int m_rle_code_ = m_strm.getDWord();
+            CV_Assert(m_rle_code_ >= 0 && m_rle_code_ <= BMP_BITFIELDS);
+            m_rle_code = (BmpCompression)m_rle_code_;
            m_strm.skip(12);
            int clrused = m_strm.getDWord();
            m_strm.skip( size - 36 );