Commit 63c0e907 authored by Michael Niedermayer's avatar Michael Niedermayer

avcodec/jpeg2000dec: fix near null pointer dereference

Fixes Ticket2840
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent c666c59a
...@@ -1343,6 +1343,7 @@ static void jpeg2000_dec_cleanup(Jpeg2000DecoderContext *s) ...@@ -1343,6 +1343,7 @@ static void jpeg2000_dec_cleanup(Jpeg2000DecoderContext *s)
{ {
int tileno, compno; int tileno, compno;
for (tileno = 0; tileno < s->numXtiles * s->numYtiles; tileno++) { for (tileno = 0; tileno < s->numXtiles * s->numYtiles; tileno++) {
if (s->tile[tileno].comp) {
for (compno = 0; compno < s->ncomponents; compno++) { for (compno = 0; compno < s->ncomponents; compno++) {
Jpeg2000Component *comp = s->tile[tileno].comp + compno; Jpeg2000Component *comp = s->tile[tileno].comp + compno;
Jpeg2000CodingStyle *codsty = s->tile[tileno].codsty + compno; Jpeg2000CodingStyle *codsty = s->tile[tileno].codsty + compno;
...@@ -1351,6 +1352,7 @@ static void jpeg2000_dec_cleanup(Jpeg2000DecoderContext *s) ...@@ -1351,6 +1352,7 @@ static void jpeg2000_dec_cleanup(Jpeg2000DecoderContext *s)
} }
av_freep(&s->tile[tileno].comp); av_freep(&s->tile[tileno].comp);
} }
}
av_freep(&s->tile); av_freep(&s->tile);
s->numXtiles = s->numYtiles = 0; s->numXtiles = s->numYtiles = 0;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment