RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

jpeg2000: fix null pointer dereference in case of malloc failure 

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-08-23 17:50:12 +02:00
parent 09927f3eaa
commit 9e477a3770
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/jpeg2000.c
View File

@ -507,6 +507,7 @@ void ff_jpeg2000_cleanup(Jpeg2000Component *comp, Jpeg2000CodingStyle *codsty)
Jpeg2000ResLevel *reslevel = comp->reslevel + reslevelno; Jpeg2000ResLevel *reslevel = comp->reslevel + reslevelno;
for (bandno = 0; bandno < reslevel->nbands; bandno++) { for (bandno = 0; bandno < reslevel->nbands; bandno++) {
if (reslevel->band) {
Jpeg2000Band *band = reslevel->band + bandno; Jpeg2000Band *band = reslevel->band + bandno;
for (precno = 0; precno < reslevel->num_precincts_x * reslevel->num_precincts_y; precno++) { for (precno = 0; precno < reslevel->num_precincts_x * reslevel->num_precincts_y; precno++) {
if (band->prec) { if (band->prec) {
@ -519,6 +520,7 @@ void ff_jpeg2000_cleanup(Jpeg2000Component *comp, Jpeg2000CodingStyle *codsty)
av_freep(&band->prec); av_freep(&band->prec);
} }
}
av_freep(&reslevel->band); av_freep(&reslevel->band);
} }