Merged revisions 18436 via svnmerge from
authorTilghman Lesher <tilghman@meg.abyt.es>
Fri, 7 Apr 2006 22:11:12 +0000 (22:11 +0000)
committerTilghman Lesher <tilghman@meg.abyt.es>
Fri, 7 Apr 2006 22:11:12 +0000 (22:11 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r18436 | tilghman | 2006-04-07 17:07:38 -0500 (Fri, 07 Apr 2006) | 2 lines

Bug 6913 - fix for possible buffer overflow

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@18437 65c4cc65-6c06-0410-ace0-fbb531ad65f3

formats/format_jpeg.c

index d71aeec..96fed0d 100644 (file)
@@ -55,7 +55,7 @@ static struct ast_frame *jpeg_read_image(int fd, int len)
        struct ast_frame fr;
        int res;
        char buf[65536];
-       if (len > sizeof(buf)) {
+       if (len > sizeof(buf) || len < 0) {
                ast_log(LOG_WARNING, "JPEG image too large to read\n");
                return NULL;
        }