SecBSD/xenocara
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sync with OpenBSD -current

Browse source
This commit is contained in:
purplerain 2024-07-12 14:44:09 +02:00
parent 2d1e52c274
commit b5b25afdb8
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
657 changed files with 21464 additions and 54675 deletions
Download patch file Download diff file Expand all files Collapse all files

29
lib/libX11/modules/im/ximcp/imRm.c
View file

@ -510,13 +510,21 @@ _XimDefaultResName(
Xic ic = (Xic)parm;
Xim im = (Xim)ic->core.im;
char **out;
char *string;
if(im->core.res_name == (char *)NULL) {
return True;
}
string=strdup(im->core.res_name);
if ( string == NULL)
return False;
out = (char **)((char *)top + info->offset);
*out = im->core.res_name;
Xfree(*out); /* free old im->core.res_name */
*out =string;
return True;
}
@ -529,14 +537,22 @@ _XimDefaultResClass(
{
Xic ic = (Xic)parm;
Xim im = (Xim)ic->core.im;
char *string;
char **out;
if(im->core.res_class == (char *)NULL) {
return True;
}
string=strdup(im->core.res_class);
if (string == NULL)
return False;
out = (char **)((char *)top + info->offset);
*out = im->core.res_class;
Xfree(*out); /* free old im->core.res_class */
*out = string;
return True;
}
@ -820,9 +836,8 @@ _XimEncodeString(
}
out = (char **)((char *)top + info->offset);
if(*out) {
Xfree(*out);
}
Xfree(*out);
*out = string;
return True;
}
@ -1947,7 +1962,7 @@ static const XimICMode ic_mode[] = {
0,
0},
{OFFSET_XNSPOTLOCATION,
0, /*(XIM_MODE_PRE_SET | XIM_MODE_PRE_GET),*/
(XIM_MODE_PRE_SET | XIM_MODE_PRE_GET),
(XIM_MODE_PRE_CREATE | XIM_MODE_PRE_SET | XIM_MODE_PRE_GET),
0,
(XIM_MODE_PRE_SET | XIM_MODE_PRE_GET),