Merge lp:~dobey/ubuntu/oneiric/glib2.0/fix-804946 into lp:ubuntu/oneiric/glib2.0

Proposed by dobey
Status: Merged
Merge reported by: Didier Roche-Tolomelli
Merged at revision: not available
Proposed branch: lp:~dobey/ubuntu/oneiric/glib2.0/fix-804946
Merge into: lp:ubuntu/oneiric/glib2.0
Diff against target: 41 lines (+21/-0)
3 files modified
debian/changelog (+7/-0)
debian/patches/10_gvariant_check_null.patch (+13/-0)
debian/patches/series (+1/-0)
To merge this branch: bzr merge lp:~dobey/ubuntu/oneiric/glib2.0/fix-804946
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+77939@code.launchpad.net
To post a comment you must log in.
130. By dobey

debian/patches/10_gvariant_check_null.patch:

131. By dobey

Check that value is NULL before continuing (LP: #804946)

132. By dobey

Fix the patch

133. By dobey

Fix the series file for the renamed patch

Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

This one is aleady in oneiric

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 2011-09-30 21:21:42 +0000
3+++ debian/changelog 2011-10-03 15:13:22 +0000
4@@ -1,3 +1,10 @@
5+glib2.0 (2.30.0-0ubuntu4) oneiric; urgency=low
6+
7+ * debian/patches/10_gvariant_check_null.patch:
8+ - Check that value is NULL before continuing (LP: #804946)
9+
10+ -- Rodney Dawes <rodney.dawes@ubuntu.com> Mon, 03 Oct 2011 10:55:53 -0400
11+
12 glib2.0 (2.30.0-0ubuntu3) oneiric; urgency=low
13
14 * debian/libglib2.0-data.preinst:
15
16=== added file 'debian/patches/10_gvariant_check_null.patch'
17--- debian/patches/10_gvariant_check_null.patch 1970-01-01 00:00:00 +0000
18+++ debian/patches/10_gvariant_check_null.patch 2011-10-03 15:13:22 +0000
19@@ -0,0 +1,13 @@
20+=== modified file 'glib/gvariant-core.c'
21+--- old/glib/gvariant-core.c 2011-08-16 15:42:41 +0000
22++++ new/glib/gvariant-core.c 2011-10-03 14:58:16 +0000
23+@@ -614,6 +614,8 @@ g_variant_is_trusted (GVariant *value)
24+ void
25+ g_variant_unref (GVariant *value)
26+ {
27++ g_return_if_fail (value != NULL);
28++
29+ if (g_atomic_int_dec_and_test (&value->ref_count))
30+ {
31+ if G_UNLIKELY (value->state & STATE_LOCKED)
32+
33
34=== modified file 'debian/patches/series'
35--- debian/patches/series 2011-09-19 05:51:44 +0000
36+++ debian/patches/series 2011-10-03 15:13:22 +0000
37@@ -2,4 +2,5 @@
38 02_gettext-desktopfiles-ubuntu.patch
39 04_homedir_env.patch
40 gio-modules-multiarch-compat.patch
41+10_gvariant_check_null.patch
42

Subscribers

People subscribed via source and target branches

to all changes: