mdocml: Regression fixes after merging 1.11.3 to OpenBSD (rev.

mdocml: Regression fixes after merging 1.11.3 to OpenBSD (rev.

[schwarze]

Log Message:
-----------
Regression fixes after merging 1.11.3 to OpenBSD (rev. 1.20):
* Do not pass integers outside the ASCII range to isprint().
* Make sure escaped characters are really printed verbatim
  when the escape sequence has no special meaning.
ok kristaps@

Modified Files:
--------------
    mdocml:
        chars.c

Revision Data
-------------
Index: chars.c
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/chars.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -Lchars.c -Lchars.c -u -p -r1.49 -r1.50
--- chars.c
+++ chars.c
@@ -113,7 +113,7 @@ mchars_num2char(const char *p, size_t sz
 
 	if ((i = mandoc_strntoi(p, sz, 10)) < 0)
 		return('\0');
-	return(isprint(i) ? i : '\0');
+	return(i > 0 && i < 256 && isprint(i) ? i : '\0');
 }
 
 int
@@ -133,8 +133,10 @@ mchars_spec2str(struct mchars *arg, cons
 	const struct ln	*ln;
 
 	ln = find(arg, p, sz);
-	if (NULL == ln)
+	if (NULL == ln) {
+		*rsz = 1;
 		return(NULL);
+	}
 
 	*rsz = strlen(ln->ascii);
 	return(ln->ascii);
--
 To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv

Re: mdocml: Regression fixes after merging 1.11.3 to OpenBSD (rev.

[Joerg Sonnenberger]

On Sun, Jul 31, 2011 at 07:24:39AM -0400, schwarze@mdocml.bsd.lv wrote:
> diff -Lchars.c -Lchars.c -u -p -r1.49 -r1.50
> --- chars.c
> +++ chars.c
> @@ -113,7 +113,7 @@ mchars_num2char(const char *p, size_t sz
>  
>  	if ((i = mandoc_strntoi(p, sz, 10)) < 0)
>  		return('\0');
> -	return(isprint(i) ? i : '\0');
> +	return(i > 0 && i < 256 && isprint(i) ? i : '\0');
>  }
>  
>  int

Any reason why this doesn't use i>=0? That would allow the compiler to
merge both tests by using a bitmask...

Joerg
--
 To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv