[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 25/52] mips: fix potential fopen(NULL,...)
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 25/52] mips: fix potential fopen(NULL,...) |
Date: |
Fri, 12 Jan 2018 12:30:49 +0100 |
From: Marc-André Lureau <address@hidden>
Spotted thanks to ASAN.
Signed-off-by: Marc-André Lureau <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <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 57d5ab2..ad7345f 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) {
--
1.8.3.1
- [Qemu-devel] [PULL 09/52] build-sys: fix qemu-ga -pthread linking, (continued)
- [Qemu-devel] [PULL 09/52] build-sys: fix qemu-ga -pthread linking, Paolo Bonzini, 2018/01/12
- [Qemu-devel] [PULL 14/52] tests/docker: add test-debug, Paolo Bonzini, 2018/01/12
- [Qemu-devel] [PULL 16/52] tests: fix check-qobject leak, Paolo Bonzini, 2018/01/12
- [Qemu-devel] [PULL 13/52] tests/docker: add some sanitizers to fedora dockerfile, Paolo Bonzini, 2018/01/12
- [Qemu-devel] [PULL 11/52] build-sys: add a rule to print a variable, Paolo Bonzini, 2018/01/12
- [Qemu-devel] [PULL 17/52] vl: fix direct firmware directories leak, Paolo Bonzini, 2018/01/12
- [Qemu-devel] [PULL 18/52] readline: add a free function, Paolo Bonzini, 2018/01/12
- [Qemu-devel] [PULL 20/52] crypto: fix stack-buffer-overflow error, Paolo Bonzini, 2018/01/12
- [Qemu-devel] [PULL 19/52] tests: fix migration-test leak, Paolo Bonzini, 2018/01/12
- [Qemu-devel] [PULL 23/52] ucontext: annotate coroutine stack for ASAN, Paolo Bonzini, 2018/01/12
- [Qemu-devel] [PULL 25/52] mips: fix potential fopen(NULL,...),
Paolo Bonzini <=
- [Qemu-devel] [PULL 21/52] qemu-config: fix leak in query-command-line-options, Paolo Bonzini, 2018/01/12
- [Qemu-devel] [PULL 22/52] tests: fix qmp-test leak, Paolo Bonzini, 2018/01/12
- [Qemu-devel] [PULL 26/52] disas/s390: fix global-buffer-overflow, Paolo Bonzini, 2018/01/12
- [Qemu-devel] [PULL 27/52] scsi-disk: release AioContext in unaligned WRITE SAME case, Paolo Bonzini, 2018/01/12
- [Qemu-devel] [PULL 24/52] tests: fix coroutine leak in /basic/entered, Paolo Bonzini, 2018/01/12
- [Qemu-devel] [PULL 28/52] tests/boot-serial-test: Add tests for microblaze boards, Paolo Bonzini, 2018/01/12
- [Qemu-devel] [PULL 29/52] tests/boot-serial-test: Add a test for the moxiesim machine, Paolo Bonzini, 2018/01/12
- [Qemu-devel] [PULL 32/52] target/i386: hax: change to use x86_update_hflags, Paolo Bonzini, 2018/01/12
- [Qemu-devel] [PULL 31/52] target/i386: move hflags update code to a function, Paolo Bonzini, 2018/01/12
- [Qemu-devel] [PULL 35/52] scripts/qemu-gdb: add simple tcg lock status helper, Paolo Bonzini, 2018/01/12