A missing initialization could randomly cause regular expression

[mandoc.git] / mdoc_hash.c

diff --git a/mdoc_hash.c b/mdoc_hash.c
index 7f033f4e44730512090a0d9c23c4c596c28ed9cd..cad3c2db1afb497a3848b654f39d8eee009a5a2d 100644 (file)
--- a/mdoc_hash.c
+++ b/mdoc_hash.c
@@ -1,6 +1,7 @@
-/*     $Id: mdoc_hash.c,v 1.9 2009/09/16 14:40:56 kristaps Exp $ */
+/*     $Id: mdoc_hash.c,v 1.27 2016/07/15 18:03:45 schwarze Exp $ */
 /*
- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2015 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
@@ -14,6 +15,8 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
+#include "config.h"
+
 #include <sys/types.h>
 
 #include <assert.h>
@@ -23,9 +26,13 @@
 #include <stdio.h>
 #include <string.h>
 
+#include "mandoc.h"
+#include "roff.h"
+#include "mdoc.h"
+#include "libmandoc.h"
 #include "libmdoc.h"
 
-static unsigned char   table[27 * 12];
+static unsigned char    table[27 * 12];
 
 
 void
@@ -34,19 +41,22 @@ mdoc_hash_init(void)
        int              i, j, major;
        const char      *p;
 
+       if (*table != '\0')
+               return;
+
        memset(table, UCHAR_MAX, sizeof(table));
 
-       for (i = 0; i < MDOC_MAX; i++) {
+       for (i = 0; i < (int)MDOC_MAX; i++) {
                p = mdoc_macronames[i];
 
-               if (isalpha((u_char)p[1]))
-                       major = 12 * (tolower((u_char)p[1]) - 97);
+               if (isalpha((unsigned char)p[1]))
+                       major = 12 * (tolower((unsigned char)p[1]) - 97);
                else
                        major = 12 * 26;
 
                for (j = 0; j < 12; j++)
                        if (UCHAR_MAX == table[major + j]) {
-                               table[major + j] = i;
+                               table[major + j] = (unsigned char)i;
                                break;
                        }
 
@@ -54,34 +64,32 @@ mdoc_hash_init(void)
        }
 }
 
-
 int
 mdoc_hash_find(const char *p)
 {
        int               major, i, j;
 
        if (0 == p[0])
-               return(MDOC_MAX);
-       if ( ! isalpha((u_char)p[0]) && '%' != p[0])
-               return(MDOC_MAX);
+               return TOKEN_NONE;
+       if ( ! isalpha((unsigned char)p[0]) && '%' != p[0])
+               return TOKEN_NONE;
 
-       if (isalpha((u_char)p[1]))
-               major = 12 * (tolower((u_char)p[1]) - 97);
+       if (isalpha((unsigned char)p[1]))
+               major = 12 * (tolower((unsigned char)p[1]) - 97);
        else if ('1' == p[1])
                major = 12 * 26;
-       else 
-               return(MDOC_MAX);
+       else
+               return TOKEN_NONE;
 
        if (p[2] && p[3])
-               return(MDOC_MAX);
+               return TOKEN_NONE;
 
        for (j = 0; j < 12; j++) {
                if (UCHAR_MAX == (i = table[major + j]))
                        break;
                if (0 == strcmp(p, mdoc_macronames[i]))
-                       return(i);
+                       return i;
        }
 
-       return(MDOC_MAX);
+       return TOKEN_NONE;
 }
-