summaryrefslogtreecommitdiffstats
path: root/src/extension/internal/wpg-input.cpp
diff options
context:
space:
mode:
authorEduard Braun <eduard.braun2@gmx.de>2017-02-11 00:16:53 +0000
committerEduard Braun <eduard.braun2@gmx.de>2017-02-11 00:16:53 +0000
commit9faf941d45ce7d23f5cb0d066bd23346f7e3aedf (patch)
treeafe8aa81ba072f124d36f984ca44254f52326fb2 /src/extension/internal/wpg-input.cpp
parentFix bug #1662812 Converting Stroke to Path messes document's structure (diff)
downloadinkscape-9faf941d45ce7d23f5cb0d066bd23346f7e3aedf.tar.gz
inkscape-9faf941d45ce7d23f5cb0d066bd23346f7e3aedf.zip
Fix a memory leak introduced in r15421 and r15501 respectively
(bzr r15505)
Diffstat (limited to 'src/extension/internal/wpg-input.cpp')
-rw-r--r--src/extension/internal/wpg-input.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/extension/internal/wpg-input.cpp b/src/extension/internal/wpg-input.cpp
index 12457791b..299614c94 100644
--- a/src/extension/internal/wpg-input.cpp
+++ b/src/extension/internal/wpg-input.cpp
@@ -85,10 +85,13 @@ SPDocument *WpgInput::open(Inkscape::Extension::Input * /*mod*/, const gchar * u
// RVNGFileStream uses fopen() internally which unfortunately only uses ANSI encoding on Windows
// therefore attempt to convert uri to the system codepage
// even if this is not possible the alternate short (8.3) file name will be used if available
- uri = g_win32_locale_filename_from_utf8(uri);
+ gchar * converted_uri = g_win32_locale_filename_from_utf8(uri);
+ RVNGInputStream* input = new RVNGFileStream(converted_uri);
+ g_free(converted_uri);
+ #else
+ RVNGInputStream* input = new RVNGFileStream(uri);
#endif
- RVNGInputStream* input = new RVNGFileStream(uri);
#if WITH_LIBWPG03
if (input->isStructured()) {
RVNGInputStream* olestream = input->getSubStreamByName("PerfectOffice_MAIN");