[FFmpeg-cvslog] r17090 - trunk/libavcodec/vp3.c

[alexc]

Author: alexc
Date: Mon Feb  9 02:39:33 2009
New Revision: 17090

Log:
VP3: Do not ignore error from read_huffman_tree().

Modified:
   trunk/libavcodec/vp3.c

Modified: trunk/libavcodec/vp3.c
==============================================================================
--- trunk/libavcodec/vp3.c	Mon Feb  9 02:38:12 2009	(r17089)
+++ trunk/libavcodec/vp3.c	Mon Feb  9 02:39:33 2009	(r17090)
@@ -2014,9 +2014,11 @@ static int read_huffman_tree(AVCodecCont
         }
         s->huff_code_size++;
         s->hbits <<= 1;
-        read_huffman_tree(avctx, gb);
+        if (read_huffman_tree(avctx, gb))
+            return -1;
         s->hbits |= 1;
-        read_huffman_tree(avctx, gb);
+        if (read_huffman_tree(avctx, gb))
+            return -1;
         s->hbits >>= 1;
         s->huff_code_size--;
     }
@@ -2192,9 +2194,11 @@ static int theora_decode_tables(AVCodecC
         s->huff_code_size = 1;
         if (!get_bits1(gb)) {
             s->hbits = 0;
-            read_huffman_tree(avctx, gb);
+            if(read_huffman_tree(avctx, gb))
+                return -1;
             s->hbits = 1;
-            read_huffman_tree(avctx, gb);
+            if(read_huffman_tree(avctx, gb))
+                return -1;
         }
     }
 
@@ -2250,7 +2254,8 @@ static int theora_decode_init(AVCodecCon
 //            theora_decode_comments(avctx, gb);
             break;
         case 0x82:
-            theora_decode_tables(avctx, &gb);
+            if (theora_decode_tables(avctx, &gb))
+                return -1;
             break;
         default:
             av_log(avctx, AV_LOG_ERROR, "Unknown Theora config packet: %d\n", ptype&~0x80);