luisgulo/gambas-source-code
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[GB.XML.HTML]

Browse source 
* BUG: XmlElement: Fix infinite loop from MatchFilter()



git-svn-id: svn://localhost/gambas/trunk@7389 867c0c6c-44f3-4631-809d-bfa615b0a4ec
This commit is contained in:
Tobias Boege 2015-10-05 15:41:37 +00:00
parent 06893f0942
commit afc5f34660
1 changed files with 11 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
gb.xml/src/element.cpp
View file

@ -210,27 +210,18 @@ bool XMLElement_AttributeContains(const Element *elmt, const char *attrName, siz
{
Attribute *attr = XMLElement_GetAttribute(elmt, attrName, lenAttrName);
if(!attr) return false;
char *pos = (char*)memchr(attr->attrValue, ' ' ,attr->lenAttrValue);
char *oldPos = attr->attrValue;
while(pos)
{
if((pos + 1) == lenValue + oldPos) //(pos + 1) - oldPos == lenValue
{
if(!memcmp(value, pos + 1, lenValue)) return true;
}
oldPos = pos + 1;
pos = (char*)memchr(pos, ' ' ,attr->lenAttrValue - (attr->attrValue - pos));
}
if(((attr->attrValue + attr->lenAttrValue)) == lenValue + oldPos)
{
if(!memcmp(value, oldPos, lenValue)) return true;
}
return false;
char *pos = attr->attrValue;
size_t left = attr->lenAttrValue;
while (1) {
if (!memcmp(value, pos, lenValue)) return true;
pos = (char*)memchr(pos, ' ', left);
if (!pos) break;
pos++;
left = attr->lenAttrValue - (pos - attr->attrValue);
}
return false;
}
void XMLElement_RemoveAttribute(Element *elmt, const char *attrName, size_t lenAttrName)