From 0991d42cb9d504635794d96907638907568da95d Mon Sep 17 00:00:00 2001 From: Dmitry-Me Date: Tue, 12 Aug 2014 11:14:28 +0400 Subject: [PATCH] Further resolve CID 1222223 --- lib/library.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/library.cpp b/lib/library.cpp index 6244a8df7..ce794f6df 100644 --- a/lib/library.cpp +++ b/lib/library.cpp @@ -289,9 +289,12 @@ Library::Error Library::load(const tinyxml2::XMLDocument &doc) for (const tinyxml2::XMLElement *markupnode = node->FirstChildElement(); markupnode; markupnode = markupnode->NextSiblingElement()) { if (strcmp(markupnode->Name(), "keywords") == 0) { for (const tinyxml2::XMLElement *librarynode = markupnode->FirstChildElement(); librarynode; librarynode = librarynode->NextSiblingElement()) { - if (strcmp(librarynode->Name(), "keyword") == 0) - _keywords[extension].insert(librarynode->Attribute("name")); - else + if (strcmp(librarynode->Name(), "keyword") == 0) { + const char* nodeName = librarynode->Attribute("name"); + if (nodeName == nullptr) + return Error(MISSING_ATTRIBUTE, "name"); + _keywords[extension].insert(nodeName); + } else return Error(BAD_ELEMENT, librarynode->Name()); } }