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/xkbconfig.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/xkbconfig.c')
| -rw-r--r-- | nx-X11/programs/Xserver/xkb/xkbconfig.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nx-X11/programs/Xserver/xkb/xkbconfig.c b/nx-X11/programs/Xserver/xkb/xkbconfig.c index de138ef45..5fcd594bc 100644 --- a/nx-X11/programs/Xserver/xkb/xkbconfig.c +++ b/nx-X11/programs/Xserver/xkb/xkbconfig.c @@ -363,7 +363,7 @@ XkbCFAddModByName( XkbConfigRtrnPtr rtrn, last->merge= merge; last->name= NULL; } - last->name= _XkbDupString(name); + last->name= Xstrdup(name); } return last; } @@ -487,7 +487,7 @@ unsigned what; } if (*str!=NULL) _XkbFree(*str); - *str= _XkbDupString(val.str); + *str= Xstrdup(val.str); break; case _XkbCF_InitialMods: case _XkbCF_IgnoreLockMods: @@ -1046,7 +1046,7 @@ DefaultFinish( XkbConfigFieldsPtr fields, return DefaultCleanUp(rtrn); if (what==XkbCF_Check) { if ((rtrn->symbols==NULL)&&(rtrn->phys_symbols!=NULL)) - rtrn->symbols= _XkbDupString(rtrn->phys_symbols); + rtrn->symbols= Xstrdup(rtrn->phys_symbols); } if ((what==XkbCF_Apply)||(what==XkbCF_Check)) { if (xkb && xkb->names && (rtrn->num_unbound_mods>0)) |