From f5b3942475d0ba43d54201c60e42f0ad657a11f9 Mon Sep 17 00:00:00 2001 From: Kristaps Dzonsons Date: Sun, 1 May 2011 08:38:56 +0000 Subject: Filter all \N'' values with isprint(). Ok schwarze@. --- chars.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'chars.c') 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 * Copyright (c) 2011 Ingo Schwarze @@ -20,6 +20,7 @@ #endif #include +#include #include #include #include @@ -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. */ -- cgit v1.2.3-56-ge451