diff options
| author | Mike Hommey <glandium@debian.org> | 2008-01-19 17:16:58 +0100 |
|---|---|---|
| committer | Mike Hommey <glandium@debian.org> | 2008-01-19 17:16:58 +0100 |
| commit | fc760252aba4054a612dd20b803d0c7c19713064 (patch) | |
| tree | 088f8e29a5ed82c5417869894c17ba72f715d7a6 /HTMLparser.c | |
| parent | c69572cb9f2467259a73de64c08e141f21f17fa8 (diff) | |
| download | libxml2-fc760252aba4054a612dd20b803d0c7c19713064.tar.gz | |
Load /tmp/libxml2-2.6.31 intoupstream/2.6.31.dfsg
libxml2/branches/upstream/current.
Diffstat (limited to 'HTMLparser.c')
| -rw-r--r-- | HTMLparser.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/HTMLparser.c b/HTMLparser.c index 91d54c7..38af5e3 100644 --- a/HTMLparser.c +++ b/HTMLparser.c @@ -711,7 +711,7 @@ html40ElementTable[] = { { "em", 0, 3, 0, 0, 0, 0, 1, "emphasis", DECL html_inline, NULL, DECL html_attrs, NULL, NULL }, -{ "embed", 0, 1, 2, 0, 1, 1, 1, "generic embedded object ", +{ "embed", 0, 1, 0, 0, 1, 1, 1, "generic embedded object ", EMPTY, NULL, DECL embed_attrs, NULL, NULL }, { "fieldset", 0, 0, 0, 0, 0, 0, 0, "form control group ", @@ -2772,8 +2772,13 @@ htmlParseCharData(htmlParserCtxtPtr ctxt) { cur = CUR_CHAR(l); while (((cur != '<') || (ctxt->token == '<')) && ((cur != '&') || (ctxt->token == '&')) && - (IS_CHAR(cur))) { - COPY_BUF(l,buf,nbchar,cur); + (cur != 0)) { + if (!(IS_CHAR(cur))) { + htmlParseErrInt(ctxt, XML_ERR_INVALID_CHAR, + "Invalid char in CDATA 0x%X\n", cur); + } else { + COPY_BUF(l,buf,nbchar,cur); + } if (nbchar >= HTML_PARSER_BIG_BUFFER_SIZE) { /* * Ok the segment is to be consumed as chars. |