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

[C++options] Fix Guile crash when restoring some reports.

Browse Source 
In particular those with commodity options or those using a stylesheet
whose name has spaces like "Head or Tail".
This commit is contained in:
John Ralls
2022-04-29 11:13:41 -07:00
parent 3e109d0c37
commit a8e6a59bf8
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libgnucash/app-utils/gnc-optiondb.i
View File

@@ -1141,7 +1141,7 @@ inline SCM return_scm_value(ValueType value)
SCM save_scm_value() SCM save_scm_value()
{ {
static const SCM plain_format_str{scm_from_utf8_string("~s")}; static const SCM plain_format_str{scm_from_utf8_string("~s")};
static const SCM ticked_format_str{scm_from_utf8_string("'~a")}; static const SCM ticked_format_str{scm_from_utf8_string("'~s")};
//scm_simple_format needs a scheme list of arguments to match the format //scm_simple_format needs a scheme list of arguments to match the format
//placeholders. //placeholders.
return std::visit([$self] (auto &option) -> SCM { return std::visit([$self] (auto &option) -> SCM {
@@ -1185,7 +1185,7 @@ inline SCM return_scm_value(ValueType value)
} }
else else
{ {
const SCM commodity_fmt{scm_from_utf8_string("~s ~s")}; const SCM commodity_fmt{scm_from_utf8_string("'(commodity-scm ~s ~s)")};
auto name_space{gnc_commodity_get_namespace(comm)}; auto name_space{gnc_commodity_get_namespace(comm)};
auto commodity_val{scm_list_2(scm_from_utf8_string(name_space), auto commodity_val{scm_list_2(scm_from_utf8_string(name_space),
scm_from_utf8_string(mnemonic))}; scm_from_utf8_string(mnemonic))};
@@ -1232,7 +1232,7 @@ inline SCM return_scm_value(ValueType value)
} }
else else
{ {
auto scm_str{scm_list_1(scm_from_utf8_string(serial.c_str()))}; auto scm_str{scm_list_1(scm_string_to_symbol(scm_from_utf8_string(serial.c_str())))};
return scm_simple_format(SCM_BOOL_F, ticked_format_str, scm_str); return scm_simple_format(SCM_BOOL_F, ticked_format_str, scm_str);
} }
} }
@@ -1330,15 +1330,16 @@ inline SCM return_scm_value(ValueType value)
return; return;
} }
auto len{scm_to_uint(scm_length(new_value))}; auto len{scm_to_uint(scm_length(new_value))};
std::string mnemonic{scm_to_utf8_string(scm_list_ref(new_value, scm_from_uint(0)))};
if (len > 1) if (len > 1)
{ {
std::string name_space{scm_to_utf8_string(scm_list_ref(new_value, scm_from_uint(1)))}; auto revlist{scm_reverse(new_value)};
std::string name_space{scm_to_utf8_string(scm_cadr(revlist))};
std::string mnemonic{scm_to_utf8_string(scm_car(revlist))};
option.deserialize(name_space + ":" + mnemonic); option.deserialize(name_space + ":" + mnemonic);
} }
else else
{ {
option.deserialize(mnemonic); option.deserialize(scm_to_utf8_string(scm_car(new_value)));
} }
return; return;
} }