mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-09-20 05:16:38 +00:00
avformat/mov: Check earlier whether reel_name string is empty
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
parent
c3cd6b765b
commit
ddd6274944
@ -2342,18 +2342,15 @@ FF_ENABLE_DEPRECATION_WARNINGS
|
||||
uint32_t format = AV_RB32(st->codecpar->extradata + 22);
|
||||
if (format == AV_RB32("name") && (int64_t)size >= (int64_t)len + 18) {
|
||||
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);
|
||||
if (!reel_name)
|
||||
return AVERROR(ENOMEM);
|
||||
memcpy(reel_name, st->codecpar->extradata + 30, str_size);
|
||||
reel_name[str_size] = 0; /* Add null terminator */
|
||||
/* don't add reel_name if emtpy string */
|
||||
if (*reel_name == 0) {
|
||||
av_free(reel_name);
|
||||
} else {
|
||||
av_dict_set(&st->metadata, "reel_name", reel_name, AV_DICT_DONT_STRDUP_VAL);
|
||||
}
|
||||
av_dict_set(&st->metadata, "reel_name", reel_name,
|
||||
AV_DICT_DONT_STRDUP_VAL);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user