OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
aa16bba
)
jpeg2000: Do not crash on NULL node in tag_tree_decode
author
Michael Niedermayer
<michaelni@gmx.at>
Mon, 1 Jul 2013 08:01:30 +0000
(10:01 +0200)
committer
Luca Barbato
<lu_zero@gentoo.org>
Tue, 2 Jul 2013 18:05:47 +0000
(20:05 +0200)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
libavcodec/jpeg2000dec.c
patch
|
blob
|
history
diff --git
a/libavcodec/jpeg2000dec.c
b/libavcodec/jpeg2000dec.c
index
ac44a29
..
172314f
100644
(file)
--- a/
libavcodec/jpeg2000dec.c
+++ b/
libavcodec/jpeg2000dec.c
@@
-119,6
+119,9
@@
static int tag_tree_decode(Jpeg2000DecoderContext *s, Jpeg2000TgtNode *node,
Jpeg2000TgtNode *stack[30];
int sp = -1, curval = 0;
+ if (!node)
+ return AVERROR_INVALIDDATA;
+
while (node && !node->vis) {
stack[++sp] = node;
node = node->parent;