Avoid out-of-bounds read access before the beginning of the

[mandoc.git] / chars.c

diff --git a/chars.c b/chars.c
index 8b4f6b643768c455ecbb46cada497cc599252985..6b5eba953728f1aa926d246902e4a3bdc4445d24 100644 (file)
--- a/chars.c
+++ b/chars.c
@@ -1,7 +1,7 @@
-/*     $Id: chars.c,v 1.53 2013/05/18 16:40:15 schwarze Exp $ */
+/*     $Id: chars.c,v 1.66 2015/02/17 20:37:16 schwarze Exp $ */
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2011, 2014 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
@@ -15,9 +15,9 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
+
+#include <sys/types.h>
 
 #include <assert.h>
 #include <ctype.h>
@@ -25,6 +25,7 @@
 #include <string.h>
 
 #include "mandoc.h"
+#include "mandoc_aux.h"
 #include "libmandoc.h"
 
 #define        PRINT_HI         126
@@ -37,7 +38,7 @@ struct        ln {
        int               unicode;
 };
 
-#define        LINES_MAX         328
+#define        LINES_MAX         332
 
 #define CHAR(in, ch, code) \
        { NULL, (in), (ch), (code) },
@@ -51,9 +52,10 @@ struct       mchars {
        struct ln       **htab;
 };
 
-static const struct ln  *find(const struct mchars *, 
+static const struct ln  *find(const struct mchars *,
                                const char *, size_t);
 
+
 void
 mchars_free(struct mchars *arg)
 {
@@ -102,49 +104,55 @@ mchars_spec2cp(const struct mchars *arg, const char *p, size_t sz)
        const struct ln *ln;
 
        ln = find(arg, p, sz);
-       if (NULL == ln)
-               return(-1);
-       return(ln->unicode);
+       return(ln != NULL ? ln->unicode : sz == 1 ? (unsigned char)*p : -1);
 }
 
-char
+int
 mchars_num2char(const char *p, size_t sz)
 {
-       int               i;
+       int       i;
 
-       if ((i = mandoc_strntoi(p, sz, 10)) < 0)
-               return('\0');
-       return(i > 0 && i < 256 && isprint(i) ? 
-                       /* LINTED */ i : '\0');
+       i = mandoc_strntoi(p, sz, 10);
+       return(i >= 0 && i < 256 ? i : -1);
 }
 
 int
 mchars_num2uc(const char *p, size_t sz)
 {
-       int               i;
+       int      i;
 
-       if ((i = mandoc_strntoi(p, sz, 16)) < 0)
-               return('\0');
-       /* FIXME: make sure we're not in a bogus range. */
-       return(i > 0x80 && i <= 0x10FFFF ? i : '\0');
+       i = mandoc_strntoi(p, sz, 16);
+       assert(i >= 0 && i <= 0x10FFFF);
+       return(i);
 }
 
 const char *
-mchars_spec2str(const struct mchars *arg, 
+mchars_spec2str(const struct mchars *arg,
                const char *p, size_t sz, size_t *rsz)
 {
        const struct ln *ln;
 
        ln = find(arg, p, sz);
-       if (NULL == ln) {
+       if (ln == NULL) {
                *rsz = 1;
-               return(NULL);
+               return(sz == 1 ? p : NULL);
        }
 
        *rsz = strlen(ln->ascii);
        return(ln->ascii);
 }
 
+const char *
+mchars_uc2str(int uc)
+{
+       int      i;
+
+       for (i = 0; i < LINES_MAX; i++)
+               if (uc == lines[i].unicode)
+                       return(lines[i].ascii);
+       return("<?>");
+}
+
 static const struct ln *
 find(const struct mchars *tab, const char *p, size_t sz)
 {
@@ -159,8 +167,8 @@ find(const struct mchars *tab, const char *p, size_t sz)
        hash = (int)p[0] - PRINT_LO;
 
        for (pp = tab->htab[hash]; pp; pp = pp->next)
-               if (0 == strncmp(pp->code, p, sz) && 
-                               '\0' == pp->code[(int)sz])
+               if (0 == strncmp(pp->code, p, sz) &&
+                   '\0' == pp->code[(int)sz])
                        return(pp);
 
        return(NULL);