A missing initialization could randomly cause regular expression

[mandoc.git] / tag.c

diff --git a/tag.c b/tag.c
index 971bb85d83f0945c2467b0f551a7ac1ccfb50afd..21ac6b32e4d3a49ae6c177969178f29d2375d475 100644 (file)
--- a/tag.c
+++ b/tag.c
@@ -1,6 +1,6 @@
-/*     $Id: tag.c,v 1.13 2016/07/20 13:03:24 schwarze Exp $ */
+/*     $Id: tag.c,v 1.18 2017/02/17 14:31:52 schwarze Exp $ */

 /*
 /*

- * Copyright (c) 2015 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2015, 2016 Ingo Schwarze <schwarze@openbsd.org>

  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above


@@ -31,12 +31,14 @@
 #include "tag.h"
 
 struct tag_entry {
 #include "tag.h"
 
 struct tag_entry {

-       size_t   line;
+       size_t  *lines;
+       size_t   maxlines;
+       size_t   nlines;

        int      prio;
        char     s[];
 };
 
        int      prio;
        char     s[];
 };
 

-static void     tag_signal(int) __attribute__((noreturn));
+static void     tag_signal(int) __attribute__((__noreturn__));

 
 static struct ohash     tag_data;
 static struct tag_files         tag_files;
 
 static struct ohash     tag_data;
 static struct tag_files         tag_files;


@@ -128,18 +130,58 @@ tag_put(const char *s, int prio, size_t line)
        size_t                   len;
        unsigned int             slot;
 
        size_t                   len;
        unsigned int             slot;
 

-       if (tag_files.tfd <= 0 || strchr(s, ' ') != NULL)
+       /* Sanity checks. */
+
+       if (tag_files.tfd <= 0)
+               return;
+       if (s[0] == '\\' && (s[1] == '&' || s[1] == 'e'))
+               s += 2;
+       if (*s == '\0' || strchr(s, ' ') != NULL)

                return;
                return;

+

        slot = ohash_qlookup(&tag_data, s);
        entry = ohash_find(&tag_data, slot);
        slot = ohash_qlookup(&tag_data, s);
        entry = ohash_find(&tag_data, slot);

+

        if (entry == NULL) {
        if (entry == NULL) {

+
+               /* Build a new entry. */
+

                len = strlen(s) + 1;
                entry = mandoc_malloc(sizeof(*entry) + len);
                memcpy(entry->s, s, len);
                len = strlen(s) + 1;
                entry = mandoc_malloc(sizeof(*entry) + len);
                memcpy(entry->s, s, len);

+               entry->lines = NULL;
+               entry->maxlines = entry->nlines = 0;

                ohash_insert(&tag_data, slot, entry);
                ohash_insert(&tag_data, slot, entry);

-       } else if (entry->prio <= prio)
-               return;
-       entry->line = line;
+
+       } else {
+
+               /* Handle priority 0 entries. */
+
+               if (prio == 0) {
+                       if (entry->prio == 0)
+                               entry->prio = -1;
+                       return;
+               }
+
+               /* A better entry is already present, ignore the new one. */
+
+               if (entry->prio > 0 && entry->prio < prio)
+                       return;
+
+               /* The existing entry is worse, clear it. */
+
+               if (entry->prio < 1 || entry->prio > prio)
+                       entry->nlines = 0;
+       }
+
+       /* Remember the new line. */
+
+       if (entry->maxlines == entry->nlines) {
+               entry->maxlines += 4;
+               entry->lines = mandoc_reallocarray(entry->lines,
+                   entry->maxlines, sizeof(*entry->lines));
+       }
+       entry->lines[entry->nlines++] = line;

        entry->prio = prio;
 }
 
        entry->prio = prio;
 }
 


@@ -152,6 +194,7 @@ tag_write(void)
 {
        FILE                    *stream;
        struct tag_entry        *entry;
 {
        FILE                    *stream;
        struct tag_entry        *entry;

+       size_t                   i;

        unsigned int             slot;
 
        if (tag_files.tfd <= 0)
        unsigned int             slot;
 
        if (tag_files.tfd <= 0)


@@ -159,9 +202,11 @@ tag_write(void)
        stream = fdopen(tag_files.tfd, "w");
        entry = ohash_first(&tag_data, &slot);
        while (entry != NULL) {
        stream = fdopen(tag_files.tfd, "w");
        entry = ohash_first(&tag_data, &slot);
        while (entry != NULL) {

-               if (stream != NULL)
-                       fprintf(stream, "%s %s %zu\n",
-                           entry->s, tag_files.ofn, entry->line);
+               if (stream != NULL && entry->prio >= 0)
+                       for (i = 0; i < entry->nlines; i++)
+                               fprintf(stream, "%s %s %zu\n",
+                                   entry->s, tag_files.ofn, entry->lines[i]);
+               free(entry->lines);

                free(entry);
                entry = ohash_next(&tag_data, &slot);
        }
                free(entry);
                entry = ohash_next(&tag_data, &slot);
        }


@@ -176,11 +221,11 @@ tag_unlink(void)
        pid_t    tc_pgid;
 
        if (tag_files.tcpgid != -1) {
        pid_t    tc_pgid;
 
        if (tag_files.tcpgid != -1) {

-               tc_pgid = tcgetpgrp(STDIN_FILENO);
+               tc_pgid = tcgetpgrp(tag_files.ofd);

                if (tc_pgid == tag_files.pager_pid ||
                    tc_pgid == getpgid(0) ||
                    getpgid(tc_pgid) == -1)
                if (tc_pgid == tag_files.pager_pid ||
                    tc_pgid == getpgid(0) ||
                    getpgid(tc_pgid) == -1)

-                       (void)tcsetpgrp(STDIN_FILENO, tag_files.tcpgid);
+                       (void)tcsetpgrp(tag_files.ofd, tag_files.tcpgid);

        }
        if (*tag_files.ofn != '\0')
                unlink(tag_files.ofn);
        }
        if (*tag_files.ofn != '\0')
                unlink(tag_files.ofn);