summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJames Stembridge <jstembridge@users.sourceforge.net>2003-11-16 13:28:57 +0000
committerJames Stembridge <jstembridge@users.sourceforge.net>2003-11-16 13:28:57 +0000
commitcb386fa3919c13f41c3eaaf3757323edd907f7ef (patch)
tree17c7de4f6cb2fb4095c7f8fdd291a00bbe033d01 /src
parent3e01cae57ee78dac8d0a28b6529e83d33cf527b5 (diff)
downloadxine-lib-cb386fa3919c13f41c3eaaf3757323edd907f7ef.tar.gz
xine-lib-cb386fa3919c13f41c3eaaf3757323edd907f7ef.tar.bz2
buffer limit fix from ffmpeg
CVS patchset: 5745 CVS date: 2003/11/16 13:28:57
Diffstat (limited to 'src')
-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 48f528f88..5502083ab 100644
--- a/src/libffmpeg/libavcodec/mjpeg.c
+++ b/src/libffmpeg/libavcodec/mjpeg.c
@@ -1681,7 +1681,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 ((v == 0xff) && (v2 >= 0xc0) && (v2 <= 0xfe) && buf_ptr < buf_end) {
val = *buf_ptr++;
goto found;
}