Commit 1a86e29f authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '6f4364ab'

* commit '6f4364ab':
  mov: Fix handling of zero-length metadata values

Conflicts:
	libavformat/mov.c
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents d2f9aefb 6f4364ab
...@@ -379,7 +379,7 @@ static int mov_read_udta_string(MOVContext *c, AVIOContext *pb, MOVAtom atom) ...@@ -379,7 +379,7 @@ static int mov_read_udta_string(MOVContext *c, AVIOContext *pb, MOVAtom atom)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
// worst-case requirement for output string in case of utf8 coded input // worst-case requirement for output string in case of utf8 coded input
str_size_alloc = raw ? str_size + 1 : str_size * 2; str_size_alloc = (raw ? str_size : str_size * 2) + 1;
str = av_malloc(str_size_alloc); str = av_malloc(str_size_alloc);
if (!str) if (!str)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment