diff --git a/src/core-utils/gnc-glib-utils.c b/src/core-utils/gnc-glib-utils.c index 775abf306a..223562ba73 100644 --- a/src/core-utils/gnc-glib-utils.c +++ b/src/core-utils/gnc-glib-utils.c @@ -186,6 +186,8 @@ gnc_utf8_strip_invalid (gchar *str) gchar *end; gint len; + g_return_if_fail(str); + if (gnc_utf8_validate(str, -1, (const gchar **)&end)) return; diff --git a/src/import-export/aqbanking/druid-ab-initial.c b/src/import-export/aqbanking/druid-ab-initial.c index 4b664a78b6..91a6320937 100644 --- a/src/import-export/aqbanking/druid-ab-initial.c +++ b/src/import-export/aqbanking/druid-ab-initial.c @@ -474,11 +474,12 @@ ab_account_longname(const AB_ACCOUNT *ab_acc) { 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. */