dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bug 680432 - metadata.exe keeps dying 

Based on a patch by Hartmut Kuhse, run all strings through
gimp_any_to_utf8() which always returns something that's UTF-8, even
if it's only "(invalid UTF-8 String)". Better than crashing.
This commit is contained in:
Michael Natterer 2012-07-31 15:14:20 +02:00
parent 573faa39b0
commit c207e395fd
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plug-ins/metadata/xmp-encode.c
View File

@ -63,6 +63,7 @@ gen_element (GString *buffer,
{
const gchar *attr_name;
const gchar *attr_value;
gchar *utf8 = NULL;
va_list args;
while (indent--)
@ -82,8 +83,11 @@ gen_element (GString *buffer,
va_end (args);
if (value && *value)
utf8 = gimp_any_to_utf8 (value, -1, NULL);
if (utf8 && *utf8)
{
gchar *escaped_value = g_markup_escape_text (value, -1);
gchar *escaped_value = g_markup_escape_text (utf8, -1);
g_string_append_printf (buffer, ">%s</%s:%s>\n",
escaped_value, prefix, name);
@ -93,6 +97,8 @@ gen_element (GString *buffer,
{
g_string_append (buffer, " />\n");
}
g_free (utf8);
}
static void