Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src
Modified Files:
ewl_theme.c ewl_widget.c
Log Message:
- check for some possible NULL pointers
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_theme.c,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -3 -r1.72 -r1.73
--- ewl_theme.c 9 Dec 2004 03:04:21 -0000 1.72
+++ ewl_theme.c 16 Dec 2004 15:07:14 -0000 1.73
@@ -369,7 +369,7 @@
}
temp++;
temp = strchr(temp, '/');
- if (!temp && w->parent) {
+ if (!temp && w && w->parent) {
temp = key;
w = w->parent;
}
@@ -420,7 +420,7 @@
snprintf(key, PATH_MAX, "%s", k);
for (temp = key; temp && !ret; temp = strchr(temp, '/')) {
- if (w->theme)
+ if (w && w->theme)
ret = (int) (ecore_hash_get(w->theme, temp));
else
ret = (int) (ecore_hash_get(def_theme_data, temp));
@@ -436,8 +436,6 @@
}
temp++;
}
-
-
DRETURN_INT(ret, DLEVEL_STABLE);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_widget.c,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -3 -r1.127 -r1.128
--- ewl_widget.c 9 Dec 2004 05:26:10 -0000 1.127
+++ ewl_widget.c 16 Dec 2004 15:07:14 -0000 1.128
@@ -395,7 +395,7 @@
DCHECK_PARAM_PTR("appearance", appearance);
/* make sure we have something to do */
- if (!strcmp(appearance, w->appearance))
+ if (w->appearance && !strcmp(appearance, w->appearance))
DLEAVE_FUNCTION(DLEVEL_STABLE);
IF_FREE(w->appearance);
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://productguide.itmanagersjournal.com/
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
