diff options
author | Michael Niedermayer <michael@niedermayer.cc> | 2020-11-04 01:06:47 +0100 |
---|---|---|
committer | Michael Niedermayer <michael@niedermayer.cc> | 2021-09-09 13:53:29 +0200 |
commit | f9cde79ca7f984e47e29d414cdc58a83793f55eb (patch) | |
tree | 861a8e2e4d556a7d5ad5d8efa6ebdcac78cb597a | |
parent | c2221da01937dc79080a38ca75115e65af6a5623 (diff) | |
download | ffmpeg-f9cde79ca7f984e47e29d414cdc58a83793f55eb.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 fe502ae77e..ba98bba0d3 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -2949,7 +2949,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 */ |