r17396 - gnucash/branches/2.2/src - [r17370] Make sure that the input of gnc_utf8_strip_invalid() is non-NULL.

[Andreas Köhler]

Author: andi5
Date: 2008-07-22 18:35:36 -0400 (Tue, 22 Jul 2008)
New Revision: 17396
Trac: http://svn.gnucash.org/trac/changeset/17396

Modified:
   gnucash/branches/2.2/src/core-utils/gnc-glib-utils.c
   gnucash/branches/2.2/src/import-export/aqbanking/druid-ab-initial.c
Log:
[r17370] Make sure that the input of gnc_utf8_strip_invalid() is non-NULL.

Also, fix a caller in the aqbanking importer.


Modified: gnucash/branches/2.2/src/core-utils/gnc-glib-utils.c
===================================================================
--- gnucash/branches/2.2/src/core-utils/gnc-glib-utils.c	2008-07-22 22:35:26 UTC (rev 17395)
+++ gnucash/branches/2.2/src/core-utils/gnc-glib-utils.c	2008-07-22 22:35:36 UTC (rev 17396)
@@ -186,6 +186,8 @@
   gchar *end;
   gint len;
 
+  g_return_if_fail(str);
+
   if (gnc_utf8_validate(str, -1, (const gchar **)&end))
     return;
 

Modified: gnucash/branches/2.2/src/import-export/aqbanking/druid-ab-initial.c
===================================================================
--- gnucash/branches/2.2/src/import-export/aqbanking/druid-ab-initial.c	2008-07-22 22:35:26 UTC (rev 17395)
+++ gnucash/branches/2.2/src/import-export/aqbanking/druid-ab-initial.c	2008-07-22 22:35:36 UTC (rev 17396)
@@ -474,11 +474,12 @@
 {
     gchar *bankname;
     gchar *result;
-    const char *bankcode;
+    const char *ab_bankname, *bankcode;
 
     g_return_val_if_fail(ab_acc, NULL);
 
-    bankname = gnc_utf8_strip_invalid_strdup(AB_Account_GetBankName(ab_acc));
+    ab_bankname = AB_Account_GetBankName(ab_acc);
+    bankname = ab_bankname ? gnc_utf8_strip_invalid_strdup(ab_bankname) : NULL;
     bankcode = AB_Account_GetBankCode(ab_acc);
 
     /* Translators: Strings are 1. Account code, 2. Bank name, 3. Bank code. */