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

[account.cpp] GValue must be unset in old functions

Browse Source 
GValue in DxaccAccount[Set|Get]Currency is unset correctly.

However dxaccAccountGetPriceSrc and dxaccAccountSetQuoteTZ reuse a
static char* therefore the latter must be used carefully before
calling the function again. The functions are tested in
4309469730.
This commit is contained in:
Christopher Lam
2021-09-19 10:36:09 +08:00
parent 86cf327f09
commit 87b61bf6fb
2 changed files with 22 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
libgnucash/engine/Account.cpp
View File

@@ -2733,6 +2733,7 @@ DxaccAccountSetCurrency (Account * acc, gnc_commodity * currency)
qof_instance_set_path_kvp (QOF_INSTANCE (acc), &v, {"old-currency"});
mark_account (acc);
xaccAccountCommitEdit(acc);
g_value_unset (&v);
table = gnc_commodity_table_get_table (qof_instance_get_book(acc));
commodity = gnc_commodity_table_lookup_unique (table, s);
@@ -3384,16 +3385,20 @@ DxaccAccountGetCurrency (const Account *acc)
GValue v = G_VALUE_INIT;
const char *s = NULL;
gnc_commodity_table *table;
gnc_commodity *retval = NULL;
if (!acc) return NULL;
qof_instance_get_path_kvp (QOF_INSTANCE(acc), &v, {"old-currency"});
if (G_VALUE_HOLDS_STRING (&v))
s = g_value_get_string (&v);
if (!s) return NULL;
if (s)
{
table = gnc_commodity_table_get_table (qof_instance_get_book(acc));
retval = gnc_commodity_table_lookup_unique (table, s);
}
g_value_unset (&v);
table = gnc_commodity_table_get_table (qof_instance_get_book(acc));
return gnc_commodity_table_lookup_unique (table, s);
return retval;
}
gnc_commodity *
@@ -4983,22 +4988,7 @@ dxaccAccountSetPriceSrc(Account *acc, const char *src)
if (!acc) return;
if (xaccAccountIsPriced(acc))
{
xaccAccountBeginEdit(acc);
if (src)
{
GValue v = G_VALUE_INIT;
g_value_init (&v, G_TYPE_STRING);
g_value_set_string (&v, src);
qof_instance_set_path_kvp (QOF_INSTANCE(acc), &v, {"old-price-source"});
g_value_unset (&v);
}
else
qof_instance_set_path_kvp (QOF_INSTANCE(acc), nullptr, {"old-price-source"});
mark_account (acc);
xaccAccountCommitEdit(acc);
}
set_kvp_string_tag (acc, "old-price-source", src);
}
/********************************************************************\
@@ -5007,13 +4997,14 @@ dxaccAccountSetPriceSrc(Account *acc, const char *src)
const char*
dxaccAccountGetPriceSrc(const Account *acc)
{
GValue v = G_VALUE_INIT;
static char *source = nullptr;
if (!acc) return NULL;
if (!xaccAccountIsPriced(acc)) return NULL;
qof_instance_get_path_kvp (QOF_INSTANCE(acc), &v, {"old-price-source"});
return G_VALUE_HOLDS_STRING (&v) ? g_value_get_string (&v) : NULL;
g_free (source);
source = get_kvp_string_tag (acc, "old-price-source");
return source;
}
/********************************************************************\
@@ -5022,15 +5013,9 @@ dxaccAccountGetPriceSrc(const Account *acc)
void
dxaccAccountSetQuoteTZ(Account *acc, const char *tz)
{
GValue v = G_VALUE_INIT;
if (!acc) return;
if (!xaccAccountIsPriced(acc)) return;
xaccAccountBeginEdit(acc);
g_value_init (&v, G_TYPE_STRING);
g_value_set_string (&v, tz);
qof_instance_set_path_kvp (QOF_INSTANCE (acc), &v, {"old-quote-tz"});
mark_account (acc);
xaccAccountCommitEdit(acc);
set_kvp_string_tag (acc, "old-quote-tz", tz);
}
/********************************************************************\
@@ -5039,11 +5024,12 @@ dxaccAccountSetQuoteTZ(Account *acc, const char *tz)
const char*
dxaccAccountGetQuoteTZ(const Account *acc)
{
GValue v = G_VALUE_INIT;
static char *quote_tz = nullptr;
if (!acc) return NULL;
if (!xaccAccountIsPriced(acc)) return NULL;
qof_instance_get_path_kvp (QOF_INSTANCE (acc), &v, {"old-quote-tz"});
return G_VALUE_HOLDS_STRING (&v) ? g_value_get_string (&v) : NULL;
g_free (quote_tz);
quote_tz = get_kvp_string_tag (acc, "old-quote-tz");
return quote_tz;
}
/********************************************************************\

5
libgnucash/engine/Account.h
View File

@@ -469,7 +469,7 @@ Account * xaccAccountGainsAccount (Account *acc, gnc_commodity *curr);
void dxaccAccountSetPriceSrc (Account *account, const char *src);
/** Get a string that identifies the Finance::Quote backend that
* should be used to retrieve online prices. See price-quotes.scm
* for more information.
* for more information. This function uses a static char*.
*
* @deprecated Price quote information is now stored on the
* commodity, not the account. */
@@ -1588,7 +1588,8 @@ gnc_commodity * DxaccAccountGetCurrency (const Account *account);
void dxaccAccountSetQuoteTZ (Account *account, const char *tz);
/** Get the timezone to be used when interpreting the results from a
* given Finance::Quote backend. Unfortunately, the upstream sources
* don't label their output, so the user has to specify this bit.
* don't label their output, so the user has to specify this
* bit. This function uses a static char*.
*
* @deprecated Price quote information is now stored on the
* commodity, not the account. */