diff options
author | Michael Niedermayer <michael@niedermayer.cc> | 2020-11-04 01:06:47 +0100 |
---|---|---|
committer | Michael Niedermayer <michael@niedermayer.cc> | 2021-09-11 21:23:48 +0200 |
commit | bec84159901eec2a83e0aace09ce5a8f460ca6d4 (patch) | |
tree | 2ff7b10be4c8b0abb4e8e737a9681f22f6489e09 | |
parent | e51ff9d5fdc096f104213decefcca1eb3432de3d (diff) | |
download | ffmpeg-bec84159901eec2a83e0aace09ce5a8f460ca6d4.tar.gz |
avformat/mpegts: Limit copied data to space
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>
-rw-r--r-- | libavformat/mpegts.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index ca6430de18..b4eb5cb64c 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -2734,7 +2734,7 @@ static int mpegts_raw_read_packet(AVFormatContext *s, AVPacket *pkt) return ret; } 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); if (ts->mpeg2ts_compute_pcr) { /* compute exact PCR for each packet */ |