summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShannon Zhao <shannon.zhao@linaro.org>2016-07-07 13:47:01 +0100
committerPeter Maydell <peter.maydell@linaro.org>2016-07-07 13:47:01 +0100
commiteef9f19eea26cd8b4553459118f87d7150b53c5a (patch)
tree3008b59630190af1da09fe27296c193d6ae9ce37
parente0dadc1e9ef1f35208e5d2af9c7740c18a0b769f (diff)
downloadqemu-eef9f19eea26cd8b4553459118f87d7150b53c5a.tar.gz
qemu-eef9f19eea26cd8b4553459118f87d7150b53c5a.tar.bz2
qemu-eef9f19eea26cd8b4553459118f87d7150b53c5a.zip
hw/block/m25p80: fix resource leak
These two are spot by Coverity 1357232 and 1357233. Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org> Message-id: 1467684998-12076-1-git-send-email-zhaoshenglong@huawei.com Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-rw-r--r--hw/block/m25p80.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c
index d9b27939dd..ca8c12c0f8 100644
--- a/hw/block/m25p80.c
+++ b/hw/block/m25p80.c
@@ -459,12 +459,13 @@ static void blk_sync_complete(void *opaque, int ret)
static void flash_sync_page(Flash *s, int page)
{
- QEMUIOVector *iov = g_new(QEMUIOVector, 1);
+ QEMUIOVector *iov;
if (!s->blk || blk_is_read_only(s->blk)) {
return;
}
+ iov = g_new(QEMUIOVector, 1);
qemu_iovec_init(iov, 1);
qemu_iovec_add(iov, s->storage + page * s->pi->page_size,
s->pi->page_size);
@@ -474,13 +475,14 @@ static void flash_sync_page(Flash *s, int page)
static inline void flash_sync_area(Flash *s, int64_t off, int64_t len)
{
- QEMUIOVector *iov = g_new(QEMUIOVector, 1);
+ QEMUIOVector *iov;
if (!s->blk || blk_is_read_only(s->blk)) {
return;
}
assert(!(len % BDRV_SECTOR_SIZE));
+ iov = g_new(QEMUIOVector, 1);
qemu_iovec_init(iov, 1);
qemu_iovec_add(iov, s->storage + off, len);
blk_aio_pwritev(s->blk, off, iov, 0, blk_sync_complete, iov);