Changeset 64eba57 in mainline

Timestamp:

2024-11-15T17:39:24Z (6 months ago)

Author:

Miroslav Cimerman <mc@…>

Children:

dfa2313

Parents:

b235c67

Message:

hrctl: fix memory leaks

File:

• uspace/app/hrctl/hrctl.c (modified) (7 diffs)

uspace/app/hrctl/hrctl.c

@@ -252 +252 @@
                 case 'h':
                         usage();
+                        free(cfg);
                         return 0;
                 case 's':
+                        free(cfg);
                         rc = hr_print_status();
                         if (rc != EOK)
@@ -263 +265 @@
                         if (rc != EOK) {
                                 printf("hrctl: failed to load config\n");
+                                free(cfg);
                                 return 1;
                         }
@@ -270 +273 @@
                         if (str_size(optarg) > sizeof(cfg->devname) - 1) {
                                 printf("hrctl: device name too long\n");
+                                free(cfg);
                                 return 1;
                         }
@@ -279 +283 @@
                         if (rc != EOK) {
                                 printf("hrctl: failed to load config\n");
+                                free(cfg);
                                 return 1;
                         }
@@ -286 +291 @@
                         if (str_size(optarg) > sizeof(cfg->devname) - 1) {
                                 printf("hrctl: device name too long\n");
+                                free(cfg);
                                 return 1;
                         }
@@ -334 +340 @@
                                 goto bad;
                         rc = fill_config_devs(argc, argv, optind, cfg);
-                        if (rc != EOK)
-                                return 1;
+                        if (rc != EOK) {
+                                free(cfg);
+                                return 1;
+                        }
                         break;
                 }
@@ -346 +354 @@
         if (create && cfg->level == HR_LVL_UNKNOWN) {
                 printf("hrctl: invalid level, exiting\n");
-                return 1;
+                goto bad;
         }
 
         if (cfg->dev_no > HR_MAXDEVS) {
                 printf("hrctl: too many devices, exiting\n");
-                return 1;
+                goto bad;
         }
 
         if (cfg->dev_no == 0) {
                 printf("hrctl: invalid number of devices, exiting\n");
-                return 1;
+                goto bad;
         }