Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_x
Modified Files:
ecore_x_events.c
Log Message:
alloc checks
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_x/ecore_x_events.c,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -3 -r1.71 -r1.72
--- ecore_x_events.c 23 Aug 2005 03:47:55 -0000 1.71
+++ ecore_x_events.c 23 Aug 2005 08:18:17 -0000 1.72
@@ -751,6 +751,7 @@
Ecore_X_Event_Window_Create *e;
e = calloc(1, sizeof(Ecore_X_Event_Window_Create));
+ if (!e) return;
e->win = xevent->xcreatewindow.window;
if (xevent->xcreatewindow.override_redirect)
e->override = 1;
@@ -898,6 +899,7 @@
Ecore_X_Event_Window_Stack *e;
e = calloc(1, sizeof(Ecore_X_Event_Window_Stack));
+ if (!e) return;
e->win = xevent->xcirculate.window;
e->event_win = xevent->xcirculate.event;
if (xevent->xcirculate.place == PlaceOnTop)
@@ -914,6 +916,7 @@
Ecore_X_Event_Window_Stack_Request *e;
e = calloc(1, sizeof(Ecore_X_Event_Window_Stack_Request));
+ if (!e) return;
e->win = xevent->xcirculaterequest.window;
e->parent = xevent->xcirculaterequest.parent;
if (xevent->xcirculaterequest.place == PlaceOnTop)
@@ -1136,6 +1139,7 @@
}
e = calloc(1, sizeof(Ecore_X_Event_Selection_Notify));
+ if (!e) return;
e->win = xevent->xselection.requestor;
e->time = xevent->xselection.time;
e->target = _ecore_x_selection_target_get(xevent->xselection.target);
@@ -1164,6 +1168,7 @@
Ecore_X_Event_Window_Colormap *e;
e = calloc(1,sizeof(Ecore_X_Event_Window_Colormap));
+ if (!e) return;
e->win = xevent->xcolormap.window;
e->cmap = xevent->xcolormap.colormap;
e->time = _ecore_x_event_last_time;
@@ -1255,8 +1260,11 @@
}
types = (Ecore_X_Atom *)data;
e->types = calloc(num_ret, sizeof(char *));
- for (i = 0; i < num_ret; i++)
- e->types[i] = XGetAtomName(_ecore_x_disp, types[i]);
+ if (e->types)
+ {
+ for (i = 0; i < num_ret; i++)
+ e->types[i] = XGetAtomName(_ecore_x_disp, types[i]);
+ }
e->num_types = num_ret;
}
else
@@ -1264,10 +1272,13 @@
int i = 0;
e->types = calloc(3, sizeof(char *));
- while ((i < 3) && (xevent->xclient.data.l[i + 2]))
+ if (e->types)
{
- e->types[i] = XGetAtomName(_ecore_x_disp,
xevent->xclient.data.l[i + 2]);
- i++;
+ while ((i < 3) && (xevent->xclient.data.l[i + 2]))
+ {
+ e->types[i] = XGetAtomName(_ecore_x_disp,
xevent->xclient.data.l[i + 2]);
+ i++;
+ }
}
e->num_types = i;
}
-------------------------------------------------------
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
