4 files changed, 15 insertions, 0 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 4d2dad8d0b..44e25e86a6 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,12 @@
+2008-02-18  Srinivasa Ragavan  <sragavan@novell.com>
+
+	** Downstream patches from OpenSUSE
+
+	* conduits/calendar/calendar-conduit.c:
+	(local_record_to_pilot_record):
+	* conduits/memo/memo-conduit.c: (local_record_to_pilot_record):
+	* conduits/todo/todo-conduit.c: (local_record_to_pilot_record):
+
 2008-02-14  Milan Crha  <mcrha@redhat.com>
 
 	** Fix for bug #516453
diff --git a/calendar/conduits/calendar/calendar-conduit.c b/calendar/conduits/calendar/calendar-conduit.c
index 9cc9227289..bdf6e4b01a 100644
--- a/calendar/conduits/calendar/calendar-conduit.c
+++ b/calendar/conduits/calendar/calendar-conduit.c
@@ -840,6 +840,8 @@ local_record_to_pilot_record (ECalLocalRecord *local,
 	static char record[0xffff];
 #endif
 
+	memset(&p, 0, sizeof (p));
+
 	g_assert (local->comp != NULL);
 	g_assert (local->appt != NULL );
 
diff --git a/calendar/conduits/memo/memo-conduit.c b/calendar/conduits/memo/memo-conduit.c
index f84baf7fed..8d4ba9d25c 100644
--- a/calendar/conduits/memo/memo-conduit.c
+++ b/calendar/conduits/memo/memo-conduit.c
@@ -473,6 +473,8 @@ local_record_to_pilot_record (EMemoLocalRecord *local,
 	static char record[0xffff];
 #endif
 
+	memset(&p, 0, sizeof (p));
+
 	g_assert (local->comp != NULL);
 	g_assert (local->memo != NULL );
 
diff --git a/calendar/conduits/todo/todo-conduit.c b/calendar/conduits/todo/todo-conduit.c
index e321940386..e8505e926d 100644
--- a/calendar/conduits/todo/todo-conduit.c
+++ b/calendar/conduits/todo/todo-conduit.c
@@ -621,6 +621,8 @@ local_record_to_pilot_record (EToDoLocalRecord *local,
 
 	memset (&p, 0, sizeof (GnomePilotRecord));
 
+	memset(&p, 0, sizeof (p));
+
 	p.ID = local->local.ID;
 	p.category = local->local.category;
 	p.attr = local->local.attr;