diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-21 11:55:51 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-21 11:59:16 +0200 |
| commit | 0a28a52d53e20e45d8ca8c977984742b15b774f8 (patch) | |
| tree | a1cb5ad0491ca2d5a871934249f0ed0f01d068e3 /libavcodec/dsicinav.c | |
| parent | 75fbe41fc61eb8db693d00a529ba7a31830308e1 (diff) | |
| parent | dd0bfc3a6a310e3e3674ce7742672d689a9a0e93 (diff) | |
| download | ffmpeg-0a28a52d53e20e45d8ca8c977984742b15b774f8.tar.gz | |
Merge commit 'dd0bfc3a6a310e3e3674ce7742672d689a9a0e93'
* commit 'dd0bfc3a6a310e3e3674ce7742672d689a9a0e93':
dsicinav: Bound-check the source buffer when needed
Conflicts:
libavcodec/dsicinav.c
See: 47f0beadba9003391d8bfef59b15aa21a5b2d293
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dsicinav.c')
| -rw-r--r-- | libavcodec/dsicinav.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/dsicinav.c b/libavcodec/dsicinav.c index 8815f9ce5c..55c2742366 100644 --- a/libavcodec/dsicinav.c +++ b/libavcodec/dsicinav.c @@ -222,7 +222,7 @@ static int cin_decode_rle(const unsigned char *src, int src_size, av_log(NULL, AV_LOG_ERROR, "RLE overread\n"); return AVERROR_INVALIDDATA; } - memcpy(dst, src, FFMIN(len, dst_end - dst)); + memcpy(dst, src, FFMIN3(len, dst_end - dst, src_end - src)); src += len; } dst += len; |