[FFmpeg-cvslog] avutil/opt: check flags validity in write_number()

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Oct 28 17:39:07 2013 +0100| [162126bb174c9ad690736d16c6f8b431b7127c5b] | committer: Michael Niedermayer

avutil/opt: check flags validity in write_number()

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavutil/opt.c |    9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/libavutil/opt.c b/libavutil/opt.c
index 2bf5346..e00bd74 100644
--- a/libavutil/opt.c
+++ b/libavutil/opt.c
@@ -99,6 +99,15 @@ static int write_number(void *obj, const AVOption *o, void *dst, double num, int
                num*intnum/den, o->name, o->min, o->max);
         return AVERROR(ERANGE);
     }
+    if (o->type == AV_OPT_TYPE_FLAGS) {
+        double d = num*intnum/den;
+        if (d < -1.5 || d > 0xFFFFFFFF+0.5 || (lrint(d*256) & 255)) {
+            av_log(obj, AV_LOG_ERROR,
+                   "Value %f for parameter '%s' is not a valid set of 32bit integer flags\n",
+                   num*intnum/den, o->name);
+            return AVERROR(ERANGE);
+        }
+    }
 
     switch (o->type) {
     case AV_OPT_TYPE_FLAGS: