aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIain Holmes <iain@src.gnome.org>2001-10-31 07:05:36 +0800
committerIain Holmes <iain@src.gnome.org>2001-10-31 07:05:36 +0800
commitd42daece4ac4f376d2b0945012767dd7394fb305 (patch)
tree28dc5eecab5b19eaa2e4185824cfe694a9be22ab
parentf9b4d697114fbb6b24b9d1cf2e3e109bcceb9688 (diff)
downloadgsoc2013-evolution-d42daece4ac4f376d2b0945012767dd7394fb305.tar.gz
gsoc2013-evolution-d42daece4ac4f376d2b0945012767dd7394fb305.tar.zst
gsoc2013-evolution-d42daece4ac4f376d2b0945012767dd7394fb305.zip
Do some NULL checking before dereferencing things.
svn path=/trunk/; revision=14497
-rw-r--r--my-evolution/ChangeLog4
-rw-r--r--my-evolution/e-summary-preferences.c7
2 files changed, 11 insertions, 0 deletions
diff --git a/my-evolution/ChangeLog b/my-evolution/ChangeLog
index 8282deedd7..b6465ad9a6 100644
--- a/my-evolution/ChangeLog
+++ b/my-evolution/ChangeLog
@@ -1,3 +1,7 @@
+2001-10-30 Iain Holmes <iain@ximian.com>
+
+ * e-summary-preferences.c (find_name_from_url): Check a for NULL values
+
2001-10-29 Damon Chaplin <damon@ximian.com>
* Makefile.am (evolution_executive_summary_LDADD): use
diff --git a/my-evolution/e-summary-preferences.c b/my-evolution/e-summary-preferences.c
index e4d781deb2..ea05ae5959 100644
--- a/my-evolution/e-summary-preferences.c
+++ b/my-evolution/e-summary-preferences.c
@@ -469,6 +469,11 @@ find_name_for_url (PropertyData *pd,
for (p = pd->rdf->known; p; p = p->next) {
struct _RDFInfo *info = p->data;
+
+ if (info == NULL || info->url == NULL) {
+ continue;
+ }
+
if (strcmp (url, info->url) == 0) {
return info->name;
}
@@ -565,6 +570,8 @@ fill_rdf_all_clist (GtkCList *clist,
(GtkDestroyNotify) free_rdf_info);
g_strfreev (tokens);
}
+
+ fclose (handle);
}
static void