From: Nicolas Dufresne <nicolas.dufresne@collabora.com>
Date: Mon, 8 Jun 2020 21:41:13 +0000 (-0400)
Subject: rtptimerqueue: Fix leak on timer collision
X-Git-Tag: 1.19.3~509^2~566
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5b2ad3158363bc7ebcfac8601dbd13cc01c4ed88;p=platform%2Fupstream%2Fgstreamer.git

rtptimerqueue: Fix leak on timer collision

While the caller should make sure this does not happen, make sure timer
collision are not silently ignored and leaked.

Fixes #726

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/merge_requests/616>
---

diff --git a/gst/rtpmanager/rtptimerqueue.c b/gst/rtpmanager/rtptimerqueue.c
index 9e540df..446a70e 100644
--- a/gst/rtpmanager/rtptimerqueue.c
+++ b/gst/rtpmanager/rtptimerqueue.c
@@ -391,22 +391,25 @@ rtp_timer_queue_new (void)
 /**
  * rtp_timer_queue_insert:
  * @queue: the #RtpTimerQueue object
- * @timer: the #RtpTimer to insert
+ * @timer: (transfer full): the #RtpTimer to insert
  *
  * Insert a timer into the queue. Earliest timer are at the head and then
  * timer are sorted by seqnum (smaller seqnum first). This function is o(n)
  * but it is expected that most timers added are schedule later, in which case
  * the insertion will be faster.
  *
- * Returns: %FLASE is a timer with the same seqnum already existed
+ * Returns: %FALSE if a timer with the same seqnum already existed
  */
 gboolean
 rtp_timer_queue_insert (RtpTimerQueue * queue, RtpTimer * timer)
 {
   g_return_val_if_fail (timer->queued == FALSE, FALSE);
 
-  if (rtp_timer_queue_find (queue, timer->seqnum))
+  if (rtp_timer_queue_find (queue, timer->seqnum)) {
+    rtp_timer_free (timer);
+    GST_WARNING ("Timer queue collision, freeing duplicate.");
     return FALSE;
+  }
 
   if (timer->timeout == -1)
     rtp_timer_queue_insert_head (queue, timer);