Merge lp:~vanvugt/totem/fix-1713386 into lp:~ubuntu-desktop/totem/ubuntu

[Daniel van Vugt]

Fix assertion failure in gst_tag_list_is_equal (LP: #1713386)

[Sebastien Bacher (seb128)]

thanks

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2017-08-21 22:37:18 +0000
+++ debian/changelog	2017-08-28 03:38:00 +0000
@@ -1,3 +1,10 @@
+totem (3.25.90.1-0ubuntu3) UNRELEASED; urgency=medium
+
+  * debian/patches/fix-bvw_update_tags-performance.patch: Update the patch
+    to avoid passing NULL pointers around (LP: #1713386)
+
+ -- Daniel van Vugt <[e-mail]>  Mon, 28 Aug 2017 11:33:42 +0800
+
 totem (3.25.90.1-0ubuntu2) artful; urgency=medium
 
   * debian/patches/fix-bvw_update_tags-performance.patch: 

=== modified file 'debian/patches/fix-bvw_update_tags-performance.patch'
--- debian/patches/fix-bvw_update_tags-performance.patch	2017-08-21 08:07:35 +0000
+++ debian/patches/fix-bvw_update_tags-performance.patch	2017-08-28 03:38:00 +0000
@@ -12,13 +12,13 @@
 Author: Daniel van Vugt <[e-mail]>
 Bug-Ubuntu: https://bugs.launchpad.net/bugs/1698282
 Forwarded: yes
-Last-Update: 2017-08-21
+Last-Update: 2017-08-28
 
 diff --git a/src/backend/bacon-video-widget.c b/src/backend/bacon-video-widget.c
-index a8a5dbae..5808bd92 100644
+index a8a5dbae..14de561d 100644
 --- a/src/backend/bacon-video-widget.c
 +++ b/src/backend/bacon-video-widget.c
-@@ -2063,12 +2063,15 @@ bvw_update_tags (BaconVideoWidget * bvw, GstTagList *tag_list, const gchar *type
+@@ -2063,15 +2063,19 @@ bvw_update_tags (BaconVideoWidget * bvw, GstTagList *tag_list, const gchar *type
    GstTagList **cache = NULL;
    GstTagList *result;
  
@@ -28,14 +28,19 @@
     * in the middle of a stream, e.g. with radio streams) */
    result = gst_tag_list_merge (bvw->priv->tagcache, tag_list,
                                     GST_TAG_MERGE_REPLACE);
-+  if (gst_tag_list_is_equal (result, bvw->priv->tagcache)) {
-+    gst_tag_list_unref (result);
-+    return;
+-  if (bvw->priv->tagcache)
++  if (bvw->priv->tagcache) {
++    if (result && gst_tag_list_is_equal (result, bvw->priv->tagcache)) {
++      gst_tag_list_unref (result);
++      return;
++    }
+     gst_tag_list_unref (bvw->priv->tagcache);
 +  }
+   bvw->priv->tagcache = result;
 +  GST_DEBUG ("Tags: %" GST_PTR_FORMAT, tag_list);
-   if (bvw->priv->tagcache)
-     gst_tag_list_unref (bvw->priv->tagcache);
-   bvw->priv->tagcache = result;
+ 
+   /* media-type-specific tags */
+   if (!strcmp (type, "video")) {
 -- 
-2.11.0
+2.14.1