try mem leak linux fix

3MFConsortium · Dec 7, 2023 · a629092 · a629092
1 parent 5410ab4
commit a629092
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/Source/Model/Reader/SecureContent101/NMR_ModelReaderNode_KeyStoreCEKParams.cpp b/Source/Model/Reader/SecureContent101/NMR_ModelReaderNode_KeyStoreCEKParams.cpp
@@ -113,17 +113,20 @@ namespace NMR {
 				PModelReaderNode_StringValue pXMLNode = std::make_shared<CModelReaderNode_StringValue>(m_pWarnings);
 				pXMLNode->parseXML(pXMLReader);
 				std::string result = base64_decode(pXMLNode->getValue());
-				m_iv = std::vector<nfByte>(result.begin(), result.end());
+				if(!result.empty())
+					m_iv = std::vector<nfByte>(result.begin(), result.end());
 			} else if (strcmp(pChildName, XML_3MF_SECURE_CONTENT_TAG) == 0) {
 				PModelReaderNode_StringValue pXMLNode = std::make_shared<CModelReaderNode_StringValue>(m_pWarnings);
 				pXMLNode->parseXML(pXMLReader);
 				std::string result = base64_decode(pXMLNode->getValue());
-				m_tag = std::vector<nfByte>(result.begin(), result.end());
+				if (!result.empty())
+                    m_tag = std::vector<nfByte>(result.begin(), result.end());
 			} else if (strcmp(pChildName, XML_3MF_SECURE_CONTENT_AAD) == 0) {
 				PModelReaderNode_StringValue pXMLNode = std::make_shared<CModelReaderNode_StringValue>(m_pWarnings);
 				pXMLNode->parseXML(pXMLReader);
 				std::string result = base64_decode(pXMLNode->getValue());
-				m_aad = std::vector<nfByte>(result.begin(), result.end());
+				if (!result.empty())
+					m_aad = std::vector<nfByte>(result.begin(), result.end());
 			} else {
 				m_pWarnings->addWarning(NMR_ERROR_NAMESPACE_INVALID_ELEMENT, mrwInvalidOptionalValue);
 			}

diff --git a/Source/Model/Reader/SecureContent101/NMR_ModelReaderNode_KeyStoreCipherValue.cpp b/Source/Model/Reader/SecureContent101/NMR_ModelReaderNode_KeyStoreCipherValue.cpp
@@ -73,7 +73,8 @@ namespace NMR {
 			pNode->parseXML(pXMLReader);
 			try {
 				std::string result = base64_decode(pNode->getValue());
-				m_sCipherValue = std::vector<nfByte>(result.begin(), result.end());
+				if(!result.empty())
+					m_sCipherValue = std::vector<nfByte>(result.begin(), result.end());
 			}
 			catch (...) {
 				// base64_decode throws an exception if the input is not valid base64