eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-16 12:00:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

avformat/mpegts: Reset local nb_prg on add_program() failure

Browse Source 
add_program() will deallocate the whole array on failure so
we must clear nb_prgs

Fixes: null pointer dereference
Fixes: crash-35a3b39ddcc5babeeb005b7399a3a1217c8781bc

Found-by: Catena cyber
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit cb9752d897)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer
2024-02-27 02:07:28 +01:00
parent 3164cee228
commit 808ec6ccfa
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libavformat/mpegts.c
View File

@@ -2597,7 +2597,8 @@ static void pat_cb(MpegTSFilter *filter, const uint8_t *section, int section_len
FFSWAP(struct Program, ts->prg[nb_prg], ts->prg[prg_idx]); FFSWAP(struct Program, ts->prg[nb_prg], ts->prg[prg_idx]);
if (prg_idx >= nb_prg) if (prg_idx >= nb_prg)
nb_prg++; nb_prg++;
} } else
nb_prg = 0;
} }
} }
ts->nb_prg = nb_prg; ts->nb_prg = nb_prg;