deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Further improved parsing of <SCRIPT> tag.

Browse source 
Script code may contain a '<' as part of a equation. We erroneously interpreted that as start of a tag. Now we check for the very next char to be a '/' as the only tag allowed is the </SCRIPT> tag.
This commit is contained in:
Oliver Schmidt 2015-06-07 00:23:44 +02:00
parent 1d934db654
commit e8b4befd1e
1 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
apps/webbrowser/htmlparser.c
View file

@ -367,6 +367,8 @@ parse_tag(void)
static unsigned char size; static unsigned char size;
tag = find_tag(s.tag); tag = find_tag(s.tag);
/* If we are inside a <script> we mustn't interpret any tags
(inside JavaScript strings) but wait for the </script>. */
if(s.majorstate == MAJORSTATE_SCRIPT && tag != TAG_SLASHSCRIPT) { if(s.majorstate == MAJORSTATE_SCRIPT && tag != TAG_SLASHSCRIPT) {
return; return;
} }
@ -562,6 +564,15 @@ parse_word(char *data, uint8_t dlen)
} }
break; break;
case MINORSTATE_TAG: case MINORSTATE_TAG:
/* If we are inside a <srcipt> we mustn't mistake a JavaScript
equation with a '<' as a tag. So we check for the very next
character to be a '/' as we're only interested in parsing
the </script>. */
if(s.majorstate == MAJORSTATE_SCRIPT && data[0] != ISO_slash) {
s.minorstate = MINORSTATE_TEXT;
break;
}
/* We are currently parsing within the name of a tag. We check /* We are currently parsing within the name of a tag. We check
for the end of a tag (the '>' character) or whitespace (which for the end of a tag (the '>' character) or whitespace (which
indicates that we should parse a tag attr argument indicates that we should parse a tag attr argument