Mercurial > libavcodec.hg
comparison nuv.c @ 5656:3f7d66453c2e libavcodec
Fix extreme stupidity: buffer size check must of course be before buffer use!
author | reimar |
---|---|
date | Sun, 09 Sep 2007 09:00:12 +0000 |
parents | 711922c1e9e7 |
children | ec46684cc8ad |
comparison
equal
deleted
inserted
replaced
5655:711922c1e9e7 | 5656:3f7d66453c2e |
---|---|
154 av_log(avctx, AV_LOG_ERROR, "error during lzo decompression\n"); | 154 av_log(avctx, AV_LOG_ERROR, "error during lzo decompression\n"); |
155 buf = c->decomp_buf; | 155 buf = c->decomp_buf; |
156 buf_size = c->decomp_size; | 156 buf_size = c->decomp_size; |
157 } | 157 } |
158 if (c->codec_frameheader) { | 158 if (c->codec_frameheader) { |
159 get_quant_quality(c, buf[10]); | |
160 rtjpeg_decode_init(&c->rtj, &c->dsp, c->width, c->height, c->lq, c->cq); | |
161 if (buf_size < 12) { | 159 if (buf_size < 12) { |
162 av_log(avctx, AV_LOG_ERROR, "invalid nuv video frame\n"); | 160 av_log(avctx, AV_LOG_ERROR, "invalid nuv video frame\n"); |
163 return -1; | 161 return -1; |
164 } | 162 } |
163 get_quant_quality(c, buf[10]); | |
164 rtjpeg_decode_init(&c->rtj, &c->dsp, c->width, c->height, c->lq, c->cq); | |
165 buf = &buf[12]; | 165 buf = &buf[12]; |
166 buf_size -= 12; | 166 buf_size -= 12; |
167 } | 167 } |
168 | 168 |
169 c->pic.pict_type = FF_I_TYPE; | 169 c->pic.pict_type = FF_I_TYPE; |