Free and return in one place

Change-Id: Ib0a38c4f9103b25f174a7b34830bff307fa6c9be

1 files changed, 5 insertions, 10 deletions

diff --git a/src/lib/VSDXParser.cpp b/src/lib/VSDXParser.cpp
index 1460f88..b8ef91b 100644
--- a/src/lib/VSDXParser.cpp
+++ b/src/lib/VSDXParser.cpp
@@ -581,30 +581,25 @@ int libvisio::VSDXParser::getElementToken(xmlTextReaderPtr reader)
         else if (!strncmp((char *)stringValue, "Alignment", 9))
           tokenId = XML_ALIGNMENT;
       }
-      xmlFree(stringValue);
     }
-    return tokenId;
+    break;
   case XML_ROW:
     stringValue = xmlTextReaderGetAttribute(reader, BAD_CAST("N"));
     if (!stringValue)
       stringValue = xmlTextReaderGetAttribute(reader, BAD_CAST("T"));
     if (stringValue)
-    {
       tokenId = VSDXMLTokenMap::getTokenId(stringValue);
-      xmlFree(stringValue);
-    }
-    return tokenId;
+    break;
   case XML_SECTION:
     stringValue = xmlTextReaderGetAttribute(reader, BAD_CAST("N"));
     if (stringValue)
-    {
       tokenId = VSDXMLTokenMap::getTokenId(stringValue);
-      xmlFree(stringValue);
-    }
-    return tokenId;
+    break;
   default:
     break;
   }
+  if (stringValue)
+    xmlFree(stringValue);
   return tokenId;
 }