automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@18478 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge script
2006-04-07 23:05:40 +00:00
parent d3a87c1f69
commit 24298e447c

View 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;
}