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

Improved parsing of <SCRIPT> tag.

Browse source 
Complex script code tends to contain other tags inside strings. As we generally don't parse strings we erroneously interpreted those tags. The easiest workaround is to not interpret tags at all until the </SCRIPT> tag is found.
This commit is contained in:
Oliver Schmidt 2015-05-25 16:46:23 +02:00
parent a8837e230c
commit 9b9b92be06
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
apps/webbrowser/htmlparser.c
View file

@ -137,7 +137,7 @@ G * (<br>, <p>, <h>), the <li> tag (but does not even try to
#define MAJORSTATE_LINK 2 #define MAJORSTATE_LINK 2
#define MAJORSTATE_FORM 3 #define MAJORSTATE_FORM 3
#define MAJORSTATE_DISCARD 4 #define MAJORSTATE_DISCARD 4
#define MAJORSTATE_SCRIPT 5
struct htmlparser_state { struct htmlparser_state {
@ -303,7 +303,7 @@ do_word(void)
if(s.word[s.wordlen - 1] != ISO_space) { if(s.word[s.wordlen - 1] != ISO_space) {
add_char(ISO_space); add_char(ISO_space);
} }
} else if(s.majorstate == MAJORSTATE_DISCARD) { } else if(s.majorstate >= MAJORSTATE_DISCARD) {
s.wordlen = 0; s.wordlen = 0;
} else { } else {
s.word[s.wordlen] = '\0'; s.word[s.wordlen] = '\0';
@ -363,11 +363,17 @@ static void
parse_tag(void) parse_tag(void)
{ {
static char *tagattrparam; static char *tagattrparam;
static unsigned char tag;
static unsigned char size; static unsigned char size;
tag = find_tag(s.tag);
if(s.majorstate == MAJORSTATE_SCRIPT && tag != TAG_SLASHSCRIPT) {
return;
}
PRINTF(("Parsing tag '%s' '%s' '%s'\n", s.tag, s.tagattr, s.tagattrparam)); PRINTF(("Parsing tag '%s' '%s' '%s'\n", s.tag, s.tagattr, s.tagattrparam));
switch(find_tag(s.tag)) { switch(tag) {
case TAG_P: case TAG_P:
case TAG_H1: case TAG_H1:
case TAG_H2: case TAG_H2:
@ -389,6 +395,8 @@ parse_tag(void)
} }
break; break;
case TAG_SCRIPT: case TAG_SCRIPT:
switch_majorstate(MAJORSTATE_SCRIPT);
break;
case TAG_STYLE: case TAG_STYLE:
case TAG_SELECT: case TAG_SELECT:
switch_majorstate(MAJORSTATE_DISCARD); switch_majorstate(MAJORSTATE_DISCARD);