From 73fdf28342e4594019af26eb6a347a34eceb6296 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Wed, 2 Dec 2020 14:10:16 +0100 Subject: [PATCH] opj_j2k_write_sod(): avoid potential heap buffer overflow (fixes #1299) (probably master only) --- src/lib/openjp2/j2k.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/lib/openjp2/j2k.c b/src/lib/openjp2/j2k.c index 78d45925..8e343ab2 100644 --- a/src/lib/openjp2/j2k.c +++ b/src/lib/openjp2/j2k.c @@ -4806,8 +4806,13 @@ static OPJ_BOOL opj_j2k_write_sod(opj_j2k_t *p_j2k, } } - assert(l_remaining_data > - p_j2k->m_specific_param.m_encoder.m_reserved_bytes_for_PLT); + if (l_remaining_data < + p_j2k->m_specific_param.m_encoder.m_reserved_bytes_for_PLT) { + opj_event_msg(p_manager, EVT_ERROR, + "Not enough bytes in output buffer to write SOD marker\n"); + opj_tcd_marker_info_destroy(marker_info); + return OPJ_FALSE; + } l_remaining_data -= p_j2k->m_specific_param.m_encoder.m_reserved_bytes_for_PLT; if (! opj_tcd_encode_tile(p_tile_coder, p_j2k->m_current_tile_number,