aboutsummaryrefslogtreecommitdiff
path: root/libX11/modules/im/ximcp
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-10-10 07:52:38 +0200
committermarha <marha@users.sourceforge.net>2011-10-10 07:52:38 +0200
commitafbd3947071a33f59dda122f1ac396442a02c128 (patch)
treee3dde5d2973697c24f73488a421327d09a9337c0 /libX11/modules/im/ximcp
parentb520df571e0a319eae5231d09f36b98f28b8914a (diff)
downloadvcxsrv-afbd3947071a33f59dda122f1ac396442a02c128.tar.gz
vcxsrv-afbd3947071a33f59dda122f1ac396442a02c128.tar.bz2
vcxsrv-afbd3947071a33f59dda122f1ac396442a02c128.zip
fontconfig libX11 mesa pixman xkeyboard-config git updte 10 oct 2011
Diffstat (limited to 'libX11/modules/im/ximcp')
-rw-r--r--libX11/modules/im/ximcp/imRmAttr.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/libX11/modules/im/ximcp/imRmAttr.c b/libX11/modules/im/ximcp/imRmAttr.c
index 2e732658a..c047715f6 100644
--- a/libX11/modules/im/ximcp/imRmAttr.c
+++ b/libX11/modules/im/ximcp/imRmAttr.c
@@ -177,6 +177,8 @@ _XimMakeICAttrIDList(
else *len += new_len;
return name;
}
+ *len += new_len;
+ buf = (CARD16 *)((char *)buf + new_len);
} else if (res->xrm_name == sts_quark) {
if ((name = _XimMakeICAttrIDList(ic, res_list, res_num,
(XIMArg *)p->value, buf, &new_len,
@@ -185,9 +187,10 @@ _XimMakeICAttrIDList(
else *len += new_len;
return name;
}
+ *len += new_len;
+ buf = (CARD16 *)((char *)buf + new_len);
}
- *len += new_len;
- buf = (CARD16 *)((char *)buf + new_len);
+
if (!(res = _XimGetNestedListSeparator(res_list, res_num))) {
p++;
if (p) {