walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Merge pull request #393 from Dmitry-Me/furtherResolve1222223 

Further resolve CID 1222223
This commit is contained in:
Daniel Marjamäki 2014-08-14 09:54:13 +02:00
parent b8e356462a 0991d42cb9
commit 6db3eabadb
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/library.cpp
View File

@ -289,9 +289,12 @@ Library::Error Library::load(const tinyxml2::XMLDocument &doc)
for (const tinyxml2::XMLElement *markupnode = node->FirstChildElement(); markupnode; markupnode = markupnode->NextSiblingElement()) { for (const tinyxml2::XMLElement *markupnode = node->FirstChildElement(); markupnode; markupnode = markupnode->NextSiblingElement()) {
if (strcmp(markupnode->Name(), "keywords") == 0) { if (strcmp(markupnode->Name(), "keywords") == 0) {
for (const tinyxml2::XMLElement *librarynode = markupnode->FirstChildElement(); librarynode; librarynode = librarynode->NextSiblingElement()) { for (const tinyxml2::XMLElement *librarynode = markupnode->FirstChildElement(); librarynode; librarynode = librarynode->NextSiblingElement()) {
if (strcmp(librarynode->Name(), "keyword") == 0) if (strcmp(librarynode->Name(), "keyword") == 0) {
_keywords[extension].insert(librarynode->Attribute("name")); const char* nodeName = librarynode->Attribute("name");
else if (nodeName == nullptr)
return Error(MISSING_ATTRIBUTE, "name");
_keywords[extension].insert(nodeName);
} else
return Error(BAD_ELEMENT, librarynode->Name()); return Error(BAD_ELEMENT, librarynode->Name());
} }
} }