xenia-project/FFmpeg
1
0
Fork 0
mirror of https://github.com/xenia-project/FFmpeg.git synced 2025-02-16 09:58:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge commit 'dd0bfc3a6a310e3e3674ce7742672d689a9a0e93'

Browse Source 
* commit 'dd0bfc3a6a310e3e3674ce7742672d689a9a0e93':
  dsicinav: Bound-check the source buffer when needed

Conflicts:
	libavcodec/dsicinav.c

See: 47f0beadba9003391d8bfef59b15aa21a5b2d293
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-07-21 11:55:51 +02:00
commit 0a28a52d53
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/dsicinav.c
View File

@ -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;