From: KONRAD Frederic <frederic.konrad@adacore.com>
Date: Fri, 24 Jul 2020 06:44:56 +0000 (+0100)
Subject: semihosting: don't send the trailing '\0'
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=7d2d6522bbadfa8d9877e38bfa7413444fa64fbb;p=people%2Fdariof%2Fqemu-xen.git

semihosting: don't send the trailing '\0'

Don't send the trailing 0 from the string.

Signed-off-by: KONRAD Frederic <frederic.konrad@adacore.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <1592215252-26742-2-git-send-email-frederic.konrad@adacore.com>
Message-Id: <20200724064509.331-4-alex.bennee@linaro.org>
---

diff --git a/hw/semihosting/console.c b/hw/semihosting/console.c
index 22e7827824..9b4fee9260 100644
--- a/hw/semihosting/console.c
+++ b/hw/semihosting/console.c
@@ -52,7 +52,9 @@ static GString *copy_user_string(CPUArchState *env, target_ulong addr)
 
     do {
         if (cpu_memory_rw_debug(cpu, addr++, &c, 1, 0) == 0) {
-            s = g_string_append_c(s, c);
+            if (c) {
+                s = g_string_append_c(s, c);
+            }
         } else {
             qemu_log_mask(LOG_GUEST_ERROR,
                           "%s: passed inaccessible address " TARGET_FMT_lx,