From d51aacf10031bab167c8a09dae14ac538b7b4a5d Mon Sep 17 00:00:00 2001 From: Neil Williams Date: Mon, 23 Jan 2006 14:30:37 +0000 Subject: [PATCH] bug fix: prevent bad time values from being passed to entity - already in QOF CVS git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@12955 57a11ea4-9604-0410-9ed3-97b8803252fd --- ChangeLog | 10 ++++++++++ lib/libqof/backend/file/qsf-backend.c | 7 +++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2eef8845f1..6daacc8fea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2006-01-23 Neil Williams + + * lib/libqof/backend/file/qsf-backend.c : Prevent + bad time values from being passed to entity. + * lib/libqof/qof/qof_book_merge.c : Fix merge + handling of QOF_TYPE_CHAR to use gchar instead of + casting from a gchar* + * lib/libqof/qof/qof_book_merge.h : Use gchar + consistently instead of mixing with char. + 2006-01-22 David Hampton * src/gnome/dialog-chart-export.c: diff --git a/lib/libqof/backend/file/qsf-backend.c b/lib/libqof/backend/file/qsf-backend.c index 6f0882af19..d4bac38fa8 100644 --- a/lib/libqof/backend/file/qsf-backend.c +++ b/lib/libqof/backend/file/qsf-backend.c @@ -1055,8 +1055,11 @@ qsf_object_commitCB(gpointer key, gpointer value, gpointer data) timechk = strptime((char*)xmlNodeGetContent(node), QSF_XSD_TIME, &qsf_time); g_return_if_fail(timechk != NULL); qsf_time_t = mktime(&qsf_time); - timespecFromTime_t(&cm_date, qsf_time_t); - if(date_setter != NULL) { date_setter(qsf_ent, cm_date); } + if(qsf_time_t != -3600) + { + timespecFromTime_t(&cm_date, qsf_time_t); + if(date_setter != NULL) { date_setter(qsf_ent, cm_date); } + } } if((safe_strcmp(qof_type, QOF_TYPE_NUMERIC) == 0) || (safe_strcmp(qof_type, QOF_TYPE_DEBCRED) == 0)) {