callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(import_bonobo_config): Protect from val

Browse Source 
being NULL when printf()ing -- should fix #39096 (Solaris-specific
crash).

svn path=/trunk/; revision=20195
This commit is contained in:
Ettore Perazzoli
2003-03-06 16:42:00 +00:00
parent b85ba12a6c
commit 1f0f670580
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
shell/ChangeLog
View File

@ -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".

6
shell/e-config-upgrade.c
View File

@ -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: