diff options
| author | Thomas Adam <thomas@xteddy.org> | 2016-04-25 20:01:10 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2016-04-25 20:01:10 +0100 |
| commit | 3b833a0c01e984996afd5d9eb9334b291d84489e (patch) | |
| tree | 3ce1b87f7131147d0f635bcd97dcdb71c79c63c7 /key-string.c | |
| parent | 5391342b08f746239e3d0e2f729410af10a54b78 (diff) | |
| parent | 6bf2a43e675c9c1d2cd9b13f326f010e7fba727d (diff) | |
| download | rtmux-3b833a0c01e984996afd5d9eb9334b291d84489e.tar.gz rtmux-3b833a0c01e984996afd5d9eb9334b291d84489e.tar.bz2 rtmux-3b833a0c01e984996afd5d9eb9334b291d84489e.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'key-string.c')
| -rw-r--r-- | key-string.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/key-string.c b/key-string.c index 119035a0..bbbe346c 100644 --- a/key-string.c +++ b/key-string.c @@ -226,6 +226,7 @@ key_string_lookup_key(key_code key) char tmp[8]; u_int i; struct utf8_data ud; + size_t off; *out = '\0'; @@ -270,8 +271,9 @@ key_string_lookup_key(key_code key) /* Is this a UTF-8 key? */ if (key > 127 && key < KEYC_BASE) { if (utf8_split(key, &ud) == UTF8_DONE) { - memcpy(out, ud.data, ud.size); - out[ud.size] = '\0'; + off = strlen(out); + memcpy(out + off, ud.data, ud.size); + out[off + ud.size] = '\0'; return (out); } } |