Fix a memory leak introduced in r15421 and r15501 respectively

(bzr r15505)

4 files changed, 19 insertions, 8 deletions

diff --git a/src/extension/internal/cdr-input.cpp b/src/extension/internal/cdr-input.cpp
index 0435f1396..dbe88c668 100644
--- a/src/extension/internal/cdr-input.cpp
+++ b/src/extension/internal/cdr-input.cpp
@@ -218,11 +218,13 @@ SPDocument *CdrInput::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);
+          RVNGFileStream input(converted_uri);
+          g_free(converted_uri);
+     #else
+          RVNGFileStream input(uri);
      #endif
 
-     RVNGFileStream input(uri);
-
      if (!libcdr::CDRDocument::isSupported(&input)) {
           return NULL;
      }
diff --git a/src/extension/internal/vsd-input.cpp b/src/extension/internal/vsd-input.cpp
index 78783aa2d..85698387a 100644
--- a/src/extension/internal/vsd-input.cpp
+++ b/src/extension/internal/vsd-input.cpp
@@ -220,11 +220,13 @@ SPDocument *VsdInput::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);
+          RVNGFileStream input(converted_uri);
+          g_free(converted_uri);
+     #else
+          RVNGFileStream input(uri);
      #endif
 
-     RVNGFileStream input(uri);
-
      if (!libvisio::VisioDocument::isSupported(&input)) {
           return NULL;
      }
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");
diff --git a/src/ui/dialog/symbols.cpp b/src/ui/dialog/symbols.cpp
index dcfb7f242..740ff4f39 100644
--- a/src/ui/dialog/symbols.cpp
+++ b/src/ui/dialog/symbols.cpp
@@ -463,6 +463,10 @@ SPDocument* read_vss( gchar* fullname, Glib::ustring name ) {
 
   RVNGFileStream input(fullname);
 
+  #ifdef WIN32
+    g_free(fullname);
+  #endif
+
   if (!libvisio::VisioDocument::isSupported(&input)) {
     return NULL;
   }