RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-03-11 06:58:18 +00:00
Code Issues Projects Releases Wiki Activity

lavu/opt: apply range checks also when setting format string value

Browse Source 
Previously when setting a pixel/sample format as a string range checks
were not performed. This is consistent with the
av_opt_set_pixel/sample_fmt() interface.
This commit is contained in:
Stefano Sabatini 2013-12-16 15:02:56 +01:00
parent 1575a96b3a
commit 55f046be11
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavutil/opt.c
View File

@ -298,7 +298,7 @@ static int set_string_color(void *obj, const AVOption *o, const char *val, uint8
static int set_string_fmt(void *obj, const AVOption *o, const char *val, uint8_t *dst,
int fmt_nb, int ((*get_fmt)(const char *)), const char *desc)
{
int fmt;
int fmt, min, max;
if (!val || !strcmp(val, "none")) {
fmt = -1;
@ -315,6 +315,16 @@ static int set_string_fmt(void *obj, const AVOption *o, const char *val, uint8_t
}
}
min = FFMAX(o->min, -1);
max = FFMIN(o->max, fmt_nb-1);
if (fmt < min || fmt > max) {
av_log(obj, AV_LOG_ERROR,
"Value %d for parameter '%s' out of %s format range [%d - %d]\n",
fmt, o->name, desc, min, max);
return AVERROR(ERANGE);
}
*(int *)dst = fmt;
return 0;
}