diff mbox series

[v2,2/6] gqa-win: get_pci_info: Use common 'end' label

Message ID 20211214124109.103102-3-konstantin@daynix.com
State New
Headers show
Series gqa-win: get_pci_info: Fix memory leak | expand

Commit Message

Konstantin Kostiuk Dec. 14, 2021, 12:41 p.m. UTC 
To prevent memory leaks, always try to free initialized variables.

Signed-off-by: Kostiantyn Kostiuk <kkostiuk@redhat.com>
Signed-off-by: Kostiantyn Kostiuk <konstantin@daynix.com>
---
 qga/commands-win32.c | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

Comments

Marc-André Lureau Dec. 14, 2021, 1:26 p.m. UTC | #1 
On Tue, Dec 14, 2021 at 4:41 PM Kostiantyn Kostiuk
<konstantin@daynix.com> wrote:
>
> To prevent memory leaks, always try to free initialized variables.
>
> 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 | 25 ++++++++++++-------------
>  1 file changed, 12 insertions(+), 13 deletions(-)
>
> diff --git a/qga/commands-win32.c b/qga/commands-win32.c
> index 3dd74fe225..93c5375132 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 end;
>      }
>
>      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 end;
>                  }
>              }
>
> @@ -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 end;
>              }
>
>              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 end;
>          }
>
>          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 end;
>                  }
>              }
>
> @@ -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 end;
>              }
>              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 end;
>              }
>
>              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 end;
>              }
>
>              ++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 end;
>              }
>          }
>
> @@ -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 end;
>          }
>
>          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 end;
>          }
>
>          for (j = 0;
> @@ -748,11 +748,10 @@ static GuestPCIAddress *get_pci_info(int number, Error **errp)
>          break;
>      }
>
> -free_dev_info:
> +end:
>      if (dev_info != INVALID_HANDLE_VALUE) {
>          SetupDiDestroyDeviceInfoList(dev_info);
>      }
> -out:
>      return pci;
>  }
>
> --
> 2.25.1
>
diff mbox series

Patch

diff --git a/qga/commands-win32.c b/qga/commands-win32.c
index 3dd74fe225..93c5375132 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 end;
     }
 
     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 end;
                 }
             }
 
@@ -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 end;
             }
 
             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 end;
         }
 
         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 end;
                 }
             }
 
@@ -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 end;
             }
             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 end;
             }
 
             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 end;
             }
 
             ++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 end;
             }
         }
 
@@ -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 end;
         }
 
         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 end;
         }
 
         for (j = 0;
@@ -748,11 +748,10 @@  static GuestPCIAddress *get_pci_info(int number, Error **errp)
         break;
     }
 
-free_dev_info:
+end:
     if (dev_info != INVALID_HANDLE_VALUE) {
         SetupDiDestroyDeviceInfoList(dev_info);
     }
-out:
     return pci;
 }