Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/lib
Modified Files:
edje_calc.c edje_textblock_styles.c
Log Message:
dave's catch of null strings
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_calc.c,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -3 -r1.74 -r1.75
--- edje_calc.c 26 Nov 2005 08:14:34 -0000 1.74
+++ edje_calc.c 17 Dec 2005 09:58:19 -0000 1.75
@@ -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;
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_textblock_styles.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- edje_textblock_styles.c 1 Dec 2005 01:01:04 -0000 1.4
+++ edje_textblock_styles.c 17 Dec 2005 09:58:19 -0000 1.5
@@ -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);
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
