[FFmpeg-cvslog] r19897 - trunk/libavformat/dxa.c

[reimar]

Author: reimar
Date: Thu Sep 17 20:08:07 2009
New Revision: 19897

Log:
Improve dxa probe by checking the values for width and height are reasonable.

Modified:
   trunk/libavformat/dxa.c

Modified: trunk/libavformat/dxa.c
==============================================================================
--- trunk/libavformat/dxa.c	Thu Sep 17 20:07:27 2009	(r19896)
+++ trunk/libavformat/dxa.c	Thu Sep 17 20:08:07 2009	(r19897)
@@ -36,9 +36,15 @@ typedef struct{
 
 static int dxa_probe(AVProbeData *p)
 {
+    int w, h;
+    if (p->buf_size < 15)
+        return 0;
+    w = AV_RB16(p->buf + 11);
+    h = AV_RB16(p->buf + 13);
     /* check file header */
     if (p->buf[0] == 'D' && p->buf[1] == 'E' &&
-        p->buf[2] == 'X' && p->buf[3] == 'A')
+        p->buf[2] == 'X' && p->buf[3] == 'A' &&
+        w && w <= 2048 && h && h <= 2048)
         return AVPROBE_SCORE_MAX;
     else
         return 0;