[src/netbsd-9]: src/usr.sbin/makemandb Pull up following revision(s) (request...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/169cdbdd8d6a
branches:  netbsd-9
changeset: 366673:169cdbdd8d6a
user:      martin <martin%NetBSD.org@localhost>
date:      Mon Jun 06 11:34:11 2022 +0000

description:
Pull up following revision(s) (requested by skrll in ticket #1465):

        usr.sbin/makemandb/makemandb.c: revision 1.63

Don't index outside the mdocs array of function pointers.  Analysis and
suggested fixes from Tom Lane.  I played it safe and went with (my
variation of) the minimal fix.

PR port-hppa/56118: sporadic app crashes in HPPA -current

diffstat:

 usr.sbin/makemandb/makemandb.c |  25 ++++++++++++++-----------
 1 files changed, 14 insertions(+), 11 deletions(-)

diffs (46 lines):

diff -r 1c2a0913e704 -r 169cdbdd8d6a usr.sbin/makemandb/makemandb.c
--- a/usr.sbin/makemandb/makemandb.c    Mon Jun 06 11:31:13 2022 +0000
+++ b/usr.sbin/makemandb/makemandb.c    Mon Jun 06 11:34:11 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: makemandb.c,v 1.60 2019/05/18 07:56:43 abhinav Exp $   */
+/*     $NetBSD: makemandb.c,v 1.60.2.1 2022/06/06 11:34:11 martin Exp $        */
 /*
  * Copyright (c) 2011 Abhinav Upadhyay <er.abhinav.upadhyay%gmail.com@localhost>
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps%bsd.lv@localhost>
@@ -17,7 +17,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: makemandb.c,v 1.60 2019/05/18 07:56:43 abhinav Exp $");
+__RCSID("$NetBSD: makemandb.c,v 1.60.2.1 2022/06/06 11:34:11 martin Exp $");
 
 #include <sys/stat.h>
 #include <sys/types.h>
@@ -1079,15 +1079,18 @@
 
        if (n->type == ROFFT_TEXT) {
                mdoc_parse_section(n->sec, n->string, rec);
-       } else if (mdocs[n->tok] == pmdoc_Xr) {
-               /*
-                * When encountering other inline macros,
-                * call pmdoc_macro_handler.
-                */
-               pmdoc_macro_handler(n, rec, MDOC_Xr);
-               xr_found = 1;
-       } else if (mdocs[n->tok] == pmdoc_Pp) {
-               pmdoc_macro_handler(n, rec, MDOC_Pp);
+       } else if (n->tok >= MDOC_Dd && n->tok < MDOC_MAX) {
+               const int tok_idx = n->tok - MDOC_Dd;
+               if (mdocs[tok_idx] == pmdoc_Xr) {
+                       /*
+                       * When encountering other inline macros,
+                       * call pmdoc_macro_handler.
+                       */
+                       pmdoc_macro_handler(n, rec, MDOC_Xr);
+                       xr_found = 1;
+               } else if (mdocs[tok_idx] == pmdoc_Pp) {
+                       pmdoc_macro_handler(n, rec, MDOC_Pp);
+               }
        }
 
        /*