Author: kihamala
Date: 2009-09-28 16:02:35 +0300 (Mon, 28 Sep 2009)
New Revision: 19386
Modified:
projects/haf/trunk/libmatchbox2/ChangeLog
projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client-window.c
Log:
don't call XFree with NULL argument
Modified: projects/haf/trunk/libmatchbox2/ChangeLog
===================================================================
--- projects/haf/trunk/libmatchbox2/ChangeLog 2009-09-25 06:54:01 UTC (rev
19385)
+++ projects/haf/trunk/libmatchbox2/ChangeLog 2009-09-28 13:02:35 UTC (rev
19386)
@@ -1,3 +1,9 @@
+2009-09-28 Kimmo Hämäläinen <kimmo.hamalai...@nokia.com>
+
+ * matchbox/core/mb-wm-client-window.c
+ (mb_wm_client_window_sync_properties): Make sure we don't call XFree
+ with a NULL argument.
+
2009-09-23 Adam Endrodi <adam.endr...@blumsoft.eu>
Speed up building.
Modified: projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client-window.c
===================================================================
--- projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client-window.c
2009-09-25 06:54:01 UTC (rev 19385)
+++ projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client-window.c
2009-09-28 13:02:35 UTC (rev 19386)
@@ -752,7 +752,8 @@
MBWM_DBG("@@@ New Window Name: '%s' @@@", win->name);
- XFree (name);
+ if (name)
+ XFree (name);
changes |= MBWM_WINDOW_PROP_NAME;
}
@@ -1168,7 +1169,8 @@
xwin_attr = mb_wm_xwin_get_attributes_reply (wm,
cookies[COOKIE_WIN_ATTR],
&x_error_code);
- XFree (xwin_attr);
+ if (xwin_attr)
+ XFree (xwin_attr);
}
if (cookies[COOKIE_WIN_NAME])
@@ -1194,7 +1196,8 @@
0,
NULL,
&x_error_code);
- XFree (ret);
+ if (ret)
+ XFree (ret);
}
}
}
@@ -1209,7 +1212,8 @@
NumPropWMHintsElements,
NULL,
&x_error_code);
- XFree (wmhints);
+ if (wmhints)
+ XFree (wmhints);
}
if (cookies[COOKIE_WIN_MWM_HINTS])
@@ -1222,7 +1226,8 @@
PROP_MOTIF_WM_HINTS_ELEMENTS,
NULL,
&x_error_code);
- XFree (mwmhints);
+ if (mwmhints)
+ XFree (mwmhints);
}
if (cookies[COOKIE_WIN_TRANSIENCY])
@@ -1235,7 +1240,8 @@
1,
NULL,
&x_error_code);
- XFree (trans_win);
+ if (trans_win)
+ XFree (trans_win);
}
if (cookies[COOKIE_WIN_MACHINE])
@@ -1248,7 +1254,8 @@
0,
NULL,
&x_error_code);
- XFree (m);
+ if (m)
+ XFree (m);
}
{
@@ -1275,7 +1282,8 @@
&bytes_after_return,
&result_atom,
&x_error_code);
- XFree (result_atom);
+ if (result_atom)
+ XFree (result_atom);
}
}
}
_______________________________________________
maemo-commits mailing list
maemo-commits@maemo.org
https://lists.maemo.org/mailman/listinfo/maemo-commits
