[mapguide-commits] r8598 - in branches/3.0/MgDev: . Common/MdfParser

[svn_mapguide at osgeo.org]

Author: jng
Date: 2015-03-28 02:18:49 -0700 (Sat, 28 Mar 2015)
New Revision: 8598

Modified:
   branches/3.0/MgDev/
   branches/3.0/MgDev/Common/MdfParser/FSDSAX2Parser.cpp
   branches/3.0/MgDev/Common/MdfParser/SAX2Parser.cpp
Log:
Merged revision(s) 8595 from trunk/MgDev:
Add missing calls to XMLString::release() in 2 places using XMLString::transcode().
........



Property changes on: branches/3.0/MgDev
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/2.4/MgDev:6749-6756,6777-6783,6785-6787,6789,6791-6794,6796-6801,6954-6962,6986-7006
/branches/2.6/MgDev:8276-8286,8288-8292,8297,8299,8301,8303,8314-8315,8318,8335,8340,8354-8355,8365,8373
/sandbox/jng/convenience_apis:8262-8268,8271-8363
/sandbox/jng/createruntimemap:7486-7555
/sandbox/jng/dwftk:8321-8324,8328-8329,8331,8352
/sandbox/jng/geos34x:8256-8259
/sandbox/jng/tiling:8174-8208
/sandbox/jng/v30:8212-8227
/sandbox/rfc94:5099-5163
   + /branches/2.4/MgDev:6749-6756,6777-6783,6785-6787,6789,6791-6794,6796-6801,6954-6962,6986-7006
/branches/2.6/MgDev:8276-8286,8288-8292,8297,8299,8301,8303,8314-8315,8318,8335,8340,8354-8355,8365,8373
/sandbox/jng/convenience_apis:8262-8268,8271-8363
/sandbox/jng/createruntimemap:7486-7555
/sandbox/jng/dwftk:8321-8324,8328-8329,8331,8352
/sandbox/jng/geos34x:8256-8259
/sandbox/jng/tiling:8174-8208
/sandbox/jng/v30:8212-8227
/sandbox/rfc94:5099-5163
/trunk/MgDev:8595

Modified: branches/3.0/MgDev/Common/MdfParser/FSDSAX2Parser.cpp
===================================================================
--- branches/3.0/MgDev/Common/MdfParser/FSDSAX2Parser.cpp	2015-03-28 08:44:45 UTC (rev 8597)
+++ branches/3.0/MgDev/Common/MdfParser/FSDSAX2Parser.cpp	2015-03-28 09:18:49 UTC (rev 8598)
@@ -74,7 +74,9 @@
 
 void FSDSAX2Parser::error(const SAXException& exc)
 {
-    m_strParserError = toMdfString(XMLString::transcode(exc.getMessage()));
+    char* str = XMLString::transcode(exc.getMessage());
+    m_strParserError = toMdfString(str);
+    XMLString::release(&str);
 }
 
 

Modified: branches/3.0/MgDev/Common/MdfParser/SAX2Parser.cpp
===================================================================
--- branches/3.0/MgDev/Common/MdfParser/SAX2Parser.cpp	2015-03-28 08:44:45 UTC (rev 8597)
+++ branches/3.0/MgDev/Common/MdfParser/SAX2Parser.cpp	2015-03-28 09:18:49 UTC (rev 8598)
@@ -123,7 +123,9 @@
 
 void SAX2Parser::error(const SAXException& exc)
 {
-    m_strParserError = toMdfString(XMLString::transcode(exc.getMessage()));
+    char* str = XMLString::transcode(exc.getMessage());
+    m_strParserError = toMdfString(str);
+    XMLString::release(&str);
 }