[FFmpeg-cvslog] j2k & jpeg2000dec: reset numX/Ytiles if tiles failed allocation

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed May 22 03:17:35 2013 +0200| [17e66c9ff4774e254932d34dade77b1c04139a4f] | committer: Michael Niedermayer

j2k & jpeg2000dec: reset numX/Ytiles if tiles failed allocation

Fixes null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=17e66c9ff4774e254932d34dade77b1c04139a4f
---

 libavcodec/j2kdec.c      |    2 ++
 libavcodec/jpeg2000dec.c |    2 ++
 2 files changed, 4 insertions(+)

diff --git a/libavcodec/j2kdec.c b/libavcodec/j2kdec.c
index 22bbb2e..a02b84b 100644
--- a/libavcodec/j2kdec.c
+++ b/libavcodec/j2kdec.c
@@ -957,6 +957,8 @@ static int decode_codestream(Jpeg2000DecoderContext *s)
         switch (marker){
         case JPEG2000_SIZ:
             ret = get_siz(s);
+            if (!s->tile)
+                s->numXtiles = s->numYtiles = 0;
             break;
         case JPEG2000_COC:
             ret = get_coc(s, codsty, properties);
diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c
index a43cc7e..0735da1 100644
--- a/libavcodec/jpeg2000dec.c
+++ b/libavcodec/jpeg2000dec.c
@@ -1181,6 +1181,8 @@ static int jpeg2000_read_main_headers(Jpeg2000DecoderContext *s)
         switch (marker) {
         case JPEG2000_SIZ:
             ret = get_siz(s);
+            if (!s->tile)
+                s->numXtiles = s->numYtiles = 0;
             break;
         case JPEG2000_COC:
             ret = get_coc(s, codsty, properties);