diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-03-03 22:44:58 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-03-03 22:44:58 +0100 |
| commit | 05aabb4e6f45bcb2c951ec04026f9d7bce7335b3 (patch) | |
| tree | 7eb1bb1a0e4633e77edf9d3d8e3829849303f1cd /nx-X11/programs/Xserver/xkb/xkb.c | |
| parent | 96e2556031c8aff62a4650b9cfb814991f5240e1 (diff) | |
| parent | 06bb154df0a4d6e35885bce6a63057bd8f8636e8 (diff) | |
| download | nx-libs-05aabb4e6f45bcb2c951ec04026f9d7bce7335b3.tar.gz nx-libs-05aabb4e6f45bcb2c951ec04026f9d7bce7335b3.tar.bz2 nx-libs-05aabb4e6f45bcb2c951ec04026f9d7bce7335b3.zip | |
Merge branch 'uli42-pr/fix_validatestring' into 3.6.x
Attributes GH PR #359: https://github.com/ArcticaProject/nx-libs/pull/359
Diffstat (limited to 'nx-X11/programs/Xserver/xkb/xkb.c')
| -rw-r--r-- | nx-X11/programs/Xserver/xkb/xkb.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nx-X11/programs/Xserver/xkb/xkb.c b/nx-X11/programs/Xserver/xkb/xkb.c index 069fd6a64..6798f2dda 100644 --- a/nx-X11/programs/Xserver/xkb/xkb.c +++ b/nx-X11/programs/Xserver/xkb/xkb.c @@ -5164,17 +5164,17 @@ ProcXkbGetKbdByName(ClientPtr client) if (!names.keymap) { if ((!names.compat)&& (fwant&(XkbGBN_CompatMapMask|XkbGBN_IndicatorMapMask))) { - names.compat= _XkbDupString("%"); + names.compat= Xstrdup("%"); } if ((!names.types)&&(fwant&(XkbGBN_TypesMask))) { - names.types= _XkbDupString("%"); + names.types= Xstrdup("%"); } if ((!names.symbols)&&(fwant&XkbGBN_SymbolsMask)) { - names.symbols= _XkbDupString("%"); + names.symbols= Xstrdup("%"); } geom_changed= ((names.geometry!=NULL)&&(strcmp(names.geometry,"%")!=0)); if ((!names.geometry)&&(fwant&XkbGBN_GeometryMask)) { - names.geometry= _XkbDupString("%"); + names.geometry= Xstrdup("%"); geom_changed= False; } } |