wbrawner/hoedown
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix HTML tag detection

Browse source
This commit is contained in:
Vicent Marti 2011-04-17 14:05:55 +03:00
parent 7c6160bcce
commit a76c5f40bd
2 changed files with 26 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
examples/upskirt.c
View file

@ -34,7 +34,7 @@ main(int argc, char **argv)
size_t ret; size_t ret;
FILE *in = stdin; FILE *in = stdin;
struct mkd_renderer renderer; struct mkd_renderer renderer;
size_t i, iterations = 20000; size_t i, iterations = 1;
/* opening the file if given from the command line */ /* opening the file if given from the command line */
if (argc > 1) { if (argc > 1) {

33
render/xhtml.c
View file

@ -68,17 +68,34 @@ lus_attr_escape(struct buf *ob, const char *src, size_t size)
static int static int
is_html_tag(struct buf *tag, const char *tagname) is_html_tag(struct buf *tag, const char *tagname)
{ {
size_t i; size_t i = 0;
for (i = 0; i < tag->size; ++i) { if (i < tag->size && tag->data[0] != '<')
if (tagname[i] == '>') return 0;
i++;
while (i < tag->size && isspace(tag->data[i]))
i++;
if (i < tag->size && tag->data[i] == '/')
i++;
while (i < tag->size && isspace(tag->data[i]))
i++;
for (; i < tag->size; ++i, ++tagname) {
if (*tagname == 0)
break; break;
if (tag->data[i] != tagname[i]) if (tag->data[i] != *tagname)
return 0; return 0;
} }
return (i == tag->size || isspace(tag->data[i]) || tag->data[i] == '>'); if (i == tag->size)
return 0;
return (isspace(tag->data[i]) || tag->data[i] == '>');
} }
/******************** /********************
@ -339,13 +356,13 @@ rndr_raw_html(struct buf *ob, struct buf *text, void *opaque)
if (options->flags & XHTML_SKIP_HTML) if (options->flags & XHTML_SKIP_HTML)
escape_html = 1; escape_html = 1;
else if ((options->flags & XHTML_SKIP_STYLE) != 0 && is_html_tag(text, "<style>")) else if ((options->flags & XHTML_SKIP_STYLE) != 0 && is_html_tag(text, "style"))
escape_html = 1; escape_html = 1;
else if ((options->flags & XHTML_SKIP_LINKS) != 0 && is_html_tag(text, "<a>")) else if ((options->flags & XHTML_SKIP_LINKS) != 0 && is_html_tag(text, "a"))
escape_html = 1; escape_html = 1;
else if ((options->flags & XHTML_SKIP_IMAGES) != 0 && is_html_tag(text, "<img>")) else if ((options->flags & XHTML_SKIP_IMAGES) != 0 && is_html_tag(text, "img"))
escape_html = 1; escape_html = 1;