automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@37783 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/formats/format_h263.c b/formats/format_h263.c
index ccba23d6d05b2df95896101bfc90e345730ea6cb..e57b9924ca867352dd82328a2f05b90a591027cc 100644 (file)
--- a/formats/format_h263.c
+++ b/formats/format_h263.c
@@ -161,6 +161,7 @@ static struct ast_frame *h263_read(struct ast_filestream *s, int *whennext)
        len &= 0x7fff;
        if (len > sizeof(s->h263)) {
                ast_log(LOG_WARNING, "Length %d is too long\n", len);
+               return NULL;
        }
        if ((res = fread(s->h263, 1, len, s->f)) != len) {
                if (res)