IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Bug 795039 - Crash on startup using Technicolor Style sheet in report

Browse Source 
Take 3: Catch encoding exceptions from trying to read a string into
Scheme using scm_from_utf8_string and try again using
scm_from_locale_string. If that throws too, give up and log a
warning.
This commit is contained in:
John Ralls
2018-04-26 12:55:57 -07:00
parent c4e5e18c0a
commit 0106a771d0
1 changed files with 52 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
libgnucash/app-utils/gfec.c
View File

@@ -18,6 +18,36 @@
# define strdup _strdup
#endif
static SCM
gfec_string_from_utf8(void *data)
{
char *str = (char*)data;
return scm_from_utf8_string(str);
}
static SCM
gfec_string_from_locale(void *data)
{
char *str = (char*)data;
return scm_from_locale_string(str);
}
static SCM
gfec_string_outer_handler(void *data, SCM key, SCM args)
{
return SCM_UNDEFINED;
}
static SCM
gfec_string_inner_handler(void *data, SCM key, SCM args)
{
char *str = (char*)data;
SCM scm_string = scm_internal_catch(SCM_BOOL_T,
gfec_string_from_locale, (void*)str,
gfec_string_inner_handler,
(void*)str);
return scm_string;
}
SCM
gfec_eval_string(const char *str, gfec_error_handler error_handler)
@@ -28,7 +58,20 @@ gfec_eval_string(const char *str, gfec_error_handler error_handler)
{
char *err_msg = NULL;
SCM call_result, error = SCM_UNDEFINED;
call_result = scm_call_1 (func, scm_from_utf8_string (str));
/* Deal with the possibility that scm_from_utf8_string will
* throw, falling back to scm_from_locale_string. If that fails, log a
* warning and punt.
*/
SCM scm_string = scm_internal_catch(SCM_BOOL_T,
gfec_string_from_utf8, (void*)str,
gfec_string_inner_handler,
(void*)str);
if (!scm_string)
{
error_handler("Contents could not be interpreted as UTF-8 or the current locale/codepage.");
return result;
}
call_result = scm_call_1 (func, scm_string);
error = scm_list_ref (call_result, scm_from_uint (1));
if (scm_is_true (error))
@@ -69,6 +112,14 @@ gfec_eval_file(const char *file, gfec_error_handler error_handler)
result = gfec_eval_string (contents, error_handler);
g_free (contents);
if (!result)
{
gchar *full_msg = g_strdup_printf ("Couldn't read contents of %s", file);
error_handler(full_msg);
g_free(full_msg);
}
return result;
}