Changeset 5738

Timestamp:

06/20/09 11:53:23 (4 years ago)

Author:

khali

Message:

sensord, sensors: Fix a memory leak when one or more chip names are
provided on the command line.

Location:

lm-sensors/branches/lm-sensors-2.10

Files:

• CHANGES (modified) (1 diff)
• prog/sensord/args.c (modified) (2 diffs)
• prog/sensord/sensord.c (modified) (2 diffs)
• prog/sensord/sensord.h (modified) (1 diff)
• prog/sensors/main.c (modified) (6 diffs)

lm-sensors/branches/lm-sensors-2.10/CHANGES

@@ -8 +8 @@
   Module i2c-piix4: ATI SB800 is not actually supported
   Module it87: Properly decode -128 degrees C (2.6 backport)
+  Program sensord: Fix a memory leak when a chip name is provided
+  Program sensors: Fix a memory leak when a chip name is provided
   Program sensors-detect: Fix detection of older DS1621
 

lm-sensors/branches/lm-sensors-2.10/prog/sensord/args.c

@@ -299 +299 @@
       if ((err = sensors_parse_chip_name (arg, chipNames + i))) {
         fprintf (stderr, "Invalid chip name `%s': %s\n", arg, sensors_strerror (err));
+        for (-- i; i >= 0; -- i)
+          free (chipNames[i].prefix);
         return -1;
       }
@@ -306 +308 @@
   return 0;
 }
+
+void
+freeChips
+() {
+  int i;
+  for (i = 0; i < numChipNames; ++ i)
+    free (chipNames[i].prefix);
+}

lm-sensors/branches/lm-sensors-2.10/prog/sensord/sensord.c

@@ -200 +200 @@
   
   if (initLib () ||
-      loadLib ())
-    exit (EXIT_FAILURE);
+      loadLib ()) {
+    freeChips ();
+    exit (EXIT_FAILURE);
+  }
 
   if (isDaemon)
@@ -226 +228 @@
   }
   
+  freeChips ();
   if (unloadLib ())
     exit (EXIT_FAILURE);

lm-sensors/branches/lm-sensors-2.10/prog/sensord/sensord.h

@@ -47 +47 @@
 extern int parseArgs (int argc, char **argv);
 extern int parseChips (int argc, char **argv);
+extern void freeChips ();
 
 /* from lib.c */

lm-sensors/branches/lm-sensors-2.10/prog/sensors/main.c

@@ -93 +93 @@
 }
 
+void free_chip_names()
+{
+  int i;
+
+  for (i = 0; i < chips_count; i++)
+    free(chips[i].prefix);
+}
+
 /* This examines global var config_file, and leaves the name there too. 
    It also opens config_file. */
@@ -106 +114 @@
     fprintf(stderr, "Could not open config file\n");
     perror(config_file_name);
+    free_chip_names();
     exit(1);
   }
@@ -222 +231 @@
       if ((res = sensors_parse_chip_name(argv[i],chips+chips_count))) {
         fprintf(stderr,"Parse error in chip name `%s'\n",argv[i]);
+        free_chip_names();
         print_short_help();
         exit(1);
       } else if (++chips_count == CHIPS_MAX) {
         fprintf(stderr,"Too many chips on command line!\n");
+        free_chip_names();
         exit(1);
       }
@@ -239 +250 @@
               "For 2.6 kernels, make sure you have mounted sysfs and libsensors\n"
               "was compiled with sysfs support!\n");
+    free_chip_names();
     sensors_cleanup();
     exit(1);
@@ -247 +259 @@
 
   if(do_the_real_work(&error)) {
+    free_chip_names();
     sensors_cleanup();
     exit(error);
@@ -257 +270 @@
     else
             fprintf(stderr,"Specified sensor(s) not found!\n");
+    free_chip_names();
     sensors_cleanup();
     exit(1);