Changeset 4636

Timestamp:

07/21/07 10:44:31 (6 years ago)

Author:

khali

Message:

Fix a memory leak in sensors_read_one_sysfs_chip() when an error occurs.

Location:

lm-sensors/branches/lm-sensors-3.0.0

Files:

• CHANGES (modified) (1 diff)
• lib/sysfs.c (modified) (2 diffs)

lm-sensors/branches/lm-sensors-3.0.0/CHANGES

@@ -16 +16 @@
            Delete all remnants of algorithm names
            Drop all the chip-specific support
+           Fix a memory leak on error
   Makefile: Drop the package and version targets
   Man page sensors.conf.5: Update the chip statement section

lm-sensors/branches/lm-sensors-3.0.0/lib/sysfs.c

@@ -236 +236 @@
 
                         if ((bus_attr = sysfs_open_attribute(bus_path))) {
-                                if (sysfs_read_attribute(bus_attr))
-                                        return -SENSORS_ERR_PARSE;
+                                if (sysfs_read_attribute(bus_attr)) {
+                                        sysfs_close_attribute(bus_attr);
+                                        goto exit_free;
+                                }
 
                                 if (bus_attr->value
@@ -254 +256 @@
                 entry.chip.bus = SENSORS_CHIP_NAME_BUS_PCI;
         } else
-                return -SENSORS_ERR_PARSE;
+                goto exit_free;
         
         if (sensors_read_dynamic_chip(&entry, dev) < 0)
-                return -SENSORS_ERR_PARSE;
+                goto exit_free;
         sensors_add_proc_chips(&entry);
 
         return 0;
+
+exit_free:
+        free(entry.chip.prefix);
+        free(entry.chip.busname);
+        return -SENSORS_ERR_PARSE;
 }