projects
/
platform
/
upstream
/
libav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
906fd03
)
flvdec: fix segfault in amf_parse_object() due to NULL key
author
Justin Ruggles
<justin.ruggles@gmail.com>
Sun, 3 Apr 2011 19:15:36 +0000
(15:15 -0400)
committer
Justin Ruggles
<justin.ruggles@gmail.com>
Mon, 4 Apr 2011 00:29:04 +0000
(20:29 -0400)
fixes Issue 2674
libavformat/flvdec.c
patch
|
blob
|
history
diff --git
a/libavformat/flvdec.c
b/libavformat/flvdec.c
index
ef26b05
..
f27b70c
100644
(file)
--- a/
libavformat/flvdec.c
+++ b/
libavformat/flvdec.c
@@
-211,7
+211,7
@@
static int amf_parse_object(AVFormatContext *s, AVStream *astream, AVStream *vst
case AMF_DATA_TYPE_OBJECT: {
unsigned int keylen;
- if (!strcmp(KEYFRAMES_TAG, key) && depth == 1)
+ if (
key &&
!strcmp(KEYFRAMES_TAG, key) && depth == 1)
if (parse_keyframes_index(s, ioc, vstream, max_pos) < 0)
return -1;