aniani/elinks
1
0
Fork 0
mirror of https://github.com/rkd77/elinks.git synced 2024-12-04 14:46:47 -05:00
Code

Bug 722: Truncate names of HTML media types.

Browse Source 
HTML 4.01 section 6.13 says each entry in the list
must be truncated before the first character that
is not in the allowed set.
This commit is contained in:
Kalle Olavi Niemitalo 2008-01-12 10:08:02 +02:00 committed by Kalle Olavi Niemitalo
parent 65b365587e
commit d2733656b8
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/document/html/parser/parse.c
View File

@ -1144,7 +1144,6 @@ int
supports_html_media_attr(const unsigned char *media) supports_html_media_attr(const unsigned char *media)
{ {
const unsigned char *optstr; const unsigned char *optstr;
const unsigned char *beg, *end;
/* The 1999-12-24 edition of HTML 4.01 is inconsistent on what /* The 1999-12-24 edition of HTML 4.01 is inconsistent on what
* it means if a STYLE or LINK element has no media attribute: * it means if a STYLE or LINK element has no media attribute:
@ -1175,15 +1174,25 @@ supports_html_media_attr(const unsigned char *media)
optstr = get_opt_str("document.css.media", NULL); optstr = get_opt_str("document.css.media", NULL);
while (*media != '\0') { while (*media != '\0') {
const unsigned char *beg, *end;
while (*media == ' ') while (*media == ' ')
++media; ++media;
beg = media; beg = media;
media += strcspn(media, ","); media += strcspn(media, ",");
end = media;
if (*media == ',') if (*media == ',')
++media; ++media;
while (end > beg && end[-1] == ' ')
--end; /* HTML 4.01 section 6.13 says each entry in the list
* must be truncated before the first character that
* is not in the allowed set. */
end = beg;
while ((*end >= 0x41 && *end <= 0x5a)
|| (*end >= 0x61 && *end <= 0x7a)
|| (*end >= 0x30 && *end <= 0x39)
|| *end == 0x29)
++end;
if (end > beg if (end > beg
&& supports_css_media_type(optstr, beg, end - beg)) && supports_css_media_type(optstr, beg, end - beg))
return 1; return 1;