From: Paul B Mahol <onemda@gmail.com>
Date: Thu, 15 Dec 2016 14:52:48 +0000 (+0100)
Subject: avfilter/vsrc_testsrc: draw_bar: make sure width is not negative
X-Git-Tag: android-x86-7.1-r1~2710
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=745f4bcc2c1deaa562cce01fa52e38b0220aed31;p=android-x86%2Fexternal-ffmpeg.git

avfilter/vsrc_testsrc: draw_bar: make sure width is not negative

Reported-by: Josh de Kock
Signed-off-by: Paul B Mahol <onemda@gmail.com>
---

diff --git a/libavfilter/vsrc_testsrc.c b/libavfilter/vsrc_testsrc.c
index 08f6e07e50..422f6d8c54 100644
--- a/libavfilter/vsrc_testsrc.c
+++ b/libavfilter/vsrc_testsrc.c
@@ -1309,8 +1309,8 @@ static void draw_bar(TestSourceContext *test, const uint8_t color[4],
 
     x = FFMIN(x, test->w - 1);
     y = FFMIN(y, test->h - 1);
-    w = FFMIN(w, test->w - x);
-    h = FFMIN(h, test->h - y);
+    w = FFMAX(FFMIN(w, test->w - x), 0);
+    h = FFMAX(FFMIN(h, test->h - y), 0);
 
     av_assert0(x + w <= test->w);
     av_assert0(y + h <= test->h);