summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2013-03-28 18:43:04 +0000
committerAnthony Liguori <aliguori@us.ibm.com>2013-04-01 09:08:33 -0500
commitc31bc98e3bcf52fe1cd4b9b7a70869330eae80ea (patch)
tree0f10ab513abcc99d67f91fe9912a857bcd67582a
parentc34e120554c31d45bdfbac08a5c1d9ef92a62020 (diff)
downloadfocaccia-qemu-c31bc98e3bcf52fe1cd4b9b7a70869330eae80ea.tar.gz
focaccia-qemu-c31bc98e3bcf52fe1cd4b9b7a70869330eae80ea.zip
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 <peter.maydell@linaro.org>
Message-id: 1364496184-11994-1-git-send-email-peter.maydell@linaro.org
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rw-r--r--hw/milkymist-softusb.c2
1 files changed, 2 insertions, 0 deletions
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;
     }