diff options
| author | Milan P. Stanić <mps@arvanta.net> | 2019-12-03 14:13:03 +0100 |
|---|---|---|
| committer | Leo <thinkabit.ukim@gmail.com> | 2019-12-03 18:30:59 +0100 |
| commit | 3e165842814d6978e212309b83c8b7b90e2c01ee (patch) | |
| tree | 0c7fa1f148278a06f872023f4cb8df3e7ecbb4f5 | |
| parent | b9e687875ccaa39ecd170db4f6d45ab47d5bc521 (diff) | |
| download | aports-3e165842814d6978e212309b83c8b7b90e2c01ee.tar.bz2 aports-3e165842814d6978e212309b83c8b7b90e2c01ee.tar.xz | |
main/mdocml: fix segfault in tbl_term.c
added patch from upstream to fix segmentation fault in some man
pages (nft.8 only known for now)
| -rw-r--r-- | main/mdocml/APKBUILD | 6 | ||||
| -rw-r--r-- | main/mdocml/fix-tbl-null-pointer.patch | 27 |
2 files changed, 31 insertions, 2 deletions
diff --git a/main/mdocml/APKBUILD b/main/mdocml/APKBUILD index 21adba681f..d04f728ff3 100644 --- a/main/mdocml/APKBUILD +++ b/main/mdocml/APKBUILD @@ -2,7 +2,7 @@ pkgname=mdocml _pkgname=mandoc pkgver=1.14.5 -pkgrel=0 +pkgrel=1 pkgdesc="mdoc/man compiler" url="http://mdocml.bsd.lv/" arch="all" @@ -15,6 +15,7 @@ subpackages="$pkgname-doc $pkgname-dev man::noarch $pkgname-apropos $pkgname-soe source="http://mdocml.bsd.lv/snapshots/$_pkgname-$pkgver.tar.gz shared-libmandoc.patch outdated-warn-disable.patch + fix-tbl-null-pointer.patch " builddir="$srcdir/$_pkgname-$pkgver" @@ -75,4 +76,5 @@ soelim() { sha512sums="848f290847f3095757f25647e6d73eb7044018b145bf6f9dc8b5db164b1421911efdc5b3b9022ec3a2c5af9687a84d5acedee810f2bd2f7caaa9242dadb2cc52 mandoc-1.14.5.tar.gz b1bd2c197584948cc8bab2310e759b8942b9f9479254ffb5a8223cfa6ba03c9e1a4d402c5440b8d9f962be9a020287d3dd8556592c17f2b46f15f405d9d373cb shared-libmandoc.patch -ced05e8b57fb9705c6d8d8570cd6b06ad187511a4c243ac2dbc34064aa164ca49e0c877160134161dcb98ebd5e61a5c23d5741f03ef95903ff56193dd07f36a1 outdated-warn-disable.patch" +ced05e8b57fb9705c6d8d8570cd6b06ad187511a4c243ac2dbc34064aa164ca49e0c877160134161dcb98ebd5e61a5c23d5741f03ef95903ff56193dd07f36a1 outdated-warn-disable.patch +bb46bc3a0f07881e5362b32d478632fb209f9740017c467f2258e9b7ddbece6175bba598287d8c24626c9ee7217eb92ae60e0a30aeafdfc4b0154f4d312cbcca fix-tbl-null-pointer.patch" diff --git a/main/mdocml/fix-tbl-null-pointer.patch b/main/mdocml/fix-tbl-null-pointer.patch new file mode 100644 index 0000000000..ab68f9a1a6 --- /dev/null +++ b/main/mdocml/fix-tbl-null-pointer.patch @@ -0,0 +1,27 @@ +=================================================================== +RCS file: /cvs/mandoc/tbl_term.c,v +retrieving revision 1.69 +retrieving revision 1.70 +diff -u -p -r1.69 -r1.70 +--- a/tbl_term.c 2019/03/16 21:35:48 1.69 ++++ b/tbl_term.c 2019/03/18 08:00:34 1.70 +@@ -629,7 +629,8 @@ tbl_hrule(struct termp *tp, const struct tbl_span *spp + + lw = cpp == NULL || cpn == NULL || + (cpn->pos != TBL_CELL_DOWN && +- (dpn == NULL || strcmp(dpn->string, "\\^") != 0)) ++ (dpn == NULL || dpn->string == NULL || ++ strcmp(dpn->string, "\\^") != 0)) + ? hw : 0; + tbl_direct_border(tp, BHORIZ * lw, + col->width + col->spacing / 2); +@@ -675,7 +676,8 @@ tbl_hrule(struct termp *tp, const struct tbl_span *spp + + rw = cpp == NULL || cpn == NULL || + (cpn->pos != TBL_CELL_DOWN && +- (dpn == NULL || strcmp(dpn->string, "\\^") != 0)) ++ (dpn == NULL || dpn->string == NULL || ++ strcmp(dpn->string, "\\^") != 0)) + ? hw : 0; + + /* The line crossing at the end of this column. */ |