virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Make sure we do not accidentially "fix" cnt to something < 0

Browse Source 
Originally committed as revision 7788 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Reimar Döffinger 2007-01-31 21:20:31 +00:00
parent c0a8b87600
commit c215e40316
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/lzo.c
View File

@ -87,11 +87,11 @@ static inline void copy(LZOContext *c, int cnt) {
register uint8_t *src = c->in; register uint8_t *src = c->in;
register uint8_t *dst = c->out; register uint8_t *dst = c->out;
if (cnt > c->in_end - src) { if (cnt > c->in_end - src) {
cnt = c->in_end - src; cnt = FFMAX(c->in_end - src, 0);
c->error |= LZO_INPUT_DEPLETED; c->error |= LZO_INPUT_DEPLETED;
} }
if (cnt > c->out_end - dst) { if (cnt > c->out_end - dst) {
cnt = c->out_end - dst; cnt = FFMAX(c->out_end - dst, 0);
c->error |= LZO_OUTPUT_FULL; c->error |= LZO_OUTPUT_FULL;
} }
#if defined(INBUF_PADDED) && defined(OUTBUF_PADDED) #if defined(INBUF_PADDED) && defined(OUTBUF_PADDED)
@ -122,7 +122,7 @@ static inline void copy_backptr(LZOContext *c, int back, int cnt) {
return; return;
} }
if (cnt > c->out_end - dst) { if (cnt > c->out_end - dst) {
cnt = c->out_end - dst; cnt = FFMAX(c->out_end - dst, 0);
c->error |= LZO_OUTPUT_FULL; c->error |= LZO_OUTPUT_FULL;
} }
if (back == 1) { if (back == 1) {