'2001-01-15 JP Rosevear <jpr@ximian.com>

	* conduit/address-conduit.c (print_local): prevent segfaults and
	buffer overflows
	(print_remote): ditto

2001-01-15  JP Rosevear  <jpr@ximian.com>

	* conduits/todo/todo-conduit.c (print_local): prevent segfaults and
	buffer overflows.
	(print_remote): ditto

	* conduits/calendar/calendar-conduit.c: as above

svn path=/trunk/; revision=7504

5 files changed, 66 insertions, 32 deletions

diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 3bd02eeee8..e3c8ef7511 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,9 @@
+2001-01-15  JP Rosevear  <jpr@ximian.com>
+
+	* conduit/address-conduit.c (print_local): prevent segfaults and 
+	buffer overflows
+	(print_remote): ditto
+
 2001-01-14  JP Rosevear  <jpr@ximian.com>
 
 	* conduit/Makefile.am: pass -module and -avoid-version to conduit
diff --git a/addressbook/conduit/address-conduit.c b/addressbook/conduit/address-conduit.c
index ee6aa56541..43ba2569e0 100644
--- a/addressbook/conduit/address-conduit.c
+++ b/addressbook/conduit/address-conduit.c
@@ -96,10 +96,13 @@ print_local (EAddrLocalRecord *local)
 	}
 
 	if (local->addr) {
-		sprintf (buff, "['%s' '%s' '%s']",
-			 local->addr->entry[entryLastname],
-			 local->addr->entry[entryFirstname],
-			 local->addr->entry[entryCompany]);
+		g_snprintf (buff, 4096, "['%s' '%s' '%s']",
+			    local->addr->entry[entryLastname] ?
+			    local->addr->entry[entryLastname] : "",
+			    local->addr->entry[entryFirstname] ?
+			    local->addr->entry[entryFirstname] : "",
+			    local->addr->entry[entryCompany] ?
+			    local->addr->entry[entryCompany] : "");
 		return buff;
 	}
 
@@ -119,10 +122,13 @@ static char *print_remote (GnomePilotRecord *remote)
 	memset (&addr, 0, sizeof (struct Address));
 	unpack_Address (&addr, remote->record, remote->length);
 
-	sprintf (buff, "['%s' '%s' '%s']",
-		 addr.entry[entryLastname],
-		 addr.entry[entryFirstname],
-		 addr.entry[entryCompany]);
+	g_snprintf (buff, 4096, "['%s' '%s' '%s']",
+		    addr.entry[entryLastname] ?
+		    addr.entry[entryLastname] : "",
+		    addr.entry[entryFirstname] ?
+		    addr.entry[entryFirstname] : "",
+		    addr.entry[entryCompany] ?
+		    addr.entry[entryCompany] : "");
 
 	return buff;
 }
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 5238ab7e7f..e38ba3f411 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,11 @@
+2001-01-15  JP Rosevear  <jpr@ximian.com>
+
+	* conduits/todo/todo-conduit.c (print_local): prevent segfaults and
+	buffer overflows.
+	(print_remote): ditto
+
+	* conduits/calendar/calendar-conduit.c: as above
+
 2001-01-14  Damon Chaplin  <damon@helixcode.com>
 
 	* gui/e-calendar-table.c (E_CALENDAR_TABLE_SPEC): changed the expansion
diff --git a/calendar/conduits/calendar/calendar-conduit.c b/calendar/conduits/calendar/calendar-conduit.c
index 27163b9eeb..1ffe47b890 100644
--- a/calendar/conduits/calendar/calendar-conduit.c
+++ b/calendar/conduits/calendar/calendar-conduit.c
@@ -77,11 +77,13 @@ print_local (ECalLocalRecord *local)
 	}
 
 	if (local->appt && local->appt->description) {
-		sprintf (buff, "[%ld %ld '%s' '%s']",
-			 mktime (&local->appt->begin),
-			 mktime (&local->appt->end),
-			 local->appt->description,
-			 local->appt->note);
+		g_snprintf (buff, 4096, "[%ld %ld '%s' '%s']",
+			    mktime (&local->appt->begin),
+			    mktime (&local->appt->end),
+			    local->appt->description ?
+			    local->appt->description : "",
+			    local->appt->note ?
+			    local->appt->note : "");
 		return buff;
 	}
 
@@ -101,11 +103,13 @@ static char *print_remote (GnomePilotRecord *remote)
 	memset (&appt, 0, sizeof (struct Appointment));
 	unpack_Appointment (&appt, remote->record, remote->length);
 
-	sprintf (buff, "[%ld %ld '%s' '%s']",
-		 mktime (&appt.begin),
-		 mktime (&appt.end),
-		 appt.description,
-		 appt.note);
+	g_snprintf (buff, 4096, "[%ld %ld '%s' '%s']",
+		    mktime (&appt.begin),
+		    mktime (&appt.end),
+		    appt.description ?
+		    appt.description : "",
+		    appt.note ?
+		    appt.note : "");
 
 	return buff;
 }
diff --git a/calendar/conduits/todo/todo-conduit.c b/calendar/conduits/todo/todo-conduit.c
index d232b88173..abc3bd498d 100644
--- a/calendar/conduits/todo/todo-conduit.c
+++ b/calendar/conduits/todo/todo-conduit.c
@@ -77,13 +77,18 @@ print_local (EToDoLocalRecord *local)
 	}
 
 	if (local->todo && local->todo->description) {
-		sprintf (buff, "[%d %ld %d %d '%s' '%s']",
-			 local->todo->indefinite,
-			 mktime (& local->todo->due),
-			 local->todo->priority,
-			 local->todo->complete,
-			 local->todo->description,
-			 local->todo->note);
+		g_snprintf (buff, 4096, "[%d %ld %d %d '%s' '%s']",
+			    local->todo->indefinite ?
+			    local->todo->indefinite : "",
+			    mktime (& local->todo->due),
+			    local->todo->priority ?
+			    local->todo->priority : "",
+			    local->todo->complete ?
+			    local->todo->complete : "",
+			    local->todo->description ?
+			    local->todo->description : "",
+			    local->todo->note ?
+			    local->todo->note : "");
 		return buff;
 	}
 
@@ -103,13 +108,18 @@ static char *print_remote (GnomePilotRecord *remote)
 	memset (&todo, 0, sizeof (struct ToDo));
 	unpack_ToDo (&todo, remote->record, remote->length);
 
-	sprintf (buff, "[%d %ld %d %d '%s' '%s']",
-		 todo.indefinite,
-		 mktime (& todo.due),
-		 todo.priority,
-		 todo.complete,
-		 todo.description,
-		 todo.note);
+	g_snprintf (buff, "[%d %ld %d %d '%s' '%s']",
+		    todo.indefinite ?
+		    todo.indefinite : "",
+		    mktime (&todo.due),
+		    todo.priority ?
+		    todo.priority : "",
+		    todo.complete ?
+		    todo.complete : "",
+		    todo.description ?
+		    todo.description : "",
+		    todo.note ?
+		    todo.note : "");
 
 	return buff;
 }