Index: e17/libs/edje/src/lib/edje_calc.c
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_calc.c,v
retrieving revision 1.74
diff -u -w -r1.74 edje_calc.c
--- e17/libs/edje/src/lib/edje_calc.c	26 Nov 2005 08:14:34 -0000	1.74
+++ e17/libs/edje/src/lib/edje_calc.c	16 Dec 2005 17:05:47 -0000
@@ -464,7 +464,7 @@
 	for (l = ed->file->styles; l; l = l->next)
 	  {
 	     stl = l->data;
-	     if (!strcmp(stl->name, style)) break;
+	     if ((stl->name) && (!strcmp(stl->name, style))) break;
 	     stl = NULL;
 	  }
 	
Index: e17/libs/edje/src/lib/edje_textblock_styles.c
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_textblock_styles.c,v
retrieving revision 1.4
diff -u -w -r1.4 edje_textblock_styles.c
--- e17/libs/edje/src/lib/edje_textblock_styles.c	1 Dec 2005 01:01:04 -0000	1.4
+++ e17/libs/edje/src/lib/edje_textblock_styles.c	16 Dec 2005 17:05:47 -0000
@@ -82,7 +82,7 @@
    char *s1 = NULL, *s2 = NULL;
    
    p = *s;
-   if (*p == 0) return NULL;
+   if ((!p) || (*p == 0)) return NULL;
    for (;;)
      {
 	if (!s1)
@@ -250,6 +250,7 @@
 	for (ll = stl->tags; ll; ll = ll->next)
 	  {
 	     tag = ll->data;
+	     if (!tag->key) continue;
 	     len += strlen(tag->key);
 	     len += 1;
 	     len += 1;
@@ -273,6 +274,7 @@
 	for (ll = stl->tags; ll; ll = ll->next)
 	  {
 	     tag = ll->data;
+	     if (!tag->key) continue;
 	     strcat(buf, tag->key);
 	     strcat(buf, "='");
 	     ts = _edje_format_reparse(edf, tag->value);