[evolution-data-server] addressbook: Fix cancellable handling if not in a transaction
- From: Philip Withnall <pwithnall src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-data-server] addressbook: Fix cancellable handling if not in a transaction
- Date: Wed, 21 May 2014 12:44:33 +0000 (UTC)
commit 64e1e4f322ce2d2c7a3f54605000db1f29973d98
Author: Philip Withnall <philip withnall collabora co uk>
Date: Mon May 19 14:28:11 2014 +0100
addressbook: Fix cancellable handling if not in a transaction
If not in a transaction, ebsql_exec() will set a temporary GCancellable
for the operation (transactions set their own), but would then
erroneously clear *all* cancellables after the query finished; even
those set by transactions.
Coverity issue: #1214491
https://bugzilla.gnome.org/show_bug.cgi?id=730374
addressbook/libedata-book/e-book-sqlite.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/addressbook/libedata-book/e-book-sqlite.c b/addressbook/libedata-book/e-book-sqlite.c
index 45dd66a..5d8dc0c 100644
--- a/addressbook/libedata-book/e-book-sqlite.c
+++ b/addressbook/libedata-book/e-book-sqlite.c
@@ -1103,7 +1103,7 @@ ebsql_exec (EBookSqlite *ebsql,
had_cancel = TRUE;
} else {
ebsql->priv->cancel = cancellable;
- had_cancel = TRUE;
+ had_cancel = FALSE;
}
ret = sqlite3_exec (ebsql->priv->db, stmt, callback, data, &errmsg);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]