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:
a6cac64
)
tag_tree_decode: check node being non null
author
Michael Niedermayer
<michaelni@gmx.at>
Sun, 14 Oct 2012 20:00:04 +0000
(22:00 +0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Sun, 14 Oct 2012 20:16:31 +0000
(22:16 +0200)
Fixes CID717843
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/j2kdec.c
patch
|
blob
|
history
diff --git
a/libavcodec/j2kdec.c
b/libavcodec/j2kdec.c
index
b2624f9
..
c712eb3
100644
(file)
--- 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;