Add garvankeeley's suggestions using calloc

This commit is contained in:
Marcos Caceres 2016-10-05 18:54:25 +11:00
parent 040c22c6dc
commit cfc22ac46e

View file

@ -1735,11 +1735,14 @@ Bool TY_(TidyMetaCharset)(TidyDocImpl* doc)
if(!contentAttr || strcmp(lvalue, "content-type") != 0) if(!contentAttr || strcmp(lvalue, "content-type") != 0)
continue; continue;
tmbstr lcontent = TY_(tmbstrtolower)(contentAttr->value); tmbstr lcontent = TY_(tmbstrtolower)(contentAttr->value);
char expected[sizeof(enc) + 8] = "charset="; char* charsetString = "charset=";
char* expected = calloc(strlen(enc) + strlen(charsetString) + 1, sizeof(char*));
strcat(expected, charsetString);
strcat(expected, enc); strcat(expected, enc);
if(TY_(tmbsubstr)(lcontent, expected)){ if(TY_(tmbsubstr)(lcontent, expected)){
printf("WARN ABOUT CLASH: %s \n", contentAttr->value); printf("WARN ABOUT CLASH: %s \n", contentAttr->value);
} }
free(expected);
} }
// 3. <meta charset="utf-8" http-equiv="Content-Type" content="..."> // 3. <meta charset="utf-8" http-equiv="Content-Type" content="...">
// This is generally bad. // This is generally bad.