Mercurial > libavcodec.hg
comparison flacdec.c @ 9131:dfa6b3358c61 libavcodec
flacdec: Handle 32 bps data when checking allocated size.
| author | jbr |
|---|---|
| date | Wed, 04 Mar 2009 23:16:30 +0000 |
| parents | 721e21aca252 |
| children | 37bb2785a35b |
comparison
equal
deleted
inserted
replaced
| 9130:721e21aca252 | 9131:dfa6b3358c61 |
|---|---|
| 543 av_log(s->avctx, AV_LOG_ERROR, "blocksize %d > %d\n", blocksize, | 543 av_log(s->avctx, AV_LOG_ERROR, "blocksize %d > %d\n", blocksize, |
| 544 s->max_blocksize); | 544 s->max_blocksize); |
| 545 return -1; | 545 return -1; |
| 546 } | 546 } |
| 547 | 547 |
| 548 if (blocksize * s->channels * sizeof(int16_t) > alloc_data_size) | 548 if (blocksize * s->channels * (s->is32 ? 4 : 2) > alloc_data_size) |
| 549 return -1; | 549 return -1; |
| 550 | 550 |
| 551 if (sample_rate_code == 0) | 551 if (sample_rate_code == 0) |
| 552 samplerate= s->samplerate; | 552 samplerate= s->samplerate; |
| 553 else if (sample_rate_code < 12) | 553 else if (sample_rate_code < 12) |