r1601 - in /experimental/evolution-data-server/debian: changelog patches/01_unitialized_key.patch

[joss at users.alioth.debian.org]

Author: joss
Date: Thu Apr 29 10:15:25 2010
New Revision: 1601

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=1601
Log:
01_unitialized_key.patch: stolen upsteam. Fix a crasher.

Added:
    experimental/evolution-data-server/debian/patches/01_unitialized_key.patch
Modified:
    experimental/evolution-data-server/debian/changelog

Modified: experimental/evolution-data-server/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution-data-server/debian/changelog?rev=1601&op=diff
==============================================================================
--- experimental/evolution-data-server/debian/changelog (original)
+++ experimental/evolution-data-server/debian/changelog Thu Apr 29 10:15:25 2010
@@ -1,3 +1,9 @@
+evolution-data-server (2.30.1-2) UNRELEASED; urgency=low
+
+  * 01_unitialized_key.patch: stolen upsteam. Fix a crasher.
+
+ -- Josselin Mouette <joss at debian.org>  Thu, 29 Apr 2010 12:06:23 +0200
+
 evolution-data-server (2.30.1-1) experimental; urgency=low
 
   * New upstream bugfix release.

Added: experimental/evolution-data-server/debian/patches/01_unitialized_key.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution-data-server/debian/patches/01_unitialized_key.patch?rev=1601&op=file
==============================================================================
--- experimental/evolution-data-server/debian/patches/01_unitialized_key.patch (added)
+++ experimental/evolution-data-server/debian/patches/01_unitialized_key.patch Thu Apr 29 10:15:25 2010
@@ -1,0 +1,23 @@
+From c5bbcdc514dfe2449191b143a95166e2b06bde93 Mon Sep 17 00:00:00 2001
+From: Claudio Saavedra <csaavedra at igalia.com>
+Date: Tue, 27 Apr 2010 11:04:03 +0000
+Subject: Bug #616318 - Don't use an unitialized key in folder_changed_remove_uid
+
+If g_hash_table_lookup_extended() returns FALSE, then the oldkey
+is unset, so don't use it to insert a new item in the hash table.
+---
+diff --git a/camel/camel-vee-folder.c b/camel/camel-vee-folder.c
+index 76ce2c1..533e4f5 100644
+--- a/camel/camel-vee-folder.c
++++ b/camel/camel-vee-folder.c
+@@ -210,7 +210,7 @@ folder_changed_remove_uid (CamelFolder *sub, const gchar *uid, const gchar hash[
+ 				}
+ 			} else {
+ 				if (vee_folder_add_uid_test (folder_unmatched, sub, uid, hash))
+-					camel_folder_change_info_add_uid (folder_unmatched->changes, oldkey);
++					camel_folder_change_info_add_uid (folder_unmatched->changes, vuid);
+ 			}
+ 		} else {
+ 			if (g_hash_table_lookup_extended (unmatched_uids, vuid, (gpointer *)&oldkey, &oldval)) {
+--
+cgit v0.8.3.1