* mdocml: Handle output encoding for unicode, numbered and named escape
@ 2014-10-27 16:29 schwarze
0 siblings, 0 replies; only message in thread
From: schwarze @ 2014-10-27 16:29 UTC (permalink / raw)
To: source
Log Message:
-----------
Handle output encoding for unicode, numbered and named escape sequences
in one common, safe way instead of three different ways. In particular,
* skip NUL, it is used to mean "no output desired"
* deny 0x01-0x1F and 0x7F-0x9F, print REPLACEMENT CHARACTER instead
* print 0x20-0x7E literally or name-encoded, as required
* print characters above 0x9F numerically
Modified Files:
--------------
mdocml:
html.c
Revision Data
-------------
Index: html.c
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/html.c,v
retrieving revision 1.178
retrieving revision 1.179
diff -Lhtml.c -Lhtml.c -u -p -r1.178 -r1.179
--- html.c
+++ html.c
@@ -437,40 +437,28 @@ print_encode(struct html *h, const char
case ESCAPE_UNICODE:
/* Skip past "u" header. */
c = mchars_num2uc(seq + 1, len - 1);
-
- /*
- * XXX Security warning:
- * For now, forbid Unicode obfuscation of ASCII
- * characters. An audit of the callers is
- * required before this can be removed.
- */
-
- if (c < 0x80)
- c = 0xFFFD;
-
- printf("&#x%x;", c);
break;
case ESCAPE_NUMBERED:
c = mchars_num2char(seq, len);
- if ( ! ('\0' == c || print_escape(c)))
- putchar(c);
break;
case ESCAPE_SPECIAL:
c = mchars_spec2cp(h->symtab, seq, len);
- if (c <= 0)
- break;
- if (c < 0x20 || c > 0x7e)
- printf("&#%d;", c);
- else if ( ! print_escape(c))
- putchar(c);
break;
case ESCAPE_NOSPACE:
if ('\0' == *p)
nospace = 1;
- break;
+ continue;
default:
- break;
+ continue;
}
+ if (c <= 0)
+ continue;
+ if (c < 0x20 || (c > 0x7E && c < 0xA0))
+ c = 0xFFFD;
+ if (c > 0x7E)
+ printf("&#%d;", c);
+ else if ( ! print_escape(c))
+ putchar(c);
}
return(nospace);
--
To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2014-10-27 16:29 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-10-27 16:29 mdocml: Handle output encoding for unicode, numbered and named escape schwarze
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).