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 795031 - 3.0 Crashes on loading when opening 2.6.19 file

Browse Source
This commit is contained in:
Geert Janssens
2018-04-26 15:48:06 +02:00
parent 4aadfbe636
commit c71204628d
26 changed files with 187 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libgnucash/backend/sql/gnc-transaction-sql.cpp
View File

@@ -857,7 +857,7 @@ convert_query_term_to_sql (const GncSqlBackend* sql_be, const gchar* fieldName,
{
query_date_t date_data = (query_date_t)pPredData;
GncDateTime time(date_data->date.tv_sec);
GncDateTime time(date_data->date);
sql << time.format_zulu ("%Y-%m-%d %H:%M:%S");
}
else if (strcmp (pPredData->type_name, QOF_TYPE_INT32) == 0)

23
libgnucash/backend/xml/gnc-order-xml-v2.cpp
View File

@@ -75,7 +75,7 @@ static xmlNodePtr
order_dom_tree_create (GncOrder* order)
{
xmlNodePtr ret;
Timespec ts;
time64 tt;
ret = xmlNewNode (NULL, BAD_CAST gnc_order_string);
xmlSetProp (ret, BAD_CAST "version", BAD_CAST order_version_string);
@@ -89,12 +89,12 @@ order_dom_tree_create (GncOrder* order)
xmlAddChild (ret, gnc_owner_to_dom_tree (order_owner_string,
gncOrderGetOwner (order)));
ts = gncOrderGetDateOpened (order);
xmlAddChild (ret, time64_to_dom_tree (order_opened_string, ts.tv_sec));
tt = gncOrderGetDateOpened (order);
xmlAddChild (ret, time64_to_dom_tree (order_opened_string, tt));
ts = gncOrderGetDateClosed (order);
if (ts.tv_sec)
xmlAddChild (ret, time64_to_dom_tree (order_closed_string, ts.tv_sec));
tt = gncOrderGetDateClosed (order);
if (tt != INT64_MAX)
xmlAddChild (ret, time64_to_dom_tree (order_closed_string, tt));
maybe_add_string (ret, order_notes_string, gncOrderGetNotes (order));
maybe_add_string (ret, order_reference_string, gncOrderGetReference (order));
@@ -131,13 +131,12 @@ set_string (xmlNodePtr node, GncOrder* order,
}
static inline gboolean
set_timespec (xmlNodePtr node, GncOrder* order,
void (*func) (GncOrder* order, Timespec ts))
set_time64 (xmlNodePtr node, GncOrder* order,
void (*func) (GncOrder* order, time64 tt))
{
time64 time = dom_tree_to_time64 (node);
if (!dom_tree_valid_time64 (time, node->name)) return FALSE;
Timespec ts {time, 0};
func (order, ts);
func (order, time);
return TRUE;
}
@@ -194,7 +193,7 @@ order_opened_handler (xmlNodePtr node, gpointer order_pdata)
{
struct order_pdata* pdata = static_cast<decltype (pdata)> (order_pdata);
return set_timespec (node, pdata->order, gncOrderSetDateOpened);
return set_time64 (node, pdata->order, gncOrderSetDateOpened);
}
static gboolean
@@ -202,7 +201,7 @@ order_closed_handler (xmlNodePtr node, gpointer order_pdata)
{
struct order_pdata* pdata = static_cast<decltype (pdata)> (order_pdata);
return set_timespec (node, pdata->order, gncOrderSetDateClosed);
return set_time64 (node, pdata->order, gncOrderSetDateClosed);
}
static gboolean