summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHendrik Leppkes <h.leppkes@gmail.com>2015-09-08 14:46:21 +0200
committerHendrik Leppkes <h.leppkes@gmail.com>2015-09-08 14:46:21 +0200
commit8998caf0a4d7e55f040c419f984be885ca0688db (patch)
treed7e26e9947c2fa7f460439aeffc74d5426886fa3
parentf4ce8cea7327a452441a5920426cb391adca61b2 (diff)
parent77cf23668991bfd1fb69339f13e1511b4186b7b3 (diff)
downloadffmpeg-streaming-8998caf0a4d7e55f040c419f984be885ca0688db.zip
ffmpeg-streaming-8998caf0a4d7e55f040c419f984be885ca0688db.tar.gz
Merge commit '77cf23668991bfd1fb69339f13e1511b4186b7b3'
* commit '77cf23668991bfd1fb69339f13e1511b4186b7b3': asfdec: alloc enough space for storing name in asf_read_metadata_obj Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
-rw-r--r--libavformat/asfdec_o.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/asfdec_o.c b/libavformat/asfdec_o.c
index fa00813..db559f6 100644
--- a/libavformat/asfdec_o.c
+++ b/libavformat/asfdec_o.c
@@ -583,7 +583,7 @@ static int asf_read_metadata_obj(AVFormatContext *s, const GUIDParseTable *g)
break;
type = avio_rl16(pb);
val_len = avio_rl32(pb);
- name = av_malloc(name_len);
+ name = av_malloc(buflen);
if (!name)
return AVERROR(ENOMEM);
avio_get_str16le(pb, name_len, name,
OpenPOWER on IntegriCloud