Fix memory leaks.

* src/grecs-gram.y (slist production): Free ep->data after appending.
* src/grecs-lex.l (string_list): Remove. All uses updated.
* src/tree.c (grecs_node_free): Free ident.
(grecs_tree_process): Fill config_keywords with zeros.
* src/grecs.h (grecs_getline): New proto.
* src/preproc.c (pp_getline): Rename to grecs_getline,
drop static qualifier. Improve initial allocation.

1 files changed, 15 insertions, 16 deletions

diff --git a/src/preproc.c b/src/preproc.c
index cd83e2f..ea77506 100644
--- a/src/preproc.c
+++ b/src/preproc.c
@@ -66,25 +66,25 @@ static int push_source (const char *name, int once);
 static int pop_source (void);
 static int parse_include (const char *text, int once);
 
-static ssize_t
-pp_getline(char **pbuf, size_t *psize, FILE *fp)
+ssize_t
+grecs_getline(char **pbuf, size_t *psize, FILE *fp)
 {
         char *buf = *pbuf;
         size_t size = *psize;
         ssize_t off = 0;
   
+        if (!buf) {
+                size = 1;
+                buf = grecs_malloc(size);
+        }
+        
         do {
                 if (off == size - 1) {
-                        if (!buf) {
-                                size = 1;
-                                buf = grecs_malloc(size);
-                        } else {
-                                size_t nsize = 2 * size;
-                                if (nsize < size)
-                                        grecs_alloc_die();
-                                buf = grecs_realloc(buf, nsize);
-                                size = nsize;
-                        }
+                        size_t nsize = 2 * size;
+                        if (nsize < size)
+                                grecs_alloc_die();
+                        buf = grecs_realloc(buf, nsize);
+                        size = nsize;
                 }
                 if (!fgets(buf + off, size - off, fp)) {
                         if (off == 0)
@@ -92,8 +92,7 @@ pp_getline(char **pbuf, size_t *psize, FILE *fp)
                         break;
                 }
                 off += strlen(buf + off);
-        }
-        while (buf[off - 1] != '\n');
+        } while (buf[off - 1] != '\n');
 
         *pbuf = buf;
         *psize = size;
@@ -163,7 +162,7 @@ next_line()
                 else if (!context_stack)
                         return 0;
                 else
-                        rc = pp_getline(&linebuf, &bufsize, INFILE);
+                        rc = grecs_getline(&linebuf, &bufsize, INFILE);
         } while (rc == -1 && pop_source() == 0);
         return rc;
 }
@@ -664,7 +663,7 @@ grecs_preproc_extrn_start(const char *file_name, pid_t *ppid)
                                 fp = fdopen(p[0], "r");
                                 if (grecs_log_setup_hook)
                                         grecs_log_setup_hook();
-                                while (pp_getline(&buf, &size, fp) > 0)
+                                while (grecs_getline(&buf, &size, fp) > 0)
                                         grecs_error(NULL, 0, "%s", buf);
                         }
                 } else {