[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v2 3/6] gqa-win: get_pci_info: Free parent_dev_info properly
From: |
Marc-André Lureau |
Subject: |
Re: [PATCH v2 3/6] gqa-win: get_pci_info: Free parent_dev_info properly |
Date: |
Tue, 14 Dec 2021 17:26:59 +0400 |
On Tue, Dec 14, 2021 at 4:41 PM Kostiantyn Kostiuk
<konstantin@daynix.com> wrote:
>
> In case when the function fails to get parent device data,
> the parent_dev_info variable will be initialized, but not freed.
>
> Signed-off-by: Kostiantyn Kostiuk <kkostiuk@redhat.com>
> Signed-off-by: Kostiantyn Kostiuk <konstantin@daynix.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
> qga/commands-win32.c | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/qga/commands-win32.c b/qga/commands-win32.c
> index 93c5375132..f6de9e2676 100644
> --- a/qga/commands-win32.c
> +++ b/qga/commands-win32.c
> @@ -515,6 +515,8 @@ DEFINE_GUID(GUID_DEVINTERFACE_STORAGEPORT,
> static GuestPCIAddress *get_pci_info(int number, Error **errp)
> {
> HDEVINFO dev_info = INVALID_HANDLE_VALUE;
> + HDEVINFO parent_dev_info = INVALID_HANDLE_VALUE;
> +
> SP_DEVINFO_DATA dev_info_data;
> SP_DEVICE_INTERFACE_DATA dev_iface_data;
> HANDLE dev_file;
> @@ -542,7 +544,6 @@ static GuestPCIAddress *get_pci_info(int number, Error
> **errp)
> PSP_DEVICE_INTERFACE_DETAIL_DATA pdev_iface_detail_data = NULL;
> STORAGE_DEVICE_NUMBER sdn;
> char *parent_dev_id = NULL;
> - HDEVINFO parent_dev_info;
> SP_DEVINFO_DATA parent_dev_info_data;
> DWORD j;
> DWORD size = 0;
> @@ -744,11 +745,13 @@ static GuestPCIAddress *get_pci_info(int number, Error
> **errp)
> break;
> }
> }
> - SetupDiDestroyDeviceInfoList(parent_dev_info);
> break;
> }
>
> end:
> + if (parent_dev_info != INVALID_HANDLE_VALUE) {
> + SetupDiDestroyDeviceInfoList(parent_dev_info);
> + }
> if (dev_info != INVALID_HANDLE_VALUE) {
> SetupDiDestroyDeviceInfoList(dev_info);
> }
> --
> 2.25.1
>
- [PATCH v2 0/6] gqa-win: get_pci_info: Fix memory leak, Kostiantyn Kostiuk, 2021/12/14
- [PATCH v2 2/6] gqa-win: get_pci_info: Use common 'end' label, Kostiantyn Kostiuk, 2021/12/14
- [PATCH v2 5/6] gqa-win: get_pci_info: Add g_autofree for few variables, Kostiantyn Kostiuk, 2021/12/14
- [PATCH v2 1/6] gqa-win: get_pci_info: Clean dev_info if handle is valid, Kostiantyn Kostiuk, 2021/12/14
- [PATCH v2 3/6] gqa-win: get_pci_info: Free parent_dev_info properly, Kostiantyn Kostiuk, 2021/12/14
- Re: [PATCH v2 3/6] gqa-win: get_pci_info: Free parent_dev_info properly,
Marc-André Lureau <=
- [PATCH v2 6/6] gqa-win: get_pci_info: Replace 'while' with 2 calls of the function, Kostiantyn Kostiuk, 2021/12/14
- [PATCH v2 4/6] gqa-win: get_pci_info: Split logic to separate functions, Kostiantyn Kostiuk, 2021/12/14