From: Enlightenment S. <no-...@en...> - 2013-02-11 07:12:27
|
Log: Fix major memory stompage when using ecore_xcb_atom routines. Thanks TAsn ;) Signed-off-by: Christopher Michael <cp....@sa...> Author: devilhorns Date: 2013-02-10 23:12:18 -0800 (Sun, 10 Feb 2013) New Revision: 83807 Trac: http://trac.enlightenment.org/e/changeset/83807 Modified: trunk/efl/src/lib/ecore_x/xcb/ecore_xcb_atoms.c Modified: trunk/efl/src/lib/ecore_x/xcb/ecore_xcb_atoms.c =================================================================== --- trunk/efl/src/lib/ecore_x/xcb/ecore_xcb_atoms.c 2013-02-10 09:59:25 UTC (rev 83806) +++ trunk/efl/src/lib/ecore_x/xcb/ecore_xcb_atoms.c 2013-02-11 07:12:18 UTC (rev 83807) @@ -9,6 +9,8 @@ /* local variables */ static xcb_intern_atom_cookie_t cookies[ECORE_X_ATOMS_COUNT]; +#define MYMIN(X, Y) (((X) < (Y)) ? (X) : (Y)) + void _ecore_xcb_atoms_init(void) { @@ -18,6 +20,7 @@ CHECK_XCB_CONN; num = (sizeof(atom_items) / sizeof(Atom_Item)); + num = MYMIN(num, ECORE_X_ATOMS_COUNT); for (i = 0; i < num; i++) { cookies[i] = @@ -35,6 +38,7 @@ CHECK_XCB_CONN; num = (sizeof(atom_items) / sizeof(Atom_Item)); + num = MYMIN(num, ECORE_X_ATOMS_COUNT); for (i = 0; i < num; i++) { xcb_intern_atom_reply_t *reply = NULL; @@ -131,6 +135,7 @@ LOGFN(__FILE__, __LINE__, __FUNCTION__); CHECK_XCB_CONN; + num = MYMIN(num, ECORE_X_ATOMS_COUNT); for (i = 0; i < num; i++) { cookies[i] = |