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

Proposed by Daniel van Vugt
Status: Merged
Merged at revision: 260
Proposed branch: lp:~vanvugt/totem/fix-1713386
Merge into: lp:~ubuntu-desktop/totem/ubuntu
Diff against target: 61 lines (+22/-10)
2 files modified
debian/changelog (+7/-0)
debian/patches/fix-bvw_update_tags-performance.patch (+15/-10)
To merge this branch: bzr merge lp:~vanvugt/totem/fix-1713386
Reviewer Review Type Date Requested Status
Sebastien Bacher Approve
Ubuntu Sponsors Team Pending
Review via email: mp+329706@code.launchpad.net

Commit message

Fix assertion failure in gst_tag_list_is_equal (LP: #1713386)

To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote :

thanks

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2017-08-21 22:37:18 +0000
3+++ debian/changelog 2017-08-28 03:38:00 +0000
4@@ -1,3 +1,10 @@
5+totem (3.25.90.1-0ubuntu3) UNRELEASED; urgency=medium
6+
7+ * debian/patches/fix-bvw_update_tags-performance.patch: Update the patch
8+ to avoid passing NULL pointers around (LP: #1713386)
9+
10+ -- Daniel van Vugt <daniel.van.vugt@canonical.com> Mon, 28 Aug 2017 11:33:42 +0800
11+
12 totem (3.25.90.1-0ubuntu2) artful; urgency=medium
13
14 * debian/patches/fix-bvw_update_tags-performance.patch:
15
16=== modified file 'debian/patches/fix-bvw_update_tags-performance.patch'
17--- debian/patches/fix-bvw_update_tags-performance.patch 2017-08-21 08:07:35 +0000
18+++ debian/patches/fix-bvw_update_tags-performance.patch 2017-08-28 03:38:00 +0000
19@@ -12,13 +12,13 @@
20 Author: Daniel van Vugt <daniel.van.vugt@canonical.com>
21 Bug-Ubuntu: https://bugs.launchpad.net/bugs/1698282
22 Forwarded: yes
23-Last-Update: 2017-08-21
24+Last-Update: 2017-08-28
25
26 diff --git a/src/backend/bacon-video-widget.c b/src/backend/bacon-video-widget.c
27-index a8a5dbae..5808bd92 100644
28+index a8a5dbae..14de561d 100644
29 --- a/src/backend/bacon-video-widget.c
30 +++ b/src/backend/bacon-video-widget.c
31-@@ -2063,12 +2063,15 @@ bvw_update_tags (BaconVideoWidget * bvw, GstTagList *tag_list, const gchar *type
32+@@ -2063,15 +2063,19 @@ bvw_update_tags (BaconVideoWidget * bvw, GstTagList *tag_list, const gchar *type
33 GstTagList **cache = NULL;
34 GstTagList *result;
35
36@@ -28,14 +28,19 @@
37 * in the middle of a stream, e.g. with radio streams) */
38 result = gst_tag_list_merge (bvw->priv->tagcache, tag_list,
39 GST_TAG_MERGE_REPLACE);
40-+ if (gst_tag_list_is_equal (result, bvw->priv->tagcache)) {
41-+ gst_tag_list_unref (result);
42-+ return;
43+- if (bvw->priv->tagcache)
44++ if (bvw->priv->tagcache) {
45++ if (result && gst_tag_list_is_equal (result, bvw->priv->tagcache)) {
46++ gst_tag_list_unref (result);
47++ return;
48++ }
49+ gst_tag_list_unref (bvw->priv->tagcache);
50 + }
51+ bvw->priv->tagcache = result;
52 + GST_DEBUG ("Tags: %" GST_PTR_FORMAT, tag_list);
53- if (bvw->priv->tagcache)
54- gst_tag_list_unref (bvw->priv->tagcache);
55- bvw->priv->tagcache = result;
56+
57+ /* media-type-specific tags */
58+ if (!strcmp (type, "video")) {
59 --
60-2.11.0
61+2.14.1
62

Subscribers

People subscribed via source and target branches