On Mon, Dec 13, 2021 at 3:16 PM Kostiantyn Kostiuk
<konstan...@daynix.com> wrote:
>
> To prevent memory leaks, always try to free initialized variables.
>
> Signed-off-by: Kostiantyn Kostiuk <kkost...@redhat.com>
> Signed-off-by: Kostiantyn Kostiuk <konstan...@daynix.com>
Reviewed-by: Marc-André Lureau <marcandre.lur...@gmail.com>
(nit: since it's a common return point, I would rather name the label
"end" instead)
> ---
> qga/commands-win32.c | 25 ++++++++++++-------------
> 1 file changed, 12 insertions(+), 13 deletions(-)
>
> diff --git a/qga/commands-win32.c b/qga/commands-win32.c
> index 3dd74fe225..12f7a88078 100644
> --- a/qga/commands-win32.c
> +++ b/qga/commands-win32.c
> @@ -532,7 +532,7 @@ static GuestPCIAddress *get_pci_info(int number, Error
> **errp)
> DIGCF_PRESENT | DIGCF_DEVICEINTERFACE);
> if (dev_info == INVALID_HANDLE_VALUE) {
> error_setg_win32(errp, GetLastError(), "failed to get devices tree");
> - goto out;
> + goto cleanup;
> }
>
> g_debug("enumerating devices");
> @@ -562,7 +562,7 @@ static GuestPCIAddress *get_pci_info(int number, Error
> **errp)
> } else {
> error_setg_win32(errp, GetLastError(),
> "failed to get device interfaces");
> - goto free_dev_info;
> + goto cleanup;
> }
> }
>
> @@ -576,7 +576,7 @@ static GuestPCIAddress *get_pci_info(int number, Error
> **errp)
> CloseHandle(dev_file);
> error_setg_win32(errp, GetLastError(),
> "failed to get device slot number");
> - goto free_dev_info;
> + goto cleanup;
> }
>
> CloseHandle(dev_file);
> @@ -586,7 +586,7 @@ static GuestPCIAddress *get_pci_info(int number, Error
> **errp)
> } else {
> error_setg_win32(errp, GetLastError(),
> "failed to get device interfaces");
> - goto free_dev_info;
> + goto cleanup;
> }
>
> g_debug("found device slot %d. Getting storage controller", number);
> @@ -603,7 +603,7 @@ static GuestPCIAddress *get_pci_info(int number, Error
> **errp)
> } else {
> error_setg_win32(errp, GetLastError(),
> "failed to get device instance ID");
> - goto out;
> + goto cleanup;
> }
> }
>
> @@ -617,14 +617,14 @@ static GuestPCIAddress *get_pci_info(int number, Error
> **errp)
> g_error("CM_Locate_DevInst failed with code %lx", cr);
> error_setg_win32(errp, GetLastError(),
> "failed to get device instance");
> - goto out;
> + goto cleanup;
> }
> cr = CM_Get_Parent(&parent_dev_inst, dev_inst, 0);
> if (cr != CR_SUCCESS) {
> g_error("CM_Get_Parent failed with code %lx", cr);
> error_setg_win32(errp, GetLastError(),
> "failed to get parent device instance");
> - goto out;
> + goto cleanup;
> }
>
> cr = CM_Get_Device_ID_Size(&dev_id_size, parent_dev_inst, 0);
> @@ -632,7 +632,7 @@ static GuestPCIAddress *get_pci_info(int number, Error
> **errp)
> g_error("CM_Get_Device_ID_Size failed with code %lx", cr);
> error_setg_win32(errp, GetLastError(),
> "failed to get parent device ID length");
> - goto out;
> + goto cleanup;
> }
>
> ++dev_id_size;
> @@ -647,7 +647,7 @@ static GuestPCIAddress *get_pci_info(int number, Error
> **errp)
> g_error("CM_Get_Device_ID failed with code %lx", cr);
> error_setg_win32(errp, GetLastError(),
> "failed to get parent device ID");
> - goto out;
> + goto cleanup;
> }
> }
>
> @@ -661,14 +661,14 @@ static GuestPCIAddress *get_pci_info(int number, Error
> **errp)
> if (parent_dev_info == INVALID_HANDLE_VALUE) {
> error_setg_win32(errp, GetLastError(),
> "failed to get parent device");
> - goto out;
> + goto cleanup;
> }
>
> parent_dev_info_data.cbSize = sizeof(SP_DEVINFO_DATA);
> if (!SetupDiEnumDeviceInfo(parent_dev_info, 0,
> &parent_dev_info_data)) {
> error_setg_win32(errp, GetLastError(),
> "failed to get parent device data");
> - goto out;
> + goto cleanup;
> }
>
> for (j = 0;
> @@ -748,11 +748,10 @@ static GuestPCIAddress *get_pci_info(int number, Error
> **errp)
> break;
> }
>
> -free_dev_info:
> +cleanup:
> if (dev_info != INVALID_HANDLE_VALUE) {
> SetupDiDestroyDeviceInfoList(dev_info);
> }
> -out:
> return pci;
> }
>
> --
> 2.25.1
>
