From 525aa8c4dc3e23f0369c7edb1fb507ecad5f43bf Mon Sep 17 00:00:00 2001 From: Adrian Kummerländer Date: Wed, 23 Apr 2014 21:26:58 +0200 Subject: 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 --- src/function/read_directory.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/function/read_directory.h') diff --git a/src/function/read_directory.h b/src/function/read_directory.h index e7ee0c4..3c55591 100644 --- a/src/function/read_directory.h +++ b/src/function/read_directory.h @@ -6,19 +6,18 @@ #include #include -#include - -#include +#include +#include #include "common.h" #include "support/filesystem_context.h" +#include "support/dom_document_guard.h" namespace InputXSLT { class FunctionReadDirectory : public xalan::Function { public: FunctionReadDirectory(const FilesystemContext&); - FunctionReadDirectory(const FunctionReadDirectory&); virtual xalan::XObjectPtr execute( xalan::XPathExecutionContext&, @@ -34,7 +33,8 @@ class FunctionReadDirectory : public xalan::Function { private: const FilesystemContext& fs_context_; - mutable xalan::XercesParserLiaison parser_; + + std::shared_ptr> documents_; const xalan::XalanDOMString& getError(xalan::XalanDOMString&) const; -- cgit v1.2.3