From: Automerge script <automerge@asterisk.org>
Date: Mon, 17 Jul 2006 16:02:46 +0000 (+0000)
Subject: automerge commit
X-Git-Tag: 1.2.11-netsec~43
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=95e2fd157183390aeb2228c743a27386cb2677b7;p=thirdparty%2Fasterisk.git

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 ccba23d6d0..e57b9924ca 100644
--- 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)