Enlightenment CVS committal
Author : onefang
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_desktop
Modified Files:
ecore_desktop_menu.c ecore_desktop_tree.c
Log Message:
The results of a small session with valgrind.
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_desktop/ecore_desktop_menu.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- ecore_desktop_menu.c 30 Aug 2006 14:49:38 -0000 1.10
+++ ecore_desktop_menu.c 1 Sep 2006 06:24:11 -0000 1.11
@@ -170,8 +170,21 @@
/* I can safely assume that they are all strings. */
text = (char *)merge_stack->elements[i].element;
+/* printf("--- %s --- %s\n", text, file);
+ if (text)
+ if (file) */
if (strcmp(text, file) == 0)
{
+/* FIXME: valgrind says -
+==5761== Conditional jump or move depends on uninitialised value(s)
+==5761== at 0x1B90565C: strcmp (in /usr/lib/valgrind/vgpreload_memcheck.so)
+==5761== by 0x1BA3E984: _ecore_desktop_menu_get0 (ecore_desktop_menu.c:176)
+==5761== by 0x1BA3FE3F: _ecore_desktop_menu_merge
(ecore_desktop_menu.c:1146)
+==5761== by 0x1BA3D5A2: ecore_desktop_tree_foreach
(ecore_desktop_tree.c:267)
+ * which is the strcmp just above. But it doesn't complain about the first
two if's,
+ * or the printf, which I inserted to try and track this down.
+ * No idea what it actually is complaining about, so I'll comment it for
future study.
+ */
fprintf(stderr,
"\n### Oops, infinite menu merging loop detected at
%s\n",
file);
@@ -1134,7 +1147,7 @@
/* FIXME: Actually implement this when I have some menus that
will exercise it. */
merge_path[0] = '\0';
- printf("\n### Didn't expect a MergeFile parent type\n");
+ printf("\n### Didn't expect a MergeFile parent type in the
FDO menu. onefang must write more code now.\n");
}
if (merge_path[0] != '\0')
{
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_desktop/ecore_desktop_tree.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- ecore_desktop_tree.c 14 Aug 2006 04:41:44 -0000 1.2
+++ ecore_desktop_tree.c 1 Sep 2006 06:24:11 -0000 1.3
@@ -126,7 +126,7 @@
sizeof
(Ecore_Desktop_Tree_Element));
tree->size += size;
- for (i = tree->size - 1; i > before; i--)
+ for (i = tree->size - 1; (i > before) && ((i - size) > 0); i--)
{
tree->elements[i].element = tree->elements[i - size].element;
tree->elements[i].type = tree->elements[i - size].type;
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
