From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Paolo Bonzini" <pbonzini@redhat.com>,
"Daniel P. Berrangé" <berrange@redhat.com>,
"Gerd Hoffmann" <kraxel@redhat.com>,
"Eduardo Habkost" <ehabkost@redhat.com>
Subject: [PULL 3/4] ui: fix vc_chr_write call in text_console_do_init
Date: Mon, 13 Jul 2020 16:10:48 +0200 [thread overview]
Message-ID: <20200713141049.2241-4-kraxel@redhat.com> (raw)
In-Reply-To: <20200713141049.2241-1-kraxel@redhat.com>
In case the string doesn't fit into the buffer snprintf returns the size
it would need, so len can be larger than the buffer. Fix this by simply
using g_strdup_printf() instead of a static buffer.
Reported-by: Wenxiang Qian <leonwxqian@gmail.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Message-id: 20200701181801.27935-1-kraxel@redhat.com
---
ui/console.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/ui/console.c b/ui/console.c
index 08f75c9bf624..0579be792f33 100644
--- a/ui/console.c
+++ b/ui/console.c
@@ -2184,12 +2184,12 @@ static void text_console_do_init(Chardev *chr, DisplayState *ds)
text_console_resize(s);
if (chr->label) {
- char msg[128];
- int len;
+ char *msg;
s->t_attrib.bgcol = QEMU_COLOR_BLUE;
- len = snprintf(msg, sizeof(msg), "%s console\r\n", chr->label);
- vc_chr_write(chr, (uint8_t *)msg, len);
+ msg = g_strdup_printf("%s console\r\n", chr->label);
+ vc_chr_write(chr, (uint8_t *)msg, strlen(msg));
+ g_free(msg);
s->t_attrib = s->t_attrib_default;
}
--
2.18.4
next prev parent reply other threads:[~2020-07-13 14:12 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-13 14:10 [PULL 0/4] Fixes 20200713 patches Gerd Hoffmann
2020-07-13 14:10 ` [PULL 1/4] ossaudio: fix out of bounds write Gerd Hoffmann
2020-07-13 14:10 ` [PULL 2/4] docs/qdev-device-use: Clean up the sentences related to -usbdevice Gerd Hoffmann
2020-07-13 14:14 ` Peter Maydell
2020-07-13 14:10 ` Gerd Hoffmann [this message]
2020-07-13 14:10 ` [PULL 4/4] usb: fix usb-host build on windows Gerd Hoffmann
2020-07-13 17:58 ` [PULL 0/4] Fixes 20200713 patches Peter Maydell
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=20200713141049.2241-4-kraxel@redhat.com \
--to=kraxel@redhat.com \
--cc=berrange@redhat.com \
--cc=ehabkost@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).