Commit 4c08b108 authored by michael's avatar michael

Make sure spatial_decomposition_count is >0.


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@18394 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 30f2000a
...@@ -3582,7 +3582,7 @@ static int decode_header(SnowContext *s){ ...@@ -3582,7 +3582,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);
GET_S(s->spatial_decomposition_count, tmp <= (unsigned)MAX_DECOMPOSITIONS) GET_S(s->spatial_decomposition_count, 0 < tmp && tmp <= 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);
...@@ -3615,7 +3615,7 @@ static int decode_header(SnowContext *s){ ...@@ -3615,7 +3615,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)){
GET_S(s->spatial_decomposition_count, tmp <= (unsigned)MAX_DECOMPOSITIONS) GET_S(s->spatial_decomposition_count, 0 < tmp && tmp <= 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