[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 11/21] hw/i386/acpi: Assert a pointer is not null BEF
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 11/21] hw/i386/acpi: Assert a pointer is not null BEFORE using it |
Date: |
Wed, 15 May 2019 22:50:23 +0200 |
From: Philippe Mathieu-Daudé <address@hidden>
Commit 72c194f7e75c added a non-null check on the 'obj' pointer.
Later, commit 500b11ea5095 added code which uses the 'obj'
pointer _before_ the assertion check. Move the assertion
_before_ the pointer use.
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/i386/acpi-build.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 123ff2b..b4ec14e 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -186,6 +186,7 @@ static void acpi_get_pm_info(AcpiPmInfo *pm)
pm->pcihp_io_base = 0;
pm->pcihp_io_len = 0;
+ assert(obj);
init_common_fadt_data(obj, &pm->fadt);
if (piix) {
/* w2k requires FADT(rev1) or it won't boot, keep PC compatible */
@@ -204,7 +205,6 @@ static void acpi_get_pm_info(AcpiPmInfo *pm)
pm->fadt.flags |= 1 << ACPI_FADT_F_RESET_REG_SUP;
pm->cpu_hp_io_base = ICH9_CPU_HOTPLUG_IO_BASE;
}
- assert(obj);
/* The above need not be conditional on machine type because the reset port
* happens to be the same on PIIX (pc) and ICH9 (q35). */
--
1.8.3.1
- [Qemu-devel] [PULL 02/21] roms: assert if max rom size is less than the used size, (continued)
- [Qemu-devel] [PULL 02/21] roms: assert if max rom size is less than the used size, Paolo Bonzini, 2019/05/15
- [Qemu-devel] [PULL 03/21] Declare -realtime as deprecated, Paolo Bonzini, 2019/05/15
- [Qemu-devel] [PULL 04/21] vl: Add missing descriptions to the VGA adapters list, Paolo Bonzini, 2019/05/15
- [Qemu-devel] [PULL 05/21] megasas: fix mapped frame size, Paolo Bonzini, 2019/05/15
- [Qemu-devel] [PULL 06/21] hvf: Add missing break statement, Paolo Bonzini, 2019/05/15
- [Qemu-devel] [PULL 08/21] memory: correct the comment to DIRTY_MEMORY_MIGRATION, Paolo Bonzini, 2019/05/15
- [Qemu-devel] [PULL 07/21] vl: fix -sandbox parsing crash when seccomp support is disabled, Paolo Bonzini, 2019/05/15
- [Qemu-devel] [PULL 09/21] hw/acpi/piix4: Move TYPE_PIIX4_PM to a public header, Paolo Bonzini, 2019/05/15
- [Qemu-devel] [PULL 10/21] hw/i386/acpi: Add object_resolve_type_unambiguous to improve modularity, Paolo Bonzini, 2019/05/15
- [Qemu-devel] [PULL 11/21] hw/i386/acpi: Assert a pointer is not null BEFORE using it,
Paolo Bonzini <=
- [Qemu-devel] [PULL 12/21] mips-fulong2e: obey -vga none, Paolo Bonzini, 2019/05/15
- [Qemu-devel] [PULL 13/21] sun4m: obey -vga none, Paolo Bonzini, 2019/05/15
- [Qemu-devel] [PULL 14/21] trace: only include trace-event-subdirs when they are needed, Paolo Bonzini, 2019/05/15
- [Qemu-devel] [PULL 20/21] hw/char: Move multi-serial devices into separate file, Paolo Bonzini, 2019/05/15
- [Qemu-devel] [PULL 19/21] ioapic: allow buggy guests mishandling level-triggered interrupts to make progress, Paolo Bonzini, 2019/05/15
- [Qemu-devel] [PULL 17/21] build: chardev is only needed for softmmu targets, Paolo Bonzini, 2019/05/15
- [Qemu-devel] [PULL 15/21] build: replace GENERATED_FILES by generated-files-y, Paolo Bonzini, 2019/05/15
- [Qemu-devel] [PULL 16/21] configure: qemu-ga is only needed with softmmu targets, Paolo Bonzini, 2019/05/15
- [Qemu-devel] [PULL 18/21] build: don't build hardware objects with linux-user, Paolo Bonzini, 2019/05/15