2017-06-26 12:10:20 +02:00
|
|
|
From 93971b136370f4d22269a605a2d1d60cb0fa185a Mon Sep 17 00:00:00 2001
|
2017-05-23 02:39:19 +02:00
|
|
|
From: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
|
|
Date: Wed, 3 May 2017 12:44:41 +0200
|
|
|
|
|
Subject: [PATCH] jazz_led: fix bad snprintf
|
|
|
|
|
|
|
|
|
|
Detected by GCC 7's -Wformat-truncation. snprintf writes at most
|
|
|
|
|
2 bytes here including the terminating NUL, so the result is
|
|
|
|
|
truncated. In addition, the newline at the end is pointless.
|
|
|
|
|
Fix the buffer size and the format string.
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
|
|
Reviewed-by: Markus Armbruster <armbru@redhat.com>
|
|
|
|
|
Reviewed-by: Laurent Vivier <lvivier@redhat.com>
|
|
|
|
|
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
|
|
|
|
|
(cherry picked from commit e9c6ab62c760e333a6cf0f3f9ab021633723434c)
|
|
|
|
|
[LY: BSC#1040228]
|
|
|
|
|
Signed-off-by: Liang Yan <lyan@suse.com>
|
|
|
|
|
---
|
|
|
|
|
hw/display/jazz_led.c | 4 ++--
|
|
|
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/hw/display/jazz_led.c b/hw/display/jazz_led.c
|
|
|
|
|
index b72fdb1717..3c97d56434 100644
|
|
|
|
|
--- a/hw/display/jazz_led.c
|
|
|
|
|
+++ b/hw/display/jazz_led.c
|
|
|
|
|
@@ -227,13 +227,13 @@ static void jazz_led_invalidate_display(void *opaque)
|
|
|
|
|
static void jazz_led_text_update(void *opaque, console_ch_t *chardata)
|
|
|
|
|
{
|
|
|
|
|
LedState *s = opaque;
|
|
|
|
|
- char buf[2];
|
|
|
|
|
+ char buf[3];
|
|
|
|
|
|
|
|
|
|
dpy_text_cursor(s->con, -1, -1);
|
|
|
|
|
qemu_console_resize(s->con, 2, 1);
|
|
|
|
|
|
|
|
|
|
/* TODO: draw the segments */
|
|
|
|
|
- snprintf(buf, 2, "%02hhx\n", s->segments);
|
|
|
|
|
+ snprintf(buf, 3, "%02hhx", s->segments);
|
|
|
|
|
console_write_ch(chardata++, ATTR2CHTYPE(buf[0], QEMU_COLOR_BLUE,
|
|
|
|
|
QEMU_COLOR_BLACK, 1));
|
|
|
|
|
console_write_ch(chardata++, ATTR2CHTYPE(buf[1], QEMU_COLOR_BLUE,
|
