Patch from Thomas <tmstaedt@t-mittelstaedt.de>: Fix for bug #564541 - NULL check...

svn path=/trunk/; revision=9863

diff --git a/ChangeLog b/ChangeLog
index 09845bf..d4ef5ca 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-01-05  Suman Manjunath  <msuman@novell.com>
+
+       ** Patch from Thomas <tmstaedt@t-mittelstaedt.de>
+       ** Fix for bug #564541
+
+       * libedataserver/e-sexp.c (e_sexp_term_eval): NULL check an argument 
+       before using its members. 
+
 2008-12-23  Milan Crha  <mcrha@redhat.com>
 
        ** Part of fix for bug #564652

diff --git a/libedataserver/e-sexp.c b/libedataserver/e-sexp.c
index 41c8557..af19e0e 100644 (file)
--- a/libedataserver/e-sexp.c
+++ b/libedataserver/e-sexp.c
@@ -706,7 +706,7 @@ e_sexp_term_eval(struct _ESExp *f, struct _ESExpTerm *t)
                r->value.time = t->value.time;
                break;
        case ESEXP_TERM_IFUNC:
-               if (t->value.func.sym->f.ifunc)
+               if (t->value.func.sym && t->value.func.sym->f.ifunc)
                        r = t->value.func.sym->f.ifunc(f, t->value.func.termcount, t->value.func.terms, t->value.func.sym->data);
                break;
        case ESEXP_TERM_FUNC: