Changeset 3357

Timestamp:

04/08/07 08:52:33 (6 years ago)

Author:

balister

Message:

Fix seg fault in SPDParser.

Files:

• ossie/trunk/ossie/parser/SPDParser.cpp (modified) (10 diffs)

ossie/trunk/ossie/parser/SPDParser.cpp

@@ -58 +58 @@
 SPDParser::~SPDParser()
 {
+    DEBUG(4, SPDParser, "In destructor.");
 
         unsigned int i;
@@ -98 +99 @@
 void SPDParser::parseSoftPkgAttributes(TiXmlElement *elem)
 {
+    DEBUG(4, SPDParser, "In parseSoftPkgAttributes.");
+
     const char *id = elem->Attribute("id");
     softPkgID = id;
@@ -119 +122 @@
 void SPDParser::parseSoftPkgTitle(TiXmlElement *elem)
 {
+    DEBUG(4, SPDParser, "In parseSoftPkgTitle.");
+
     TiXmlElement *title = elem->FirstChildElement("title");
 
     if(title) {
-        softPkgTitle = title->GetText();
+        const char *str = title->GetText();
+        if (str)
+            softPkgTitle = str;
     }
 }
@@ -129 +136 @@
 void SPDParser::parseSoftPkgDescription(TiXmlElement *elem)
 {
+    DEBUG(4, SPDParser, "In parseSoftPkgDescription.");
+
     TiXmlElement *title = elem->FirstChildElement("description");
 
@@ -139 +148 @@
 void SPDParser::parseSoftPkgAuthor(TiXmlElement *elem)
 {
+    DEBUG(4, SPDParser, "In parseSoftPkgAuthor.");
+
     TiXmlElement *author = elem->FirstChildElement("author");
     
@@ -150 +161 @@
 void SPDParser::parsePRFRef(TiXmlElement *elem)
 {
+    DEBUG(4, SPDParser, "In parsePRFRef.");
+
     TiXmlElement *prf = elem->FirstChildElement("propertyfile");
     
@@ -161 +174 @@
 void SPDParser::parseSCDRef(TiXmlElement *elem)
 {
+    DEBUG(4, SPDParser, "In parseSCDRef.");
+
     TiXmlElement *scd = elem->FirstChildElement("descriptor");
     
@@ -172 +187 @@
 void SPDParser::parseImplementations(TiXmlElement *elem)
 {
+    DEBUG(4, SPDParser, "In parseImplementations.");
+
     TiXmlElement *imp = elem->FirstChildElement("implementation");
     
@@ -182 +199 @@
 void SPDParser::parseUsesDevices(TiXmlElement *elem)
 {
+    DEBUG(4, SPDParser, "In parseUsesDevices.");
+
     TiXmlElement *uses = elem->FirstChildElement("usesdevice");
 
@@ -210 +229 @@
 bool SPDParser::isScaCompliant()
 {
+
     if(softPkgType == "sca_compliant")
         return true;