From c31bc98e3bcf52fe1cd4b9b7a70869330eae80ea Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Thu, 28 Mar 2013 18:43:04 +0000 Subject: [PATCH] hw/milkymist-softusb: set buffer in softusb_read_{dmem, pmem} error path Make sure we set the buffer to something in the softusb_read_{dmem,pmem} error paths, since the caller will use the buffer unconditionally. (Newer gcc is smart enough to spot this and complain about 'may be used uninitialized'.) Signed-off-by: Peter Maydell Message-id: 1364496184-11994-1-git-send-email-peter.maydell@linaro.org Signed-off-by: Anthony Liguori --- hw/milkymist-softusb.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hw/milkymist-softusb.c b/hw/milkymist-softusb.c index b279d4e908..90a0ae5769 100644 --- a/hw/milkymist-softusb.c +++ b/hw/milkymist-softusb.c @@ -132,6 +132,7 @@ static inline void softusb_read_dmem(MilkymistSoftUsbState *s, if (offset + len >= s->dmem_size) { error_report("milkymist_softusb: read dmem out of bounds " "at offset 0x%x, len %d", offset, len); + memset(buf, 0, len); return; } @@ -156,6 +157,7 @@ static inline void softusb_read_pmem(MilkymistSoftUsbState *s, if (offset + len >= s->pmem_size) { error_report("milkymist_softusb: read pmem out of bounds " "at offset 0x%x, len %d", offset, len); + memset(buf, 0, len); return; }