Changeset 4768

Timestamp:

09/05/07 14:30:39 (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/branches/lm-sensors-3.0.0/lib

Files:

• conf-parse.y (modified) (6 diffs)
• init.c (modified) (1 diff)

lm-sensors/branches/lm-sensors-3.0.0/lib/conf-parse.y

@@ -38 +38 @@
 static void sensors_yyerror(const char *err);
 static sensors_expr *malloc_expr(void);
+/* free_expr is defined in init.c */
+void free_expr(sensors_expr *expr);
 
 static sensors_chip *current_chip = NULL;
@@ -78 +80 @@
                                                   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)
-
 %}
 
@@ -153 +146 @@
 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;
@@ -163 +161 @@
 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($3);
+                      YYERROR;
+                    }
                     new_el.lineno = $1;
                     new_el.name = $2;
@@ -173 +176 @@
 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;
@@ -184 +193 @@
 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/branches/lm-sensors-3.0.0/lib/init.c

@@ -72 +72 @@
 }
 
-static void free_expr(sensors_expr *expr)
+void free_expr(sensors_expr *expr)
 {
         if (expr->kind == sensors_kind_var)