diff options
| author | marha <marha@users.sourceforge.net> | 2011-10-10 08:28:58 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-10-10 08:28:58 +0200 |
| commit | baf98f9bb36f956245d83ecd04f90625d6d68d2b (patch) | |
| tree | c4af86b7cdb9c57cc539fa0764050865233e3617 /libX11/modules/im | |
| parent | 7fae5492e3ef8e5fa15f742be4c2a15b9782e89a (diff) | |
| parent | afbd3947071a33f59dda122f1ac396442a02c128 (diff) | |
| download | vcxsrv-baf98f9bb36f956245d83ecd04f90625d6d68d2b.tar.gz vcxsrv-baf98f9bb36f956245d83ecd04f90625d6d68d2b.tar.bz2 vcxsrv-baf98f9bb36f956245d83ecd04f90625d6d68d2b.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'libX11/modules/im')
| -rw-r--r-- | libX11/modules/im/ximcp/imRmAttr.c | 7 |
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) { |