Commit 59fffefd authored by John Adlum's avatar John Adlum Committed by Michael Niedermayer

avformat/asfdec_f: Use dynamic allocation in asf_read_metadata() instead of a fixed size buffer

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent c8eca438
...@@ -686,24 +686,29 @@ static int asf_read_metadata(AVFormatContext *s, int64_t size) ...@@ -686,24 +686,29 @@ static int asf_read_metadata(AVFormatContext *s, int64_t size)
{ {
AVIOContext *pb = s->pb; AVIOContext *pb = s->pb;
ASFContext *asf = s->priv_data; ASFContext *asf = s->priv_data;
int n, stream_num, name_len, value_len; int n, stream_num, name_len_utf16, name_len_utf8, value_len;
int ret, i; int ret, i;
n = avio_rl16(pb); n = avio_rl16(pb);
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
char name[1024]; uint8_t *name;
int value_type; int value_type;
avio_rl16(pb); // lang_list_index avio_rl16(pb); // lang_list_index
stream_num = avio_rl16(pb); stream_num = avio_rl16(pb);
name_len = avio_rl16(pb); name_len_utf16 = avio_rl16(pb);
value_type = avio_rl16(pb); /* value_type */ value_type = avio_rl16(pb); /* value_type */
value_len = avio_rl32(pb); value_len = avio_rl32(pb);
if ((ret = avio_get_str16le(pb, name_len, name, sizeof(name))) < name_len) name_len_utf8 = 2*name_len_utf16 + 1;
avio_skip(pb, name_len - ret); name = av_malloc(name_len_utf8);
if (!name)
return AVERROR(ENOMEM);
if ((ret = avio_get_str16le(pb, name_len_utf16, name, name_len_utf8)) < name_len_utf16)
avio_skip(pb, name_len_utf16 - ret);
av_log(s, AV_LOG_TRACE, "%d stream %d name_len %2d type %d len %4d <%s>\n", av_log(s, AV_LOG_TRACE, "%d stream %d name_len %2d type %d len %4d <%s>\n",
i, stream_num, name_len, value_type, value_len, name); i, stream_num, name_len_utf16, value_type, value_len, name);
if (!strcmp(name, "AspectRatioX")){ if (!strcmp(name, "AspectRatioX")){
int aspect_x = get_value(s->pb, value_type, 16); int aspect_x = get_value(s->pb, value_type, 16);
......
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