From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50409) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cRFZ0-0004s4-Bx for qemu-devel@nongnu.org; Wed, 11 Jan 2017 04:51:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cRFYz-0001kQ-KT for qemu-devel@nongnu.org; Wed, 11 Jan 2017 04:51:26 -0500 Received: from mx1.redhat.com ([209.132.183.28]:33912) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cRFYz-0001jT-EH for qemu-devel@nongnu.org; Wed, 11 Jan 2017 04:51:25 -0500 From: Stefan Hajnoczi Date: Wed, 11 Jan 2017 09:44:43 +0000 Message-Id: <20170111094443.2790-1-stefanha@redhat.com> Subject: [Qemu-devel] [PATCH] nvdimm acpi: fix g_array_free() with NULL pointer List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: imammedo@redhat.com, "Michael S. Tsirkin" , Stefan Hajnoczi , Xiao Guangrong Unlike g_free(), g_array_free() does not accept a NULL pointer argument. The following error is logged when an nvdimm device is realized: GLib-CRITICAL **: g_array_free: assertion 'array' failed Cc: Xiao Guangrong Signed-off-by: Stefan Hajnoczi --- hw/acpi/nvdimm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hw/acpi/nvdimm.c b/hw/acpi/nvdimm.c index 8e7d6ec..8f0a484 100644 --- a/hw/acpi/nvdimm.c +++ b/hw/acpi/nvdimm.c @@ -375,7 +375,9 @@ static void nvdimm_init_fit_buffer(NvdimmFitBuffer *fit_buf) static void nvdimm_build_fit_buffer(NvdimmFitBuffer *fit_buf) { - g_array_free(fit_buf->fit, true); + if (fit_buf->fit) { + g_array_free(fit_buf->fit, true); + } fit_buf->fit = nvdimm_build_device_structure(); fit_buf->dirty = true; } -- 2.9.3