Add a g_return_val_if_fail check in both versions. Proposed by Patrik

        * glib/gmain.c (g_get_current_time): Add a g_return_val_if_fail
        check in both versions. Proposed by Patrik Olsson in bug 540545.

svn path=/trunk/; revision=7142

diff --git a/ChangeLog b/ChangeLog
index accf89cfea580d865c26f3712ef34f987d4885a4..a668f2b3f3734e622f2c5dc298270e98fa0c5210 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-07-02  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/gmain.c (g_get_current_time): Add a g_return_val_if_fail
+       check in both versions. Proposed by Patrik Olsson in bug 540545.
+
 2008-07-02  Matthias Clasen  <mclasen@redhat.com>
 
        * configure.in: Workaround AC_C_BIGENDIAN breakage in autoconf 2.61.

diff --git a/glib/gmain.c b/glib/gmain.c
index b207ab7f600aff7a68cc02937ad19773c898d2bc..8d666865ac3da1f392f6076b12f828d4180304ab 100644 (file)
--- a/glib/gmain.c
+++ b/glib/gmain.c
@@ -1715,6 +1715,8 @@ g_get_current_time (GTimeVal *result)
   FILETIME ft;
   guint64 *time64 = (guint64 *) &ft;
 
+  g_return_if_fail (result != NULL);
+
   GetSystemTimeAsFileTime (&ft);
 
   /* Convert from 100s of nanoseconds since 1601-01-01