har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/mpegts: Limit copied data to space

Browse Source 
Fixes: out of array access
Fixes: 26816/clusterfuzz-testcase-minimized-ffmpeg_dem_MPEGTSRAW_fuzzer-6282861159907328.fuzz

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 79cf7c71910a69b9f22b3e7ee6508a771262abaf)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2020-11-04 01:06:47 +01:00
parent c2221da019
commit f9cde79ca7
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/mpegts.c
View File

@ -2949,7 +2949,7 @@ static int mpegts_raw_read_packet(AVFormatContext *s, AVPacket *pkt)
return ret; return ret;
} }
if (data != pkt->data) if (data != pkt->data)
memcpy(pkt->data, data, ts->raw_packet_size); memcpy(pkt->data, data, TS_PACKET_SIZE);
finished_reading_packet(s, ts->raw_packet_size); finished_reading_packet(s, ts->raw_packet_size);
if (ts->mpeg2ts_compute_pcr) { if (ts->mpeg2ts_compute_pcr) {
/* compute exact PCR for each packet */ /* compute exact PCR for each packet */