mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-18 14:26:43 +00:00
Code Issues 1 Projects Releases Wiki Activity

compositor: Ensure all arguments to CLAMP are signed int

Browse source 
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
This commit is contained in:
Nirbheek Chauhan 2015-09-05 01:50:41 +05:30 committed by Thibault Saunier
parent 4eea087f68
commit f1f8e465f2
2 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gst/compositor/compositor.c
View file

@ -351,8 +351,8 @@ is_rectangle_contained (GstVideoRectangle rect1, GstVideoRectangle rect2)
} }
static GstVideoRectangle static GstVideoRectangle
clamp_rectangle (gint x, gint y, gint w, gint h, guint outer_width, clamp_rectangle (gint x, gint y, gint w, gint h, gint outer_width,
guint outer_height) gint outer_height)
{ {
gint x2 = x + w; gint x2 = x + w;
gint y2 = y + h; gint y2 = y + h;

11
tests/check/elements/compositor.c
View file

@ -1326,6 +1326,17 @@ GST_START_TEST (test_obscured_skipped)
out_width = out_height = 0; out_width = out_height = 0;
buffer_mapped = FALSE; buffer_mapped = FALSE;
xpos1 = -1;
xpos0 = ypos0 = width0 = height0 = width1 = height1 = 10;
out_width = out_height = 20;
GST_INFO ("testing bug 754576");
_test_obscured (caps_str, xpos0, ypos0, width0, height0, alpha0, xpos1, ypos1,
width1, height1, alpha1, out_width, out_height);
fail_unless (buffer_mapped == TRUE);
xpos0 = xpos1 = ypos1 = width0 = height0 = width1 = height1 = 0;
out_width = out_height = 0;
buffer_mapped = FALSE;
xpos0 = ypos0 = 10000; xpos0 = ypos0 = 10000;
out_width = 320; out_width = 320;
out_height = 240; out_height = 240;