walkero
/
openjpeg
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

opj_j2k_read_header_procedure(): validate marker size to avoid excessive memory allocation attempt

This commit is contained in:
Even Rouault 2017-07-03 14:33:57 +02:00
parent 5736b1a368
commit c308de39ed
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lib/openjp2/j2k.c
View File

@ -7711,6 +7711,10 @@ static OPJ_BOOL opj_j2k_read_header_procedure(opj_j2k_t *p_j2k,
/* read 2 bytes as the marker size */
opj_read_bytes(p_j2k->m_specific_param.m_decoder.m_header_data, &l_marker_size,
2);
if (l_marker_size < 2) {
opj_event_msg(p_manager, EVT_ERROR, "Invalid marker size\n");
return OPJ_FALSE;
}
l_marker_size -= 2; /* Subtract the size of the marker ID already read */
/* Check if the marker size is compatible with the header data size */