diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-13 15:20:40 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-13 15:20:40 +0100 |
| commit | 7a79c055e378d1a079d439c3e99fa45289d4a68e (patch) | |
| tree | 4a0a1e4544ae2388902c363a74af398f7ea41a5e /libavcodec | |
| parent | 45660c7d1b76185de97160808d81885f9dd08e23 (diff) | |
| parent | a2448cfe167a4cd4eb631318550d4eef38fca24a (diff) | |
| download | ffmpeg-7a79c055e378d1a079d439c3e99fa45289d4a68e.tar.gz | |
Merge commit 'a2448cfe167a4cd4eb631318550d4eef38fca24a'
* commit 'a2448cfe167a4cd4eb631318550d4eef38fca24a':
jpeg2000: do not compute the same value twice
Conflicts:
libavcodec/jpeg2000.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/jpeg2000.c | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/libavcodec/jpeg2000.c b/libavcodec/jpeg2000.c index ede1a791c8..644e25d399 100644 --- a/libavcodec/jpeg2000.c +++ b/libavcodec/jpeg2000.c @@ -369,16 +369,18 @@ int ff_jpeg2000_init_component(Jpeg2000Component *comp, for (j = 0; j < 2; j++) band->coord[1][j] = ff_jpeg2000_ceildiv(band->coord[1][j], dy); - band->prec = av_mallocz_array(reslevel->num_precincts_x * - (uint64_t)reslevel->num_precincts_y, - sizeof(*band->prec)); - if (!band->prec) + if (reslevel->num_precincts_x * (uint64_t)reslevel->num_precincts_y > INT_MAX) { + band->prec = NULL; return AVERROR(ENOMEM); - + } nb_precincts = reslevel->num_precincts_x * reslevel->num_precincts_y; + band->prec = av_mallocz_array(nb_precincts, sizeof(*band->prec)); + if (!band->prec) + return AVERROR(ENOMEM); for (precno = 0; precno < nb_precincts; precno++) { Jpeg2000Prec *prec = band->prec + precno; + int nb_codeblocks; /* TODO: Explain formula for JPEG200 DCINEMA. */ /* TODO: Verify with previous count of codeblocks per band */ @@ -425,12 +427,15 @@ int ff_jpeg2000_init_component(Jpeg2000Component *comp, if (!prec->zerobits) return AVERROR(ENOMEM); - prec->cblk = av_mallocz_array(prec->nb_codeblocks_width * - (uint64_t)prec->nb_codeblocks_height, - sizeof(*prec->cblk)); + if (prec->nb_codeblocks_width * (uint64_t)prec->nb_codeblocks_height > INT_MAX) { + prec->cblk = NULL; + return AVERROR(ENOMEM); + } + nb_codeblocks = prec->nb_codeblocks_width * prec->nb_codeblocks_height; + prec->cblk = av_mallocz_array(nb_codeblocks, sizeof(*prec->cblk)); if (!prec->cblk) return AVERROR(ENOMEM); - for (cblkno = 0; cblkno < prec->nb_codeblocks_width * prec->nb_codeblocks_height; cblkno++) { + for (cblkno = 0; cblkno < nb_codeblocks; cblkno++) { Jpeg2000Cblk *cblk = prec->cblk + cblkno; uint16_t Cx0, Cy0; |