Filter all \N'' values with isprint(). Ok schwarze@.

1 files changed, 6 insertions, 10 deletions

diff --git a/chars.c b/chars.c
index e4f742d9..c33dedcf 100644
--- a/chars.c
+++ b/chars.c
@@ -1,4 +1,4 @@
-/*	$Id: chars.c,v 1.39 2011/04/30 22:24:31 kristaps Exp $ */
+/*	$Id: chars.c,v 1.40 2011/05/01 08:38:56 kristaps Exp $ */
 /*
  * Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
@@ -20,6 +20,7 @@
 #endif
 
 #include <assert.h>
+#include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -135,9 +136,11 @@ mchars_res2cp(struct mchars *arg, const char *p, size_t sz)
 	return(ln->unicode);
 }
 
-
 /*
  * Numbered character to literal character.
+ * This can only be a printable character (i.e., alnum, punct, space) so
+ * prevent the character from ruining our state (backspace, newline, and
+ * so on).
  */
 char
 mchars_num2char(const char *p, size_t sz)
@@ -148,15 +151,9 @@ mchars_num2char(const char *p, size_t sz)
 		return('\0');
 
 	i = atoi(p);
-	/* 
-	 * FIXME:
-	 * This is wrong.  Anything could be written here!
-	 * This should be carefully screened for possible characters.
-	 */
-	return(i <= 0 || i > 255 ? '\0' : (char)i);
+	return(isprint(i) ? (char)i : '\0');
 }
 
-
 /* 
  * Special character to string array.
  */
@@ -173,7 +170,6 @@ mchars_spec2str(struct mchars *arg, const char *p, size_t sz, size_t *rsz)
 	return(ln->ascii);
 }
 
-
 /* 
  * Reserved word to string array.
  */