[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 17/18] mips: fix potential fopen(NULL,...)
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PATCH v3 17/18] mips: fix potential fopen(NULL,...) |
Date: |
Thu, 4 Jan 2018 17:05:22 +0100 |
Spotted thanks to ASAN.
Signed-off-by: Marc-André Lureau <address@hidden>
---
hw/nvram/ds1225y.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/hw/nvram/ds1225y.c b/hw/nvram/ds1225y.c
index 57d5ab2154..ad7345f288 100644
--- a/hw/nvram/ds1225y.c
+++ b/hw/nvram/ds1225y.c
@@ -80,7 +80,7 @@ static int nvram_post_load(void *opaque, int version_id)
}
/* Write back nvram contents */
- s->file = fopen(s->filename, "wb");
+ s->file = s->filename ? fopen(s->filename, "wb") : NULL;
if (s->file) {
/* Write back contents, as 'wb' mode cleaned the file */
if (fwrite(s->contents, s->chip_size, 1, s->file) != 1) {
@@ -126,7 +126,7 @@ static int nvram_sysbus_initfn(SysBusDevice *dev)
sysbus_init_mmio(dev, &s->iomem);
/* Read current file */
- file = fopen(s->filename, "rb");
+ file = s->filename ? fopen(s->filename, "rb") : NULL;
if (file) {
/* Read nvram contents */
if (fread(s->contents, s->chip_size, 1, file) != 1) {
--
2.15.1.355.g36791d7216
- Re: [Qemu-devel] [PATCH v3 12/18] crypto: fix stack-buffer-overflow error, (continued)
[Qemu-devel] [PATCH v3 17/18] mips: fix potential fopen(NULL,...),
Marc-André Lureau <=
[Qemu-devel] [PATCH v3 16/18] tests: fix coroutine leak in /basic/entered, Marc-André Lureau, 2018/01/04
[Qemu-devel] [PATCH v3 18/18] disas/s390: fix global-buffer-overflow, Marc-André Lureau, 2018/01/04
Re: [Qemu-devel] [PATCH v3 00/18] Various build-sys and sanitizer related fixes, no-reply, 2018/01/04
Re: [Qemu-devel] [PATCH v3 00/18] Various build-sys and sanitizer related fixes, Paolo Bonzini, 2018/01/05