aniani/elinks
1
0
Fork 0
mirror of https://github.com/rkd77/elinks.git synced 2025-01-03 14:57:44 -05:00
Code

Use skip_sgml_chars() in skip_comment() and skip_cdata_section()

Browse Source
This commit is contained in:
Jonas Fonseca 2005-12-31 01:40:52 +01:00 committed by Jonas Fonseca
parent 4e10bcf772
commit 8f7f6abc16
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/dom/sgml/scanner.c
View File

@ -193,12 +193,19 @@ skip_comment(struct dom_scanner *scanner, unsigned char **string)
unsigned char *pos = *string;
int length = 0;
for (; pos < scanner->end - 2; pos++)
if (pos[0] == '-' && pos[1] == '-' && pos[2] == '>') {
length = pos - *string;
pos += 3;
for ( ; (pos = skip_sgml_chars(scanner, pos, '>')); pos++) {
/* It is always safe to access index -2 and -1 here since we
* are supposed to have '<!--' before this is called. We do
* however need to check that the '-->' are not overlapping any
* preceeding '-'. */
if (pos[-2] == '-' && pos[-1] == '-' && &pos[-2] >= *string) {
length = pos - *string - 2;
pos++;
break;
}
}
if (!pos) pos = scanner->end;
*string = pos;
return length;
@ -210,12 +217,17 @@ skip_cdata_section(struct dom_scanner *scanner, unsigned char **string)
unsigned char *pos = *string;
int length = 0;
for (; pos < scanner->end - 2; pos++)
if (pos[0] == ']' && pos[1] == ']' && pos[2] == '>') {
length = pos - *string;
pos += 3;
for ( ; (pos = skip_sgml_chars(scanner, pos, '>')); pos++) {
/* It is always safe to access index -2 and -1 here since we
* are supposed to have '<![CDATA[' before this is called. */
if (pos[-2] == ']' && pos[-1] == ']') {
length = pos - *string - 2;
pos++;
break;
}
}
if (!pos) pos = scanner->end;
*string = pos;
return length;