RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '24130234cd9dd733116d17b724ea4c8e12ce097a' 

* commit '24130234cd9dd733116d17b724ea4c8e12ce097a':
  rtpdec_mpeg4: validate fmtp fields

Merged with fixed log message.

Merged-by: Clément Bœsch <u@pkh.me>
This commit is contained in:
Clément Bœsch 2017-03-19 18:22:53 +01:00
parent 206a9fb29c 24130234cd
commit f4a39ceea0
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libavformat/rtpdec_mpeg4.c
View File

@ -289,11 +289,22 @@ static int parse_fmtp(AVFormatContext *s,
for (i = 0; attr_names[i].str; ++i) {
if (!av_strcasecmp(attr, attr_names[i].str)) {
if (attr_names[i].type == ATTR_NAME_TYPE_INT) {
int val = atoi(value);
if (val > 32) {
av_log(s, AV_LOG_ERROR,
"The %s field size is invalid (%d)\n",
attr, val);
return AVERROR_INVALIDDATA;
}
*(int *)((char *)data+
attr_names[i].offset) = atoi(value);
} else if (attr_names[i].type == ATTR_NAME_TYPE_STR)
attr_names[i].offset) = val;
} else if (attr_names[i].type == ATTR_NAME_TYPE_STR) {
char *val = av_strdup(value);
if (!val)
return AVERROR(ENOMEM);
*(char **)((char *)data+
attr_names[i].offset) = av_strdup(value);
attr_names[i].offset) = val;
}
}
}
}