[glibmm/glibmm-2-18] Check for invalid date in Glib::Date copy constructor.
- From: José Alburquerque <jaalburqu src gnome org>
- To: svn-commits-list gnome org
- Subject: [glibmm/glibmm-2-18] Check for invalid date in Glib::Date copy constructor.
- Date: Mon, 22 Jun 2009 13:24:03 -0400 (EDT)
commit 44b8b2812aaaa51b0b18555123aca5c0224a5e30
Author: José Alburquerque <jaalburqu svn gnome org>
Date: Mon Jun 22 13:23:17 2009 -0400
Check for invalid date in Glib::Date copy constructor.
ChangeLog | 5 +++++
glib/src/date.ccg | 5 +++--
2 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 9232123..1c40a03 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-06-22 José Alburquerque <jaalburqu svn gnome org>
+
+ * glib/src/date.ccg: Check for an invalid date in copy constructor and
+ assignment operator. Fixes bug #585027.
+
2009-06-19 Murray Cumming <murrayc murrayc com>
Allow dynamic GType registration, using g_type_module_register_type().
diff --git a/glib/src/date.ccg b/glib/src/date.ccg
index fe09b50..620d003 100644
--- a/glib/src/date.ccg
+++ b/glib/src/date.ccg
@@ -59,12 +59,13 @@ Date::Date(const GDate& castitem)
Date::Date(const Date& other)
{
g_date_clear(&gobject_, 1);
- g_date_set_julian(&gobject_, other.get_julian());
+ if (g_date_valid(&other.gobject_))
+ g_date_set_julian(&gobject_, other.get_julian());
}
Date& Date::operator=(const Date& other)
{
- if (&other != this)
+ if (&other != this && g_date_valid(&other.gobject_))
g_date_set_julian(&gobject_, other.get_julian());
return *this;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]