summaryrefslogtreecommitdiff
path: root/libavformat/flvdec.c
diff options
context:
space:
mode:
authorJustin Ruggles <justin.ruggles@gmail.com>2011-04-03 15:18:36 -0400
committerMichael Niedermayer <michaelni@gmx.at>2011-04-04 00:35:58 +0200
commitdeff8a6d3a7020fdda7fdb3f80d0003b5f44279b (patch)
tree8dec573adf521596a0200dbf85aa76e4a0b10063 /libavformat/flvdec.c
parent100a6b7c77fb4fa5b3a91e9206b9b3e7a7d01238 (diff)
flvdec: fix segfault in amf_parse_object() due to NULL key
fixes Issue 2674 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/flvdec.c')
-rw-r--r--libavformat/flvdec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c
index cbc44618f3..ccaee9247a 100644
--- a/libavformat/flvdec.c
+++ b/libavformat/flvdec.c
@@ -202,7 +202,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;