projects
/
profile
/
ivi
/
weston-ivi-shell.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
db9bf1e
)
x11: Handle non-existing properties correctly
author
Kristian Høgsberg
<krh@bitplanet.net>
Wed, 4 Jan 2012 03:53:33 +0000
(22:53 -0500)
committer
Kristian Høgsberg
<krh@bitplanet.net>
Wed, 4 Jan 2012 04:01:40 +0000
(23:01 -0500)
Don't try to read out ATOM or WINDOW values if there is no such property.
src/xserver-launcher.c
patch
|
blob
|
history
diff --git
a/src/xserver-launcher.c
b/src/xserver-launcher.c
index
486e764
..
a032c79
100644
(file)
--- a/
src/xserver-launcher.c
+++ b/
src/xserver-launcher.c
@@
-624,6
+624,11
@@
weston_wm_handle_map_notify(struct weston_wm *wm, xcb_generic_event_t *event)
if (!reply)
/* Bad window, typically */
continue;
+ if (reply->type == XCB_ATOM_NONE) {
+ /* No such property */
+ free(reply);
+ continue;
+ }
p = ((char *) window + props[i].offset);