From 82084a7d25acdbc823a8a52ae0e4b9fb266553f0 Mon Sep 17 00:00:00 2001
From: Ingo Schwarze <schwarze@openbsd.org>
Date: Wed, 17 Aug 2016 20:46:56 +0000
Subject: When the content of a manual page does not specify a section, the
 empty string got added to the list of sections, breaking the database format
 slightly and causing the page to not be considered part of any section, not
 even if a section could be deduced from the directory or from the file name.
 Bug found due to the bogus pcredemo(3) "manual" in the pcre-8.38p0 package.

---
 dba.c      | 7 ++-----
 dba.h      | 3 +--
 dba_read.c | 7 +++----
 mandocdb.c | 3 ++-
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/dba.c b/dba.c
index 8762d78e..91feaf02 100644
--- a/dba.c
+++ b/dba.c
@@ -136,18 +136,15 @@ dba_write(const char *fname, struct dba *dba)
  * Create a new page and append it to the pages table.
  */
 struct dba_array *
-dba_page_new(struct dba_array *pages, const char *name, const char *sect,
-    const char *arch, const char *desc, const char *file, enum form form)
+dba_page_new(struct dba_array *pages, const char *arch,
+    const char *desc, const char *file, enum form form)
 {
 	struct dba_array *page, *entry;
 
 	page = dba_array_new(DBP_MAX, 0);
 	entry = dba_array_new(1, DBA_STR | DBA_GROW);
-	if (name != NULL)
-		dba_array_add(entry, prepend(name, NAME_FILE & NAME_MASK));
 	dba_array_add(page, entry);
 	entry = dba_array_new(1, DBA_STR | DBA_GROW);
-	dba_array_add(entry, (void *)sect);
 	dba_array_add(page, entry);
 	if (arch != NULL && *arch != '\0') {
 		entry = dba_array_new(1, DBA_STR | DBA_GROW);
diff --git a/dba.h b/dba.h
index 885c987a..369f258f 100644
--- a/dba.h
+++ b/dba.h
@@ -40,8 +40,7 @@ struct dba	*dba_read(const char *);
 int		 dba_write(const char *, struct dba *);
 
 struct dba_array *dba_page_new(struct dba_array *, const char *,
-			const char *, const char *, const char *,
-			const char *, enum form);
+			const char *, const char *, enum form);
 void		 dba_page_add(struct dba_array *, int32_t, const char *);
 void		 dba_page_alias(struct dba_array *, const char *, uint64_t);
 
diff --git a/dba_read.c b/dba_read.c
index 2825d061..0809eff9 100644
--- a/dba_read.c
+++ b/dba_read.c
@@ -48,12 +48,11 @@ dba_read(const char *fname)
 	dba = dba_new(npages < 128 ? 128 : npages);
 	for (ip = 0; ip < npages; ip++) {
 		pdata = dbm_page_get(ip);
-		page = dba_page_new(dba->pages, NULL, pdata->sect,
-		    pdata->arch, pdata->desc, pdata->file + 1, *pdata->file);
+		page = dba_page_new(dba->pages, pdata->arch,
+		    pdata->desc, pdata->file + 1, *pdata->file);
 		for (cp = pdata->name; *cp != '\0'; cp = strchr(cp, '\0') + 1)
 			dba_page_add(page, DBP_NAME, cp);
-		cp = pdata->sect;
-		while (*(cp = strchr(cp, '\0') + 1) != '\0')
+		for (cp = pdata->sect; *cp != '\0'; cp = strchr(cp, '\0') + 1)
 			dba_page_add(page, DBP_SECT, cp);
 		if ((cp = pdata->arch) != NULL)
 			while (*(cp = strchr(cp, '\0') + 1) != '\0')
diff --git a/mandocdb.c b/mandocdb.c
index 55d3a01c..16dda371 100644
--- a/mandocdb.c
+++ b/mandocdb.c
@@ -2013,11 +2013,12 @@ dbadd(struct dba *dba, struct mpage *mpage)
 	cp = mpage->desc;
 	i = strlen(cp);
 	mustfree = render_string(&cp, &i);
-	mpage->dba = dba_page_new(dba->pages, mlink->name, mpage->sec,
+	mpage->dba = dba_page_new(dba->pages,
 	    *mpage->arch == '\0' ? mlink->arch : mpage->arch,
 	    cp, mlink->file, mpage->form);
 	if (mustfree)
 		free(cp);
+	dba_page_add(mpage->dba, DBP_SECT, mpage->sec);
 
 	while (mlink != NULL) {
 		dbadd_mlink(mlink);
-- 
cgit