~ubuntu-branches/ubuntu/oneiric/libgnome-keyring/oneiric-201109181305

18 by Sebastien Bacher
* debian/patches/git-clean-assertion.patch:
1
From 84103a1d29e66ede966874e4af4b17706605cd48 Mon Sep 17 00:00:00 2001
2
From: Stef Walter <stefw@collabora.co.uk>
3
Date: Thu, 10 Mar 2011 16:12:23 +0000
4
Subject: This assertion is vulnerable to corner conditions.
5
6
In particular if the operation completes one pending call, unrefs it
7
and creates another pending call, and the memory allocator decides
8
to allocate that same memory for the next pending call, then this
9
will assert in a bogus way.
10
11
https://bugzilla.redhat.com/show_bug.cgi?id=660407
12
---
13
diff --git a/library/gkr-operation.c b/library/gkr-operation.c
14
index 7600cd7..0fbba4d 100644
15
--- a/library/gkr-operation.c
16
+++ b/library/gkr-operation.c
17
@@ -404,7 +404,6 @@ gkr_operation_block_and_unref (GkrOperation *op)
18
 			if (op->pending == pending) {
19
 				g_return_val_if_fail (dbus_pending_call_get_completed (pending), BROKEN);
20
 				on_pending_call_notify (pending, op);
21
-				g_assert (op->pending != pending);
22
 			}
23
 		} else if (op->prompting) {
24
 			dbus_connection_flush (op->conn);