emelie/tidy-html5
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'issues_588_591' into next

Browse source
This commit is contained in:
Jim Derry 2017-10-02 13:14:49 -04:00
parent 40ca09c189 2852ad4c63
commit 024f034fa3
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/attrs.c
View file

@ -1517,15 +1517,16 @@ static void CheckLowerCaseAttrValue( TidyDocImpl* doc, Node *node, AttVal *attva
} }
} }
/* methods for checking value of a specific attribute */ /* Issue #588 - use simple macros only!
#ifdef _WIN32 Seems 'isalnum(c)' is undefined and can
cause an assert or a SIGSEGV in some libraries
if 'c' is not EOF, or in the range 0 to 0xff,
so avoid using it.
*/
#define ISUPPER(a) ((a >= 'A') && (a <= 'Z')) #define ISUPPER(a) ((a >= 'A') && (a <= 'Z'))
#define ISLOWER(a) ((a >= 'a') && (a <= 'z')) #define ISLOWER(a) ((a >= 'a') && (a <= 'z'))
#define ISNUMERIC(a) ((a >= '0') && (a <= '9')) #define ISNUMERIC(a) ((a >= '0') && (a <= '9'))
#define ISALNUM(a) (ISUPPER(a) || ISLOWER(a) || ISNUMERIC(a)) #define ISALNUM(a) (ISUPPER(a) || ISLOWER(a) || ISNUMERIC(a))
#else
#define ISALNUM(a) isalnum(a)
#endif
static Bool IsURLCodePoint( ctmbstr p, uint *increment ) static Bool IsURLCodePoint( ctmbstr p, uint *increment )
{ {

4
src/clean.c
View file

@ -1902,7 +1902,9 @@ void TY_(CleanWord2000)( TidyDocImpl* doc, Node *node)
attval = node->attributes; attval = node->attributes;
while ( attval ) { while ( attval ) {
next_attr = attval->next; next_attr = attval->next;
if ( strcmp(attval->attribute, "xmlns") != 0 )
/* Issue #591 - take care of a NULL attribute, too. */
if ( !attval->attribute || ( strcmp(attval->attribute, "xmlns") != 0 ))
TY_(ReportAttrError)(doc, node, attval, PROPRIETARY_ATTRIBUTE); TY_(ReportAttrError)(doc, node, attval, PROPRIETARY_ATTRIBUTE);
attval = next_attr; attval = next_attr;
} }