From: "Javier Pello García" <javier.pello@urjc.es> To: "kbd@lists.altlinux.org" <kbd@lists.altlinux.org> Subject: [kbd] [PATCH] libkeymap: Fix mk_mapname for the plain map Date: Fri, 6 Dec 2019 15:58:03 +0000 Message-ID: <20191206165759.81e4f6e3b62f22433ef27c65@urjc.es> (raw) mk_mapname did not correctly return "plain" for the plain map (no modifier set) if it had already been called, as it did not correctly reset the static buffer that it uses for the map name. When mk_mapname is called for the first time from the first loop in lk_dump_ctable, all is fine, since buf has not been used yet and it is initialised to 0. However, when it is called again for the plain map from the second loop in lk_dump_ctable, buf already contains a value (left over from the last iteration in the first loop), and then strcat appends "plain" to that value instead of overwriting it, resulting in a bogus value. Signed-off-by: Javier Pello <javier.pello@urjc.es> --- src/libkeymap/dump.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/libkeymap/dump.c b/src/libkeymap/dump.c index 8531b5aa..02c8eab4 100644 --- a/src/libkeymap/dump.c +++ b/src/libkeymap/dump.c @@ -91,7 +91,7 @@ fail: return -1; } -static char * +static const char * mk_mapname(char modifier) { static const char *mods[8] = { @@ -100,10 +100,8 @@ mk_mapname(char modifier) static char buf[60]; int i; - if (!modifier) { - strcat(buf, "plain"); - return buf; - } + if (!modifier) + return "plain"; buf[0] = 0; for (i = 0; i < 8; i++) if (modifier & (1 << i)) { -- 2.23.0
next reply other threads:[~2019-12-06 15:58 UTC|newest] Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-12-06 15:58 Javier Pello García [this message] 2020-02-23 17:36 ` Alexey Gladkov
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20191206165759.81e4f6e3b62f22433ef27c65@urjc.es \ --to=javier.pello@urjc.es \ --cc=kbd@lists.altlinux.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
Linux console tools development discussion This inbox may be cloned and mirrored by anyone: git clone --mirror http://lore.altlinux.org/kbd/0 kbd/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 kbd kbd/ http://lore.altlinux.org/kbd \ kbd@lists.altlinux.org kbd@lists.altlinux.ru kbd@lists.altlinux.com public-inbox-index kbd Example config snippet for mirrors. Newsgroup available over NNTP: nntp://lore.altlinux.org/org.altlinux.lists.kbd AGPL code for this site: git clone https://public-inbox.org/public-inbox.git