summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Stembridge <jstembridge@users.sourceforge.net>2003-10-16 22:03:36 +0000
committerJames Stembridge <jstembridge@users.sourceforge.net>2003-10-16 22:03:36 +0000
commitd600e7bf25209e559b9708eb378d9ea647c8cdfc (patch)
tree6778a4a19978bf6fa25992f3dc238d4d669cad9b
parent4cc2e9f9b332b1ccd9d9fa6a1276a136de88e7ea (diff)
downloadxine-lib-d600e7bf25209e559b9708eb378d9ea647c8cdfc.tar.gz
xine-lib-d600e7bf25209e559b9708eb378d9ea647c8cdfc.tar.bz2
Don't read off the end of the buffer
CVS patchset: 5531 CVS date: 2003/10/16 22:03:36
-rw-r--r--src/libffmpeg/libavcodec/mjpeg.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libffmpeg/libavcodec/mjpeg.c b/src/libffmpeg/libavcodec/mjpeg.c
index 7cab01c74..1b6b15c4a 100644
--- a/src/libffmpeg/libavcodec/mjpeg.c
+++ b/src/libffmpeg/libavcodec/mjpeg.c
@@ -1667,7 +1667,7 @@ static int find_marker(uint8_t **pbuf_ptr, uint8_t *buf_end)
while (buf_ptr < buf_end) {
v = *buf_ptr++;
v2 = *buf_ptr;
- if ((v == 0xff) && (v2 >= 0xc0) && (v2 <= 0xfe)) {
+ if ((buf_ptr < buf_end) && (v == 0xff) && (v2 >= 0xc0) && (v2 <= 0xfe)) {
val = *buf_ptr++;
goto found;
}