[svn-commits] trunk r18437 - in /trunk: ./ formats/format_jpeg.c

[svn-commits at lists.digium.com]

Author: tilghman
Date: Fri Apr  7 17:11:12 2006
New Revision: 18437

URL: http://svn.digium.com/view/asterisk?rev=18437&view=rev
Log:
Merged revisions 18436 via svnmerge from 
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

........

Modified:
    trunk/   (props changed)
    trunk/formats/format_jpeg.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Modified: trunk/formats/format_jpeg.c
URL: http://svn.digium.com/view/asterisk/trunk/formats/format_jpeg.c?rev=18437&r1=18436&r2=18437&view=diff
==============================================================================
--- trunk/formats/format_jpeg.c (original)
+++ trunk/formats/format_jpeg.c Fri Apr  7 17:11:12 2006
@@ -55,7 +55,7 @@
 	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;
 	}