[FFmpeg-cvslog] lavu/opt: apply range checks also when setting format string value

[Stefano Sabatini]

ffmpeg | branch: master | Stefano Sabatini <stefasab at gmail.com> | Mon Dec 16 15:02:56 2013 +0100| [55f046be1193142536198957d1701d18881d3b7a] | committer: Stefano Sabatini

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

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.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=55f046be1193142536198957d1701d18881d3b7a
---

 libavutil/opt.c |   12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/libavutil/opt.c b/libavutil/opt.c
index b625756..0eaa8b5 100644
--- a/libavutil/opt.c
+++ b/libavutil/opt.c
@@ -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;
 }