diff options
author | Adrian Kummerländer | 2014-04-23 21:26:58 +0200 |
---|---|---|
committer | Adrian Kummerländer | 2014-04-23 21:26:58 +0200 |
commit | 525aa8c4dc3e23f0369c7edb1fb507ecad5f43bf (patch) | |
tree | 6044c2876a55ed4c794bd577909225c49015d402 /src/support/dom_document_guard.cc | |
parent | 30ae1cc66daf8acbb556ec761f96690a2fa74637 (diff) | |
download | InputXSLT-525aa8c4dc3e23f0369c7edb1fb507ecad5f43bf.tar InputXSLT-525aa8c4dc3e23f0369c7edb1fb507ecad5f43bf.tar.gz InputXSLT-525aa8c4dc3e23f0369c7edb1fb507ecad5f43bf.tar.bz2 InputXSLT-525aa8c4dc3e23f0369c7edb1fb507ecad5f43bf.tar.lz InputXSLT-525aa8c4dc3e23f0369c7edb1fb507ecad5f43bf.tar.xz InputXSLT-525aa8c4dc3e23f0369c7edb1fb507ecad5f43bf.tar.zst InputXSLT-525aa8c4dc3e23f0369c7edb1fb507ecad5f43bf.zip |
Fixed xerces DOM construction related memory leaks
* Wrapped xerces DOM and support class instances in now DomDocumentGuard scope-guard class
* FunctionReadDirectory class contains interal std::stack instance to store DomDocumentGuard instances
** wrapped in std::shared_ptr as FunctionReadDirectory is internally cloned by xalan...
** this is needed as the DOM has to preserved longer than the external function execution scope
* Sadly XMLCh xerces strings have to be manually released
** added appropriate xercesc::XMLString::release calls
* xalan::XercesDOMWrapperParsedSource does not mirror a given xerces DOM but convert it on instantiation
** this is why there is a dedicated finalize member method in InputXSLT::DomDocumentGuard
* In short: I do not like the amount of trickery needed to simply prevent memory leaks in this context
** there sadly doesn't seem to be a substantially easier way to return arbitrary DOM trees from a external function
Diffstat (limited to 'src/support/dom_document_guard.cc')
-rw-r--r-- | src/support/dom_document_guard.cc | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/src/support/dom_document_guard.cc b/src/support/dom_document_guard.cc new file mode 100644 index 0000000..a83345f --- /dev/null +++ b/src/support/dom_document_guard.cc @@ -0,0 +1,45 @@ +#include "support/dom_document_guard.h" + +#include <xercesc/dom/DOMImplementation.hpp> +#include <xercesc/util/XMLString.hpp> + +namespace InputXSLT { + +DomDocumentGuard::DomDocumentGuard(const std::string& rootNode): + parser_(), + dom_support_(parser_), + root_node_name_( + xercesc::XMLString::transcode(rootNode.data()) + ), + document_( + xercesc::DOMImplementation::getImplementation()->createDocument( + nullptr, + root_node_name_, + nullptr + ) + ), + parsed_source_() { } + +DomDocumentGuard::~DomDocumentGuard() { + xercesc::XMLString::release(&this->root_node_name_); + + this->document_->release(); +} + +xercesc::DOMDocument* DomDocumentGuard::operator->() { + return this->document_; +} + +xalan::XalanDocument* DomDocumentGuard::finalize() { + this->parsed_source_.reset( + new xalan::XercesDOMWrapperParsedSource( + document_, + parser_, + dom_support_ + ) + ); + + return this->parsed_source_->getDocument(); +} + +} |