[FFmpeg-cvslog] r11119 - trunk/libavcodec/huffman.c

reimar subversion
Sat Dec 1 10:40:00 CET 2007


Author: reimar
Date: Sat Dec  1 10:39:59 2007
New Revision: 11119

Log:
Fix nodes[nb_codes*2-1].count being uninitialized and used to initialize
nodes[nb_codes*2-2].count (thus making that invalid as well) in
ff_huff_build_tree.
Might fix some (hard to reproduce) crashes in VP6 decoder.


Modified:
   trunk/libavcodec/huffman.c

Modified: trunk/libavcodec/huffman.c
==============================================================================
--- trunk/libavcodec/huffman.c	(original)
+++ trunk/libavcodec/huffman.c	Sat Dec  1 10:39:59 2007
@@ -82,6 +82,7 @@ int ff_huff_build_tree(AVCodecContext *a
     }
     qsort(nodes, nb_codes, sizeof(Node), cmp);
     cur_node = nb_codes;
+    nodes[nb_codes*2-1].count = 0;
     for(i = 0; i < nb_codes*2-1; i += 2){
         nodes[cur_node].sym = HNODE;
         nodes[cur_node].count = nodes[i].count + nodes[i+1].count;




More information about the ffmpeg-cvslog mailing list