[evolution-patches] [PATCH] Patch against addressbook-migrate.c



Hi.  I have a small (one-line) patch against
addressbook/gui/component/addressbook-migrate.c here.  When I migrate
From 1.4.5 to 1.5.3, evolution segfaults in e_source_peek_uid().  The
reason appears to be that personal_source have a strange value
(0x01).

From what I can see, the reason this value is off is that the
personal_source pointer is not initialized to any value.  This patch
initially sets it to NULL.

Index: addressbook/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/ChangeLog,v
retrieving revision 1.1574
diff -U3 -r1.1574 ChangeLog
--- addressbook/ChangeLog	7 Feb 2004 02:20:27 -0000	1.1574
+++ addressbook/ChangeLog	8 Feb 2004 12:09:51 -0000
@@ -1,3 +1,11 @@
+2004-02-08  Henrik Grindal Bakken   <hgb ifi uio no>
+
+	* addressbook-migrate.c: 2004-02-08  Henrik Grindal Bakken
+	<hgb ifi uio no>
+
+	        * gui/component/addressbook-migrate.c
+	        (addressbook_migrate): Initialize personal_source to NULL.
+	
 2004-02-06  Chris Toshok  <toshok ximian com>
 
 	* gui/component/addressbook-migrate.c (create_groups): don't
Index: addressbook/gui/component/addressbook-migrate.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/component/addressbook-migrate.c,v
retrieving revision 1.14
diff -U3 -r1.14 addressbook-migrate.c
--- addressbook/gui/component/addressbook-migrate.c	7 Feb 2004 02:20:28 -0000	1.14
+++ addressbook/gui/component/addressbook-migrate.c	8 Feb 2004 12:09:53 -0000
@@ -763,7 +763,7 @@
 {
 	ESourceGroup *on_this_computer;
 	ESourceGroup *on_ldap_servers;
-	ESource *personal_source;
+	ESource *personal_source = NULL;
 	MigrationContext *context = migration_context_new (component);
 
 	printf ("addressbook_migrate (%d.%d.%d)\n", major, minor, revision);


-- 
Henrik Grindal Bakken <hgb ifi uio no>
PGP ID: 8D436E52
Fingerprint: 131D 9590 F0CF 47EF 7963  02AF 9236 D25A 8D43 6E52

Attachment: pgphE9Ang92a9.pgp
Description: PGP signature



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]