Skip to content

C
core
Kaydet (Commit) 34da472b authored tarafından Michael Stahl's avatar Michael Stahl
Dosyalara gözat
Seçenekler

xmlfix3: unoxml: CCharacterData: return value of xmlNodeGetContent was leaked

üst 1dd96d5c
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 3 deletions
unoxml/source/dom/characterdata.cxx
Dosyayı görüntüle @ 34da472b
......@@ -29,6 +29,8 @@
#include <string.h>
#include <boost/shared_ptr.hpp>
#include <com/sun/star/xml/dom/events/XDocumentEvent.hpp>
#include "../events/mutationevent.hxx"
......@@ -88,7 +90,9 @@ namespace DOM
if (m_aNodePtr != NULL)
{
// get current data
OString aData((const sal_Char*)xmlNodeGetContent(m_aNodePtr));
::boost::shared_ptr<xmlChar const> const pContent(
xmlNodeGetContent(m_aNodePtr), xmlFree);
OString aData(reinterpret_cast<sal_Char const*>(pContent.get()));
OUString tmp(aData, aData.getLength(), RTL_TEXTENCODING_UTF8);
if (offset > tmp.getLength() || offset < 0 || count < 0) {
DOMException e;
......@@ -157,7 +161,9 @@ namespace DOM
if (m_aNodePtr != NULL)
{
// get current data
OString aData((const sal_Char*)xmlNodeGetContent(m_aNodePtr));
::boost::shared_ptr<xmlChar const> const pContent(
xmlNodeGetContent(m_aNodePtr), xmlFree);
OString aData(reinterpret_cast<sal_Char const*>(pContent.get()));
OUString tmp(aData, aData.getLength(), RTL_TEXTENCODING_UTF8);
if (offset > tmp.getLength() || offset < 0) {
DOMException e;
......@@ -190,7 +196,9 @@ namespace DOM
if (m_aNodePtr != NULL)
{
// get current data
OString aData((const sal_Char*)xmlNodeGetContent(m_aNodePtr));
::boost::shared_ptr<xmlChar const> const pContent(
xmlNodeGetContent(m_aNodePtr), xmlFree);
OString aData(reinterpret_cast<sal_Char const*>(pContent.get()));
OUString tmp(aData, aData.getLength(), RTL_TEXTENCODING_UTF8);
if (offset > tmp.getLength() || offset < 0 || count < 0){
DOMException e;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment