mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-03-28 03:45:39 +00:00
Code Issues 1 Projects Releases Wiki Activity

validate: Fix overflow seek position comparision

Browse source 
MAX(0, ((gint64) priv->segment_start - priv->seek_pos_tol) will be a high
positive number thanks to being interpreted as unsigned values if
segment_start < seek_pos_tol. Fix this by explicitly checking for this case
and only doing the subtraction otherwise.

This fixes the problem from fdccffbb2e
completely now.

https://bugzilla.gnome.org/show_bug.cgi?id=763602
This commit is contained in:
Sebastian Dröge 2016-03-14 12:55:57 +02:00
parent c2a35eef15
commit 3f0a13d52a
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
validate/gst/validate/gst-validate-scenario.c
View file

@ -1046,8 +1046,8 @@ _check_position (GstValidateScenario * scenario, GstValidateAction * act,
GST_TIME_ARGS (*position));
/* Check if playback is within seek segment */
start_with_tolerance =
MAX (0, (gint64) (priv->segment_start - priv->seek_pos_tol));
start_with_tolerance = (priv->segment_start <
priv->seek_pos_tol) ? 0 : priv->segment_start - priv->seek_pos_tol;
stop_with_tolerance =
GST_CLOCK_TIME_IS_VALID (priv->segment_stop) ? priv->segment_stop +
priv->seek_pos_tol : -1;
@ -1071,11 +1071,13 @@ _check_position (GstValidateScenario * scenario, GstValidateAction * act,
if (priv->seeked_in_pause && priv->seek_flags & GST_SEEK_FLAG_ACCURATE) {
if ((rate > 0 && (*position >= priv->segment_start + priv->seek_pos_tol ||
*position < MAX (0,
((gint64) priv->segment_start - priv->seek_pos_tol))))
*position < (priv->segment_start <
priv->seek_pos_tol) ? 0 : priv->segment_start -
priv->seek_pos_tol))
|| (rate < 0 && (*position > priv->segment_start + priv->seek_pos_tol
|| *position < MAX (0,
(gint64) priv->segment_start - priv->seek_pos_tol)))) {
|| *position < (priv->segment_start <
priv->seek_pos_tol) ? 0 : priv->segment_start -
priv->seek_pos_tol))) {
priv->seeked_in_pause = FALSE;
GST_VALIDATE_REPORT (scenario, EVENT_SEEK_RESULT_POSITION_WRONG,
"Reported position after accurate seek in PAUSED state should be exactly"