Changeset 3031 for lm-sensors/trunk/lib/access.c

Timestamp:

07/15/05 10:57:43 (8 years ago)

Author:

khali

Message:

Fix memory leak in sensors_get_label(). Reported by John Naylon.

Files:

• lm-sensors/trunk/lib/access.c (modified) (3 diffs)

lm-sensors/trunk/lib/access.c

@@ -140 +140 @@
 /* Look up the label which belongs to this chip. Note that chip should not
    contain wildcard values! *result is newly allocated (free it yourself).
-   This function will return 0 on success, and <0 on failure.  
-   Changed behaviour as of libsensors.so.1: now we actually take notice
-   of the logical class, as documented, but not done before! */
+   This function will return 0 on success, and <0 on failure.
+   If no label exists for this feature, its name is returned itself. */  
 int sensors_get_label(sensors_chip_name name, int feature, char **result)
 {
   const sensors_chip *chip;
   const sensors_chip_feature *featureptr;
-  const sensors_chip_feature *alt_featureptr;
   int i;
 
@@ -155 +153 @@
   if (! (featureptr = sensors_lookup_feature_nr(name.prefix,feature)))
     return -SENSORS_ERR_NO_ENTRY;
-  if (featureptr->logical_mapping == SENSORS_NO_MAPPING)
-    alt_featureptr = NULL;
-  else if (! (alt_featureptr =
-                   sensors_lookup_feature_nr(name.prefix,
-                                             featureptr->logical_mapping)))
-    return -SENSORS_ERR_NO_ENTRY;
+
   for (chip = NULL; (chip = sensors_for_all_config_chips(name,chip));)
     for (i = 0; i < chip->labels_count; i++)
@@ -168 +161 @@
         if (! (*result = strdup(chip->labels[i].value)))
           sensors_fatal_error("sensors_get_label","Allocating label text");
-        return 0; /* Exact match always overrules! */
-      } else if (alt_featureptr && 
-                 !strcasecmp(alt_featureptr->name, chip->labels[i].name)) {
-        if (*result)
-          free(*result);
-        if (! (*result = strdup(chip->labels[i].value)))
-          sensors_fatal_error("sensors_get_label","Allocating label text");
+        return 0;
       }
+
+  /* No label, return the feature name instead */
   if (! (*result = strdup(featureptr->name)))
     sensors_fatal_error("sensors_get_label","Allocating label text");