[FFmpeg-cvslog] tag_tree_decode: check node being non null
Michael Niedermayer
git at videolan.org
Sun Oct 14 22:20:37 CEST 2012
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Oct 14 22:00:04 2012 +0200| [0de0ae5a20cf5c78a444449c531683b226810f5c] | committer: Michael Niedermayer
tag_tree_decode: check node being non null
Fixes CID717843
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0de0ae5a20cf5c78a444449c531683b226810f5c
---
libavcodec/j2kdec.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/libavcodec/j2kdec.c b/libavcodec/j2kdec.c
index b2624f9..c712eb3 100644
--- a/libavcodec/j2kdec.c
+++ b/libavcodec/j2kdec.c
@@ -167,6 +167,9 @@ static int tag_tree_decode(J2kDecoderContext *s, J2kTgtNode *node, int threshold
J2kTgtNode *stack[30];
int sp = -1, curval = 0;
+ if(!node)
+ return AVERROR(EINVAL);
+
while(node && !node->vis){
stack[++sp] = node;
node = node->parent;
More information about the ffmpeg-cvslog
mailing list