Administrator/opencv-MIRROR
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-09-12 13:23:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

imgcodecs: add runtime checks to validate input

Browse Source
This commit is contained in:
Alexander Alekhin
2022-02-15 11:48:09 +00:00
parent 19926e2979
commit f9b1dbe2ac
3 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/imgcodecs/src/grfmt_pam.cpp
View File

@@ -470,7 +470,11 @@ bool PAMDecoder::readHeader()
selected_fmt = IMWRITE_PAM_FORMAT_GRAYSCALE;
else if (m_channels == 3 && m_maxval < 256)
selected_fmt = IMWRITE_PAM_FORMAT_RGB;
else
CV_Error(Error::StsError, "Can't determine selected_fmt (IMWRITE_PAM_FORMAT_NULL)");
}
CV_CheckDepth(m_sampledepth, m_sampledepth == CV_8U || m_sampledepth == CV_16U, "");
CV_Check(m_channels, m_channels >= 1 && m_channels <= 4, "Unsupported number of channels");
m_type = CV_MAKETYPE(m_sampledepth, m_channels);
m_offset = m_strm.getPos();
@@ -567,6 +571,10 @@ bool PAMDecoder::readData(Mat& img)
FillColorRow1( data, src, m_width, palette );
}
}
else
{
CV_Error(Error::StsError, cv::format("Unsupported value of target_channels: %d", target_channels));
}
} else {
for (int y = 0; y < m_height; y++, data += imp_stride)
{