Changeset 8713

Timestamp:

02/17/09 13:18:38 (4 years ago)

Author:

mcarrick

Message:

completed error checking in DPD parser

Location:

ossiedev/branches/mcarrick/DPD

Files:

• DeviceClass.cpp (modified) (1 diff)
• DevicePkg.cpp (modified) (1 diff)
• DevicePkg.h (modified) (2 diffs)
• DevicePkgRef.cpp (modified) (2 diffs)
• HWDeviceRegistration.cpp (modified) (1 diff)
• PropertyFile.cpp (modified) (2 diffs)

ossiedev/branches/mcarrick/DPD/DeviceClass.cpp

@@ -20 +20 @@
         TiXmlElement *classType = elem->FirstChildElement("class"); // set link to class tags
         
-        // there may be one or more class tags, loop through and append them all
-        for (; classType; classType = classType->NextSiblingElement("class"))
+        if (classType)
         {
-                deviceClass.push_back(classType->GetText());
+                // there may be one or more class tags, loop through and append them all
+                for (; classType; classType = classType->NextSiblingElement("class"))
+                {
+                        deviceClass.push_back(classType->GetText());
+                }
         }
-
+        else
+        {
+                std::cout << "ERROR: Could not find a 'class' element in deviceclass tag, must have at least one class designation" << std::endl;
+                exit(-1);
+        }
 
 }

ossiedev/branches/mcarrick/DPD/DevicePkg.cpp

@@ -27 +27 @@
 void DevicePkg::parseAttributes(TiXmlElement *elem)
 {
-        id = elem->Attribute("id");
-        name = elem->Attribute("name");
-        version = elem->Attribute("version");
+        parseAttributeID(elem);
+        parseAttributeName(elem);
+        parseAttributeVersion(elem);
+}
+
+void DevicePkg::parseAttributeID(TiXmlElement *elem)
+{
+        if (elem->Attribute("id"))
+        {
+                id = elem->Attribute("id");
+        }
+        else
+        {
+                std::cout << "ERROR: Could not find attrbute 'id' within devicepkg tag" << std::endl;
+                exit(-1);
+        }
+}
+
+void DevicePkg::parseAttributeName(TiXmlElement *elem)
+{
+        if (elem->Attribute("name"))
+        {
+                name = elem->Attribute("name");
+        }
+        else
+        {
+                std::cout << "ERROR: Could not find attribute 'name' within devicepkg tag" << std::endl;
+                exit(-1);
+        }
+}
+
+void DevicePkg::parseAttributeVersion(TiXmlElement *elem)
+{
+        if (elem->Attribute("version"))
+        {
+                version = elem->Attribute("version");
+        }
+        else
+        {
+                std::cout << "ERROR: Could not find attribute 'version' within devicepkg tag" << std::endl;
+                exit(-1);
+        }
 }
 
 void DevicePkg::parseChildElements(TiXmlElement *elem)
 {
+        parseAuthor(elem);
+        parseTitle(elem);
+        parseDescription(elem);
+}
+
+void DevicePkg::parseAuthor(TiXmlElement *elem)
+{
         TiXmlElement *auth = elem->FirstChildElement("author");
-        author = auth->GetText();
+        if (auth)
+        {
+                author = auth->GetText();
+        }
+        else
+        {
+                std::cout << "ERROR: Could not find 'author' element within devicepkg tag" << std::endl;
+                exit(-1);
+        }
+}
 
+void DevicePkg::parseTitle(TiXmlElement *elem)
+{
         TiXmlElement *titleElem = elem->FirstChildElement("title");
-        title = titleElem->GetText();
+        if (titleElem)
+        {
+                title = titleElem->GetText();
+        }
+        else
+        {
+                std::cout << "ERROR: Could not find 'title' element within devicepkg tag" << std::endl;
+                exit(-1);
+        }
+}
 
+void DevicePkg::parseDescription(TiXmlElement *elem)
+{
         TiXmlElement *descrip = elem->FirstChildElement("description");
-        description = descrip->GetText();
+        if (descrip)
+        {
+                description = descrip->GetText();
+        }
+        else
+        {
+                std::cout << "ERROR: Could not find 'description' element within devicepkg tag" << std::endl;
+        }
 }
 

ossiedev/branches/mcarrick/DPD/DevicePkg.h

@@ -21 +21 @@
                 std::string getDevPkgName();
                 std::string getDevPkgVersion();
-
                 std::string getDevPkgTitle();
                 std::string getDevPkgAuthor();
@@ -29 +28 @@
                 void parseElement(TiXmlElement *elem);
                 void parseAttributes(TiXmlElement *elem);
+                void parseAttributeID(TiXmlElement *elem);
+                void parseAttributeName(TiXmlElement *elem);
+                void parseAttributeVersion(TiXmlElement *elem);
                 void parseChildElements(TiXmlElement *elem);
+                void parseTitle(TiXmlElement *elem);
+                void parseAuthor(TiXmlElement *elem);
+                void parseDescription(TiXmlElement *elem);
 
         private:

ossiedev/branches/mcarrick/DPD/DevicePkgRef.cpp

@@ -25 +25 @@
 void DevicePkgRef::parseAttributes(TiXmlElement *elem)
 {
-        type = elem->Attribute("type");
+        if (elem->Attribute("type"))
+        {
+                type = elem->Attribute("type");
+        }
+        else
+        {
+                std::cout << "ERROR: Could not find 'type' attribute in devicepkgref tag" << std::endl;
+                exit(-1);
+        }
 }
 
@@ -31 +39 @@
 {
         TiXmlElement *local = elem->FirstChildElement("localfile");
-        localfile = local->Attribute("name");
+        if (local)
+        {
+                localfile = local->Attribute("name");
+        }
+        else
+        {
+                std::cout << "ERROR: Could not find 'name' attribute in localfile tag" << std::endl;
+                exit(-1);
+        }
 }
 

ossiedev/branches/mcarrick/DPD/HWDeviceRegistration.cpp

@@ -131 +131 @@
         if (modNum)
         {
+                modelnumber = modNum->GetText();
         }
         else

ossiedev/branches/mcarrick/DPD/PropertyFile.cpp

@@ -24 +24 @@
 void PropertyFile::parseAttributes(TiXmlElement *elem)
 {
-        type = elem->Attribute("type");
+        // verify attribute exists before parsing to prevent seg fault
+        if (elem->Attribute("type"))
+        {
+                type = elem->Attribute("type");
+        }
+        else
+        {
+                std::cout << "ERROR: Could not find 'type' attribute within propertyfile tag" << std::endl;
+                exit(-1);
+        }
 }
 
@@ -30 +39 @@
 {
         TiXmlElement *local = elem->FirstChildElement("localfile");
-        localfile = local->Attribute("name");
+        if (local)
+        {
+                localfile = local->Attribute("name");
+        }
+        else
+        {
+                std::cout << "ERROR: Could not find 'name' attribute within localfile tag" << std::endl;
+                exit(-1);
+        }
 }