Changeset 3300

Timestamp:

05/20/06 17:24:37 (7 years ago)

Author:

mmh

Message:

Previous leak fix caused multiple sensors_init() calls to break.
This patch fixes that by managing the scanner buffers manually.

Location:

lm-sensors/trunk/lib

Files:

• conf-lex.l (modified) (3 diffs)
• init.c (modified) (3 diffs)
• scanner.h (added)

lm-sensors/trunk/lib/conf-lex.l

@@ -26 +26 @@
 #include "conf-parse.h"
 #include "error.h"
+#include "scanner.h"
 
 static int buffer_count;
@@ -49 +50 @@
 
 %option nodefault
+%option noyywrap
 %option yylineno
 %option nounput
@@ -270 +272 @@
 %%
 
-int sensors_yywrap(void)
+/*
+        Do the buffer handling manually.  This allows us to scan as many
+        config files as we need to, while cleaning up properly after each
+        one.  The "BEGIN(0)" line ensures that we start in the default state,
+        even if e.g. the previous config file was syntactically broken.
+
+        Returns 0 if successful, !0 otherwise.
+*/
+
+static YY_BUFFER_STATE scan_buf = (YY_BUFFER_STATE)0;
+
+int sensors_scanner_init(FILE *input)
 {
-  yy_delete_buffer(YY_CURRENT_BUFFER);
-  return 1;
+        BEGIN(0);
+        if (!(scan_buf = sensors_yy_create_buffer(input, YY_BUF_SIZE)))
+                return -1;
+
+        sensors_yy_switch_to_buffer(scan_buf);
+        return 0;
 }
 
+void sensors_scanner_exit(void)
+{
+        sensors_yy_delete_buffer(scan_buf);
+        scan_buf = (YY_BUFFER_STATE)0;
+}
+

lm-sensors/trunk/lib/init.c

@@ -27 +27 @@
 #include "conf.h"
 #include "sysfs.h"
+#include "scanner.h"
 
 static void free_proc_chips_entry(sensors_proc_chips_entry entry);
@@ -49 +50 @@
       return res;
   }
-  sensors_yyin = input;
+  if ((res = sensors_scanner_init(input)))
+    return -SENSORS_ERR_PARSE;
   if ((res = sensors_yyparse()))
     return -SENSORS_ERR_PARSE;
@@ -60 +62 @@
 {
   int i;
+
+  sensors_scanner_exit();
 
   for (i = 0; i < sensors_proc_chips_count; i++)