mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-02-08 19:07:09 +00:00
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. Originally committed as revision 11119 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
5d702d6db2
commit
892a4c2da8
@ -82,6 +82,7 @@ int ff_huff_build_tree(AVCodecContext *avctx, VLC *vlc, int nb_codes,
|
|||||||
}
|
}
|
||||||
qsort(nodes, nb_codes, sizeof(Node), cmp);
|
qsort(nodes, nb_codes, sizeof(Node), cmp);
|
||||||
cur_node = nb_codes;
|
cur_node = nb_codes;
|
||||||
|
nodes[nb_codes*2-1].count = 0;
|
||||||
for(i = 0; i < nb_codes*2-1; i += 2){
|
for(i = 0; i < nb_codes*2-1; i += 2){
|
||||||
nodes[cur_node].sym = HNODE;
|
nodes[cur_node].sym = HNODE;
|
||||||
nodes[cur_node].count = nodes[i].count + nodes[i+1].count;
|
nodes[cur_node].count = nodes[i].count + nodes[i+1].count;
|
||||||
|
Loading…
Reference in New Issue
Block a user