From c215e403167dc33cbad38a8adb6cf8aa0ff69c94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Reimar=20D=C3=B6ffinger?= <Reimar.Doeffinger@gmx.de>
Date: Wed, 31 Jan 2007 21:20:31 +0000
Subject: [PATCH] Make sure we do not accidentially "fix" cnt to something < 0
Originally committed as revision 7788 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavcodec/lzo.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/libavcodec/lzo.c b/libavcodec/lzo.c
index 54edc800ac7..d3849a743dc 100644
--- a/libavcodec/lzo.c
+++ b/libavcodec/lzo.c
@@ -87,11 +87,11 @@ static inline void copy(LZOContext *c, int cnt) {
register uint8_t *src = c->in;
register uint8_t *dst = c->out;
if (cnt > c->in_end - src) {
- cnt = c->in_end - src;
+ cnt = FFMAX(c->in_end - src, 0);
c->error |= LZO_INPUT_DEPLETED;
}
if (cnt > c->out_end - dst) {
- cnt = c->out_end - dst;
+ cnt = FFMAX(c->out_end - dst, 0);
c->error |= LZO_OUTPUT_FULL;
}
#if defined(INBUF_PADDED) && defined(OUTBUF_PADDED)
@@ -122,7 +122,7 @@ static inline void copy_backptr(LZOContext *c, int back, int cnt) {
return;
}
if (cnt > c->out_end - dst) {
- cnt = c->out_end - dst;
+ cnt = FFMAX(c->out_end - dst, 0);
c->error |= LZO_OUTPUT_FULL;
}
if (back == 1) {
--
GitLab