aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorJustin Ruggles <justin.ruggles@gmail.com>2011-04-03 15:15:36 -0400
committerJustin Ruggles <justin.ruggles@gmail.com>2011-04-03 20:29:04 -0400
commite3c007bb43d991836e2ebf941d14a04903ece654 (patch)
tree2a7cefadeaf30a001b589be71ac1c482c3aff94b /libavformat
parent906fd03070c7dc39b4c937befa2c3559bccf7ba7 (diff)
downloadffmpeg-e3c007bb43d991836e2ebf941d14a04903ece654.tar.gz
flvdec: fix segfault in amf_parse_object() due to NULL key
fixes Issue 2674
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/flvdec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c
index ef26b05b3b..f27b70c0c6 100644
--- 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;