From 60d06b6c8ec84a910dd17c21f2e368ae8e32dc10 Mon Sep 17 00:00:00 2001 From: Ingo Schwarze Date: Sun, 8 Aug 2010 14:45:59 +0000 Subject: Make sure we really throw away non-ASCII characters. For example, on OpenBSD without locale settings, isgraph(3) returns true for some eight-bit characters. ok kristaps@ --- main.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/main.c b/main.c index 4ad45ab2..d7937f33 100644 --- a/main.c +++ b/main.c @@ -1,4 +1,4 @@ -/* $Id: main.c,v 1.101 2010/07/29 22:00:39 joerg Exp $ */ +/* $Id: main.c,v 1.102 2010/08/08 14:45:59 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons * Copyright (c) 2010 Ingo Schwarze @@ -466,6 +466,7 @@ fdesc(struct curparse *curp) struct buf ln, blk; int i, pos, lnn, lnn_start, with_mmap, of; enum rofferr re; + unsigned char c; struct man *man; struct mdoc *mdoc; struct roff *roff; @@ -508,8 +509,8 @@ fdesc(struct curparse *curp) * writers: use special characters. */ - if ( ! isgraph((u_char)blk.buf[i]) && - ! isblank((u_char)blk.buf[i])) { + c = (unsigned char) blk.buf[i]; + if ( ! (isascii(c) && (isgraph(c) || isblank(c)))) { if ( ! mmsg(MANDOCERR_BADCHAR, curp, lnn_start, pos, "ignoring byte")) -- cgit v1.2.3