generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '503322f97c5a25a020933ed4ab510697d5f5b4af' into release/1.1

Browse Source 
* commit '503322f97c5a25a020933ed4ab510697d5f5b4af':
  lzo: Handle integer overflow

Conflicts:
	libavutil/lzo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-06-25 22:40:30 +02:00
parent 574bf2ce4c 503322f97c
commit a8dd7fe5b9
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavutil/lzo.c
View File

@@ -110,7 +110,7 @@ static inline void copy(LZOContext *c, int cnt)
/** /**
* @brief Copies previously decoded bytes to current position. * @brief Copies previously decoded bytes to current position.
* @param back how many bytes back we start, must be > 0 * @param back how many bytes back we start, must be > 0
* @param cnt number of bytes to copy, must be >= 0 * @param cnt number of bytes to copy, must be > 0
* *
* cnt > back is valid, this will copy the bytes we just copied, * cnt > back is valid, this will copy the bytes we just copied,
* thus creating a repeating pattern with a period length of back. * thus creating a repeating pattern with a period length of back.