imgcodecs: add null pointer check

0d4fd20a · Alexander Alekhin · 32a02544 · 0d4fd20a
Commit 0d4fd20a authored Aug 31, 2018 by Alexander Alekhin
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

loadsave.cpp modules/imgcodecs/src/loadsave.cpp +2 -0

No files found.
--- a/modules/imgcodecs/src/loadsave.cpp
+++ b/modules/imgcodecs/src/loadsave.cpp
@@ -396,6 +396,8 @@ static void ApplyExifOrientation(const Mat& buf, Mat& img)
 static void*
 imread_( const String& filename, int flags, int hdrtype, Mat* mat=0 )
 {
+    CV_Assert(mat || hdrtype != LOAD_MAT); // mat is required in LOAD_MAT case
+
    IplImage* image = 0;
    CvMat *matrix = 0;
    Mat temp, *data = &temp;