diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-10-12 08:32:04 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-10-12 08:32:04 +0200 |
| commit | 051d521f6e20761ba6831cecd91883da960fa931 (patch) | |
| tree | b28abba7818115d2fed80eb360a79a0f9183948e /nx-X11/lib/X11/lcTxtPr.c | |
| parent | 6dce607bad8711dd06a5a7b69ad1930386b4123b (diff) | |
| parent | b8de7bf654929c823080b211aeac56cd213f5a32 (diff) | |
| download | nx-libs-051d521f6e20761ba6831cecd91883da960fa931.tar.gz nx-libs-051d521f6e20761ba6831cecd91883da960fa931.tar.bz2 nx-libs-051d521f6e20761ba6831cecd91883da960fa931.zip | |
Merge branch 'uli42-pr/upgrade_libX11' into 3.6.x
Attributes GH PR #214: https://github.com/ArcticaProject/nx-libs/pull/214
Fixes ArcticaProject/nx-libs#157.
Diffstat (limited to 'nx-X11/lib/X11/lcTxtPr.c')
| -rw-r--r-- | nx-X11/lib/X11/lcTxtPr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nx-X11/lib/X11/lcTxtPr.c b/nx-X11/lib/X11/lcTxtPr.c index 482c49999..e980f0168 100644 --- a/nx-X11/lib/X11/lcTxtPr.c +++ b/nx-X11/lib/X11/lcTxtPr.c @@ -91,7 +91,7 @@ _XTextListToTextProperty( buf_len = get_buf_size(is_wide_char, list, count); if ((buf = (char *) Xmalloc(buf_len)) == NULL) return XNoMemory; - + switch (style) { case XStringStyle: case XStdICCTextStyle: @@ -114,7 +114,7 @@ _XTextListToTextProperty( mb_list = (char **) list; to = buf; for (i = 0; i < count && buf_len > 0; i++) { - if (*mb_list) + if (*mb_list) strcpy(to, *mb_list); else *to = '\0'; |