summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2009-04-09 18:37:26 +0000
committerMichael Niedermayer <michaelni@gmx.at>2009-04-09 18:37:26 +0000
commitbc4350a333f6eafab046922fd5e42ab8759a4a04 (patch)
tree2b1763c4b0eacc741ee36c7ccad5f9b5ae45b839
parent45d1d9794db2836dd34d494d358b9d9ac77b9b0a (diff)
Check spatial_decomposition_count too, fixes another crash.
Originally committed as revision 18392 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/snow.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/snow.c b/libavcodec/snow.c
index 44cfd44983..a6718f8d39 100644
--- a/libavcodec/snow.c
+++ b/libavcodec/snow.c
@@ -3581,7 +3581,7 @@ static int decode_header(SnowContext *s){
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_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->chroma_h_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){
memcpy(s->plane[2].hcoeff, s->plane[1].hcoeff, sizeof(s->plane[1].hcoeff));
}
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);
}
}