From: scislac <scislac@users.sourceforge.net>
Date: Wed, 23 Sep 2009 13:23:33 +0000 (+0000)
Subject: Better patch by Adib for 431022. Appears safe, however, I am unable to test as it... 
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=849e304e5a5c9865c04752ff35e46985ca8be3a7;p=inkscape.git

Better patch by Adib for 431022. Appears safe, however, I am unable to test as it is/was a win32 issue only.
---

diff --git a/src/dialogs/export.cpp b/src/dialogs/export.cpp
index adadcd2f6..2c04135bc 100644
--- a/src/dialogs/export.cpp
+++ b/src/dialogs/export.cpp
@@ -1358,7 +1358,11 @@ sp_export_browse_clicked (GtkButton */*button*/, gpointer /*userdata*/)
 #ifdef WIN32
 	// code in this section is borrowed from ui/dialogs/filedialogimpl-win32.cpp
 	OPENFILENAMEW opf;
-	WCHAR* filter_string = (WCHAR*)g_utf8_to_utf16("PNG\0*.png\0", 10, NULL, NULL, NULL);
+	WCHAR filter_string[20];
+	wcsncpy(filter_string, L"PNG#*.png##", 11);
+	filter_string[3] = L'\0';
+	filter_string[9] = L'\0';
+	filter_string[10] = L'\0';
 	WCHAR* title_string = (WCHAR*)g_utf8_to_utf16(_("Select a filename for exporting"), -1, NULL, NULL, NULL);
 	WCHAR* extension_string = (WCHAR*)g_utf8_to_utf16("*.png", -1, NULL, NULL, NULL);
 	// Copy the selected file name, converting from UTF-8 to UTF-16
@@ -1397,7 +1401,7 @@ sp_export_browse_clicked (GtkButton */*button*/, gpointer /*userdata*/)
 	}
 	g_free(extension_string);
 	g_free(title_string);
-	g_free(filter_string);
+
 #else
     if (gtk_dialog_run (GTK_DIALOG (fs)) == GTK_RESPONSE_ACCEPT)
     {