From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34639) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g81st-000411-H4 for qemu-devel@nongnu.org; Thu, 04 Oct 2018 07:33:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g81iO-0003Sw-5m for qemu-devel@nongnu.org; Thu, 04 Oct 2018 07:22:48 -0400 Received: from mail-wr1-f67.google.com ([209.85.221.67]:39952) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1g81iN-0003Sl-VE for qemu-devel@nongnu.org; Thu, 04 Oct 2018 07:22:44 -0400 Received: by mail-wr1-f67.google.com with SMTP id d2-v6so5058522wro.7 for ; Thu, 04 Oct 2018 04:22:43 -0700 (PDT) From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Golembiovsk=C3=BD?= Date: Thu, 4 Oct 2018 13:22:29 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PATCH v4 02/11] qga-win: handle NULL values List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Eric Blake , Sameeh Jubran , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Olga Krishtal , Michael Roth , =?UTF-8?q?Tom=C3=A1=C5=A1=20Golembiovsk=C3=BD?= Handle returned NULLs properly to: - avoid crashes in serialization. - properly report errors to the caller Signed-off-by: Tomáš Golembiovský --- qga/commands-win32.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/qga/commands-win32.c b/qga/commands-win32.c index 9c959122d9..49fc747298 100644 --- a/qga/commands-win32.c +++ b/qga/commands-win32.c @@ -735,6 +735,12 @@ static GuestFilesystemInfo *build_guest_fsinfo(char *guid, Error **errp) } fs->type = g_strdup(fs_name); fs->disk = build_guest_disk_info(guid, errp); + if (fs->disk == NULL) { + g_free(fs); + fs = NULL; + goto free; + } + free: g_free(mnt_point); return fs; @@ -755,7 +761,7 @@ GuestFilesystemInfoList *qmp_guest_get_fsinfo(Error **errp) do { GuestFilesystemInfo *info = build_guest_fsinfo(guid, errp); if (info == NULL) { - continue; + goto out; } new = g_malloc(sizeof(*ret)); new->value = info; @@ -767,6 +773,7 @@ GuestFilesystemInfoList *qmp_guest_get_fsinfo(Error **errp) error_setg_win32(errp, GetLastError(), "failed to find next volume"); } +out: FindVolumeClose(vol_h); return ret; } -- 2.19.0