From cf786a9399d6f9d723000d35d3e1ad2a52a09295 Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Sat, 5 Sep 2015 01:50:41 +0530 Subject: compositor: Ensure all arguments to CLAMP are signed int If any of the arguments to CLAMP are unsigned integers, the comparison causes an automatic conversion of the signed int to unsigned, which causes -1 to become UINT_MAX and get clamped to the high value of the CLAMP instead of 0. See 716 at http://c0x.coding-guidelines.com/6.3.1.8.html Also add a test for this. https://bugzilla.gnome.org/show_bug.cgi?id=754576 --- gst/compositor/compositor.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gst/compositor') diff --git a/gst/compositor/compositor.c b/gst/compositor/compositor.c index 64d05ac18..d015d85e1 100644 --- a/gst/compositor/compositor.c +++ b/gst/compositor/compositor.c @@ -351,8 +351,8 @@ is_rectangle_contained (GstVideoRectangle rect1, GstVideoRectangle rect2) } static GstVideoRectangle -clamp_rectangle (gint x, gint y, gint w, gint h, guint outer_width, - guint outer_height) +clamp_rectangle (gint x, gint y, gint w, gint h, gint outer_width, + gint outer_height) { gint x2 = x + w; gint y2 = y + h; -- cgit v1.2.1