Commit bc4350a3 authored by Michael Niedermayer's avatar Michael Niedermayer

Check spatial_decomposition_count too, fixes another crash.

Originally committed as revision 18392 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 45d1d979
...@@ -3581,7 +3581,7 @@ static int decode_header(SnowContext *s){ ...@@ -3581,7 +3581,7 @@ static int decode_header(SnowContext *s){
s->always_reset= get_rac(&s->c, s->header_state); s->always_reset= get_rac(&s->c, s->header_state);
s->temporal_decomposition_type= get_symbol(&s->c, s->header_state, 0); s->temporal_decomposition_type= get_symbol(&s->c, s->header_state, 0);
s->temporal_decomposition_count= get_symbol(&s->c, s->header_state, 0); s->temporal_decomposition_count= get_symbol(&s->c, s->header_state, 0);
s->spatial_decomposition_count= get_symbol(&s->c, s->header_state, 0); GET_S(s->spatial_decomposition_count, tmp <= (unsigned)MAX_DECOMPOSITIONS)
s->colorspace_type= get_symbol(&s->c, s->header_state, 0); s->colorspace_type= get_symbol(&s->c, s->header_state, 0);
s->chroma_h_shift= get_symbol(&s->c, s->header_state, 0); s->chroma_h_shift= get_symbol(&s->c, s->header_state, 0);
s->chroma_v_shift= get_symbol(&s->c, s->header_state, 0); s->chroma_v_shift= get_symbol(&s->c, s->header_state, 0);
...@@ -3614,7 +3614,7 @@ static int decode_header(SnowContext *s){ ...@@ -3614,7 +3614,7 @@ static int decode_header(SnowContext *s){
memcpy(s->plane[2].hcoeff, s->plane[1].hcoeff, sizeof(s->plane[1].hcoeff)); memcpy(s->plane[2].hcoeff, s->plane[1].hcoeff, sizeof(s->plane[1].hcoeff));
} }
if(get_rac(&s->c, s->header_state)){ if(get_rac(&s->c, s->header_state)){
s->spatial_decomposition_count= get_symbol(&s->c, s->header_state, 0); GET_S(s->spatial_decomposition_count, tmp <= (unsigned)MAX_DECOMPOSITIONS)
decode_qlogs(s); decode_qlogs(s);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment