aboutsummaryrefslogtreecommitdiff
path: root/apps/xwininfo/dsimple.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-06-10 10:02:09 +0200
committermarha <marha@users.sourceforge.net>2011-06-10 10:02:09 +0200
commitee6b5ca3b101697d067675efa68f0e603cd61ffa (patch)
tree9069e7784163f08f634fa76c07b5fe851d1e6d97 /apps/xwininfo/dsimple.c
parent0a9d2abef2e6fac5d52556969655a62711df6418 (diff)
downloadvcxsrv-ee6b5ca3b101697d067675efa68f0e603cd61ffa.tar.gz
vcxsrv-ee6b5ca3b101697d067675efa68f0e603cd61ffa.tar.bz2
vcxsrv-ee6b5ca3b101697d067675efa68f0e603cd61ffa.zip
xwininfo xkeyboard-config git update 10 juni 2011
Diffstat (limited to 'apps/xwininfo/dsimple.c')
-rw-r--r--apps/xwininfo/dsimple.c16
1 files changed, 10 insertions, 6 deletions
diff --git a/apps/xwininfo/dsimple.c b/apps/xwininfo/dsimple.c
index a9b867896..150f9db84 100644
--- a/apps/xwininfo/dsimple.c
+++ b/apps/xwininfo/dsimple.c
@@ -253,7 +253,8 @@ recursive_Window_With_Name (
xcb_connection_t *dpy,
xcb_window_t window,
struct wininfo_cookies *cookies,
- const char *name)
+ const char *name,
+ size_t namelen)
{
xcb_window_t *children;
unsigned int nchildren;
@@ -273,7 +274,8 @@ recursive_Window_With_Name (
int prop_name_len = xcb_get_property_value_length (prop);
/* can't use strcmp, since prop.name is not null terminated */
- if (strncmp (prop_name, name, prop_name_len) == 0) {
+ if ((namelen == prop_name_len) &&
+ memcmp (prop_name, name, namelen) == 0) {
w = window;
}
}
@@ -294,7 +296,8 @@ recursive_Window_With_Name (
if (xcb_get_wm_name_reply (dpy, cookies->get_wm_name,
&nameprop, &err)) {
/* can't use strcmp, since nameprop.name is not null terminated */
- if (strncmp (nameprop.name, name, nameprop.name_len) == 0) {
+ if ((namelen == nameprop.name_len) &&
+ memcmp (nameprop.name, name, namelen) == 0) {
w = window;
}
@@ -309,7 +312,8 @@ recursive_Window_With_Name (
int prop_name_len = xcb_get_property_value_length (prop);
/* can't use strcmp, since prop.name is not null terminated */
- if (strncmp (prop_name, name, prop_name_len) == 0) {
+ if ((namelen == prop_name_len) &&
+ memcmp (prop_name, name, namelen) == 0) {
w = window;
}
}
@@ -354,7 +358,7 @@ recursive_Window_With_Name (
for (i = 0; i < nchildren; i++) {
w = recursive_Window_With_Name (dpy, children[i],
- &child_cookies[i], name);
+ &child_cookies[i], name, namelen);
if (w)
break;
}
@@ -392,7 +396,7 @@ Window_With_Name (
cookies.get_wm_name = xcb_get_wm_name (dpy, top);
cookies.query_tree = xcb_query_tree (dpy, top);
xcb_flush (dpy);
- return recursive_Window_With_Name(dpy, top, &cookies, name);
+ return recursive_Window_With_Name(dpy, top, &cookies, name, strlen(name));
}