virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avformat/mov: Check earlier whether reel_name string is empty

Browse Source 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt
2020-06-14 20:50:29 +02:00
parent c3cd6b765b
commit ddd6274944
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libavformat/mov.c
View File

@@ -2342,18 +2342,15 @@ FF_ENABLE_DEPRECATION_WARNINGS
uint32_t format = AV_RB32(st->codecpar->extradata + 22); uint32_t format = AV_RB32(st->codecpar->extradata + 22);
if (format == AV_RB32("name") && (int64_t)size >= (int64_t)len + 18) { if (format == AV_RB32("name") && (int64_t)size >= (int64_t)len + 18) {
uint16_t str_size = AV_RB16(st->codecpar->extradata + 26); /* string length */ uint16_t str_size = AV_RB16(st->codecpar->extradata + 26); /* string length */
if (str_size > 0 && size >= (int)str_size + 30) { if (str_size > 0 && size >= (int)str_size + 30 &&
st->codecpar->extradata[30] /* Don't add empty string */) {
char *reel_name = av_malloc(str_size + 1); char *reel_name = av_malloc(str_size + 1);
if (!reel_name) if (!reel_name)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
memcpy(reel_name, st->codecpar->extradata + 30, str_size); memcpy(reel_name, st->codecpar->extradata + 30, str_size);
reel_name[str_size] = 0; /* Add null terminator */ reel_name[str_size] = 0; /* Add null terminator */
/* don't add reel_name if emtpy string */ av_dict_set(&st->metadata, "reel_name", reel_name,
if (*reel_name == 0) { AV_DICT_DONT_STRDUP_VAL);
av_free(reel_name);
} else {
av_dict_set(&st->metadata, "reel_name", reel_name, AV_DICT_DONT_STRDUP_VAL);
}
} }
} }
} }