Merge Sherlock's branch 'Bug 799662' into stable.

gnucash/import-export/bi-import/dialog-bi-import.c

@@ -36,6 +36,7 @@
 #include <glib.h>
 #include <glib/gstdio.h>
 
+#include "gnc-glib-utils.h"
 #include "gnc-date.h"
 #include "gnc-ui.h"
 #include "gnc-ui-util.h"
@@ -170,8 +171,15 @@ gnc_bi_import_read_file (const gchar * filename, const gchar * parser_regexp,
         if ((l > 0) && (line[l - 1] == '\n'))
             line[l - 1] = 0;
 
-        // convert line from locale into utf8
-        line_utf8 = g_locale_to_utf8 (line, -1, NULL, NULL, NULL);
+        // if the line doesn't conform to UTF-8, try a default charcter set
+        // conversion based on locale
+        if (g_utf8_validate(line, -1, NULL))
+            line_utf8 = line;
+        else
+            line_utf8 = g_locale_to_utf8 (line, -1, NULL, NULL, NULL);
+
+        // Remove the potential XML-prohibited codepoints from the UTF-8 compliant string
+        gnc_utf8_strip_invalid(line_utf8);
 
         // parse the line
         match_info = NULL;	// it seems, that in contrast to documentation, match_info is not always set -> g_match_info_free will segfault
@@ -216,9 +224,8 @@ gnc_bi_import_read_file (const gchar * filename, const gchar * parser_regexp,
         }
 
         g_match_info_free (match_info);
-        match_info = 0;
-        g_free (line_utf8);
-        line_utf8 = 0;
+        if (line_utf8 != line)
+            g_free (line_utf8);
     }
     g_free (line);
     line = 0;

gnucash/import-export/csv-imp/csv-account-import.c

@@ -30,6 +30,7 @@
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
 
+#include "gnc-glib-utils.h"
 #include "gnc-ui-util.h"
 #include <regex.h>
 #include "Account.h"
@@ -98,8 +99,21 @@ csv_import_read_file (GtkWindow *window, const gchar *filename,
         return RESULT_OPEN_FAILED;
     }
 
-    contents = g_locale_to_utf8 (locale_cont, -1, NULL, NULL, NULL);
-    g_free (locale_cont);
+    // if the contents don't conform to UTF-8, try a default charcter set
+    // conversion based on locale
+    if (g_utf8_validate(locale_cont, -1, NULL))
+    {
+        contents = locale_cont;
+    }
+    else
+    {
+        contents = g_locale_to_utf8 (locale_cont, -1, NULL, NULL, NULL);
+        g_free (locale_cont);
+    }
+
+    // Remove the potential XML-prohibited codepoints from the UTF-8 compliant content
+    gnc_utf8_strip_invalid(contents);
+
 
     // compile the regular expression and check for errors
     err = NULL;

gnucash/import-export/customer-import/dialog-customer-import.c

@@ -34,6 +34,7 @@
 #include <glib.h>
 #include <glib/gstdio.h>
 
+#include "gnc-glib-utils.h"
 #include "gnc-ui.h"
 #include "gnc-ui-util.h"
 #include "gnc-gui-query.h"
@@ -135,8 +136,15 @@ gnc_customer_import_read_file (const gchar *filename, const gchar *parser_regexp
         if ((l > 0) && (line[l - 1] == '\n'))
             line[l - 1] = 0;
 
-        // convert line from locale into utf8
-        line_utf8 = g_locale_to_utf8 (line, -1, NULL, NULL, NULL);
+        // if the line doesn't conform to UTF-8, try a default charcter set
+        // conversion based on locale
+        if (g_utf8_validate(line, -1, NULL))
+            line_utf8 = line;
+        else
+            line_utf8 = g_locale_to_utf8 (line, -1, NULL, NULL, NULL);
+
+        // Remove the potential XML-prohibited codepoints from the UTF-8 compliant string
+        gnc_utf8_strip_invalid(line_utf8);
 
         // parse the line
         match_info = NULL; // it seems, that in contrast to documentation, match_info is not always set -> g_match_info_free will segfault
@@ -176,9 +184,8 @@ gnc_customer_import_read_file (const gchar *filename, const gchar *parser_regexp
         }
 
         g_match_info_free (match_info);
-        match_info = 0;
-        g_free (line_utf8);
-        line_utf8 = 0;
+        if (line_utf8 != line)
+            g_free (line_utf8);
     }
     g_free (line);
     line = 0;