mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-19 22:05:58 +00:00
Code Issues 1 Projects Releases Wiki Activity

gstvalue: Prevent division or modulo by zero

Browse source 
The step can end up being zero if the underlying value isn't a valid
range GValue.

In those cases, return FALSE.

We don't use g_return*_if_fail since it will already have been triggered
by the above-mentionned _get_step() functions.

Spotted by Coverity.
This commit is contained in:
Edward Hervey 2014-04-05 11:37:53 +02:00
parent e3388c22c2
commit 470f194909
1 changed files with 20 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
gst/gstvalue.c
View file

@ -3793,6 +3793,9 @@ gst_value_subtract_int_int_range (GValue * dest, const GValue * minuend,
gint step = gst_value_get_int_range_step (subtrahend); gint step = gst_value_get_int_range_step (subtrahend);
gint val = g_value_get_int (minuend); gint val = g_value_get_int (minuend);
if (step == 0)
return FALSE;
/* subtracting a range from an int only works if the int is not in the /* subtracting a range from an int only works if the int is not in the
* range */ * range */
if (val < min || val > max || val % step) { if (val < min || val > max || val % step) {
@ -3870,6 +3873,9 @@ gst_value_subtract_int_range_int (GValue * dest, const GValue * minuend,
g_return_val_if_fail (min < max, FALSE); g_return_val_if_fail (min < max, FALSE);
if (step == 0)
return FALSE;
/* value is outside of the range, return range unchanged */ /* value is outside of the range, return range unchanged */
if (val < min || val > max || val % step) { if (val < min || val > max || val % step) {
if (dest) if (dest)
@ -3911,6 +3917,9 @@ gst_value_subtract_int_range_int_range (GValue * dest, const GValue * minuend,
} }
step = step1; step = step1;
if (step == 0)
return FALSE;
if (max2 >= max1 && min2 <= min1) { if (max2 >= max1 && min2 <= min1) {
return FALSE; return FALSE;
} else if (max2 >= max1) { } else if (max2 >= max1) {
@ -3934,6 +3943,8 @@ gst_value_subtract_int64_int64_range (GValue * dest, const GValue * minuend,
gint64 step = gst_value_get_int64_range_step (subtrahend); gint64 step = gst_value_get_int64_range_step (subtrahend);
gint64 val = g_value_get_int64 (minuend); gint64 val = g_value_get_int64 (minuend);
if (step == 0)
return FALSE;
/* subtracting a range from an int64 only works if the int64 is not in the /* subtracting a range from an int64 only works if the int64 is not in the
* range */ * range */
if (val < min || val > max || val % step) { if (val < min || val > max || val % step) {
@ -4011,6 +4022,9 @@ gst_value_subtract_int64_range_int64 (GValue * dest, const GValue * minuend,
g_return_val_if_fail (min < max, FALSE); g_return_val_if_fail (min < max, FALSE);
if (step == 0)
return FALSE;
/* value is outside of the range, return range unchanged */ /* value is outside of the range, return range unchanged */
if (val < min || val > max || val % step) { if (val < min || val > max || val % step) {
if (dest) if (dest)
@ -4051,6 +4065,10 @@ gst_value_subtract_int64_range_int64_range (GValue * dest,
g_assert (FALSE); g_assert (FALSE);
return FALSE; return FALSE;
} }
if (step1 == 0)
return FALSE;
step = step1; step = step1;
if (max2 >= max1 && min2 <= min1) { if (max2 >= max1 && min2 <= min1) {
@ -4408,6 +4426,8 @@ gst_value_list_equals_range (const GValue * list, const GValue * value)
const gint rmin = gst_value_get_int_range_min (value); const gint rmin = gst_value_get_int_range_min (value);
const gint rmax = gst_value_get_int_range_max (value); const gint rmax = gst_value_get_int_range_max (value);
const gint rstep = gst_value_get_int_range_step (value); const gint rstep = gst_value_get_int_range_step (value);
if (rstep == 0)
return FALSE;
/* note: this will overflow for min 0 and max INT_MAX, but this /* note: this will overflow for min 0 and max INT_MAX, but this
would only be equal to a list of INT_MAX elements, which seems would only be equal to a list of INT_MAX elements, which seems
very unlikely */ very unlikely */