diff options
| author | Ettore Perazzoli <ettore@src.gnome.org> | 2003-03-07 00:42:00 +0800 |
|---|---|---|
| committer | Ettore Perazzoli <ettore@src.gnome.org> | 2003-03-07 00:42:00 +0800 |
| commit | 1f0f6705804f7a5f1e4e601fb0b91331485bb4cd (patch) | |
| tree | 8159b08d341853868c855748fd41912a41b6e1b1 | |
| parent | b85ba12a6c6a897c9ab04a3d4ccc58018314d2b1 (diff) | |
| download | gsoc2013-evolution-1f0f6705804f7a5f1e4e601fb0b91331485bb4cd.tar gsoc2013-evolution-1f0f6705804f7a5f1e4e601fb0b91331485bb4cd.tar.gz gsoc2013-evolution-1f0f6705804f7a5f1e4e601fb0b91331485bb4cd.tar.bz2 gsoc2013-evolution-1f0f6705804f7a5f1e4e601fb0b91331485bb4cd.tar.lz gsoc2013-evolution-1f0f6705804f7a5f1e4e601fb0b91331485bb4cd.tar.xz gsoc2013-evolution-1f0f6705804f7a5f1e4e601fb0b91331485bb4cd.tar.zst gsoc2013-evolution-1f0f6705804f7a5f1e4e601fb0b91331485bb4cd.zip | |
(import_bonobo_config): Protect from val
being NULL when printf()ing -- should fix #39096 (Solaris-specific
crash).
svn path=/trunk/; revision=20195
| -rw-r--r-- | shell/ChangeLog | 6 | ||||
| -rw-r--r-- | shell/e-config-upgrade.c | 6 |
2 files changed, 11 insertions, 1 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index 28b28cfc79..58b66e1e1b 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,9 @@ +2003-03-06 Ettore Perazzoli <ettore@ximian.com> + + * e-config-upgrade.c (import_bonobo_config): Protect from val + being NULL when printf()ing -- should fix #39096 (Solaris-specific + crash). + 2003-03-05 Ettore Perazzoli <ettore@ximian.com> * e-shell-view-menu.c: Added icon for "/popups/NewPopup/Folder". diff --git a/shell/e-config-upgrade.c b/shell/e-config-upgrade.c index 9848ac09e2..4d574cc28e 100644 --- a/shell/e-config-upgrade.c +++ b/shell/e-config-upgrade.c @@ -1341,7 +1341,11 @@ static int import_bonobo_config(xmlDocPtr config_doc, GConfClient *gconf) if (val == NULL) continue; } - d(printf(" %s = '%s' -> %s [%d]\n", map[j].from, val, map[j].to, map[j].type)); + d(printf(" %s = '%s' -> %s [%d]\n", + map[j].from, + val == NULL ? "(null)" : val, + map[j].to, + map[j].type)); path = g_strdup_printf("/apps/evolution/%s", map[j].to); switch(map[j].type) { case BMAP_BOOL: |