StreetLight
/
libxkbcommon
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

scanner: allow for a zero terminated string as keymap 

As the documentation for xkb_keymap_new_from_buffer() states, the "input string
does not have to be zero-terminated". The actual implementation however failed
with "unrecognized token/syntax error" when it encountered a null byte.

Fix this by allowing a null byte at the last position of the buffer. Anything
else is likely a client error anyway.

Fixes #307
master
Peter Hutterer 2023-05-02 14:15:55 +10:00
parent 98b3314278
commit b06aedb8ba
2 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/keymap.c
View File

@ -194,6 +194,10 @@ xkb_keymap_new_from_buffer(struct xkb_context *ctx,
if (!keymap) if (!keymap)
return NULL; return NULL;
/* Allow a zero-terminated string as a buffer */
if (length > 0 && buffer[length - 1] == '\0')
length--;
if (!ops->keymap_new_from_string(keymap, buffer, length)) { if (!ops->keymap_new_from_string(keymap, buffer, length)) {
xkb_keymap_unref(keymap); xkb_keymap_unref(keymap);
return NULL; return NULL;

40
test/buffercomp.c
View File

@ -46,29 +46,33 @@ main(int argc, char *argv[])
original = test_read_file(DATA_PATH); original = test_read_file(DATA_PATH);
assert(original); assert(original);
keymap = test_compile_buffer(ctx, original, strlen(original)); /* Load a prebuild keymap, once without, once with the trailing \0 */
assert(keymap); for (int i = 0; i <= 1; i++) {
keymap = test_compile_buffer(ctx, original, strlen(original) + i);
assert(keymap);
dump = xkb_keymap_get_as_string(keymap, XKB_KEYMAP_USE_ORIGINAL_FORMAT); dump = xkb_keymap_get_as_string(keymap, XKB_KEYMAP_USE_ORIGINAL_FORMAT);
assert(dump); assert(dump);
if (!streq(original, dump)) { if (!streq(original, dump)) {
fprintf(stderr, fprintf(stderr,
"round-trip test failed: dumped map differs from original\n"); "round-trip test failed: dumped map differs from original\n");
fprintf(stderr, "path to original file: %s\n", fprintf(stderr, "path to original file: %s\n",
test_get_path(DATA_PATH)); test_get_path(DATA_PATH));
fprintf(stderr, "length: dumped %lu, original %lu\n", fprintf(stderr, "length: dumped %lu, original %lu\n",
(unsigned long) strlen(dump), (unsigned long) strlen(dump),
(unsigned long) strlen(original)); (unsigned long) strlen(original));
fprintf(stderr, "dumped map:\n"); fprintf(stderr, "dumped map:\n");
fprintf(stderr, "%s\n", dump); fprintf(stderr, "%s\n", dump);
fflush(stderr); fflush(stderr);
assert(0); assert(0);
}
free(dump);
xkb_keymap_unref(keymap);
} }
free(original); free(original);
free(dump);
xkb_keymap_unref(keymap);
/* Make sure we can't (falsely claim to) compile an empty string. */ /* Make sure we can't (falsely claim to) compile an empty string. */
keymap = test_compile_buffer(ctx, "", 0); keymap = test_compile_buffer(ctx, "", 0);