Changeset 4790

Timestamp:

09/06/07 14:22:59 (6 years ago)

Author:

khali

Message:

Fix memory leaks in the configuration file parser when a label, set,
compute or ignore statement is found before the first chip statement.

Location:

lm-sensors/trunk/lib

Files:

• conf-parse.y (modified) (6 diffs)
• init.c (modified) (2 diffs)
• init.h (added)

lm-sensors/trunk/lib/conf-parse.y

@@ -30 +30 @@
 #include "conf.h"
 #include "access.h"
+#include "init.h"
 
 static void sensors_yyerror(const char *err);
@@ -73 +74 @@
                                                   sizeof(sensors_chip_name));
 
-/* YYERROR can only be called in rules, not in other functions, so this must
-   be a macro */
-#define check_current_chip()\
-  do { if (! current_chip) {\
-      sensors_yyerror("Label, Set or Compute statement before first chip statement");\
-      YYERROR;\
-    }\
-  } while (0)
-
 %}
 
@@ -161 +153 @@
 label_statement:          LABEL function_name string
                           { sensors_label new_el;
-                            check_current_chip();
+                            if (!current_chip) {
+                              sensors_yyerror("Label statement before first chip statement");
+                              free($2);
+                              free($3);
+                              YYERROR;
+                            }
                             new_el.lineno = $1;
                             new_el.name = $2;
@@ -171 +168 @@
 set_statement:    SET function_name expression
                   { sensors_set new_el;
-                    check_current_chip();
+                    if (!current_chip) {
+                      sensors_yyerror("Set statement before first chip statement");
+                      free($2);
+                      free_expr($3);
+                      YYERROR;
+                    }
                     new_el.lineno = $1;
                     new_el.name = $2;
@@ -181 +183 @@
 compute_statement:        COMPUTE function_name expression ',' expression
                           { sensors_compute new_el;
-                            check_current_chip();
+                            if (!current_chip) {
+                              sensors_yyerror("Compute statement before first chip statement");
+                              free($2);
+                              free_expr($3);
+                              free_expr($5);
+                              YYERROR;
+                            }
                             new_el.lineno = $1;
                             new_el.name = $2;
@@ -192 +200 @@
 ignore_statement:       IGNORE function_name
                         { sensors_ignore new_el;
-                          check_current_chip();
+                          if (!current_chip) {
+                            sensors_yyerror("Ignore statement before first chip statement");
+                            free($2);
+                            YYERROR;
+                          }
                           new_el.lineno = $1;
                           new_el.name = $2;

lm-sensors/trunk/lib/init.c

@@ -28 +28 @@
 #include "sysfs.h"
 #include "scanner.h"
+#include "init.h"
 
 static void free_proc_chips_entry(sensors_proc_chips_entry entry);
@@ -37 +38 @@
 static void free_compute(sensors_compute compute);
 static void free_ignore(sensors_ignore ignore);
-static void free_expr(sensors_expr *expr);
 
 int sensors_init(FILE *input)