From fef22bfe23afd7ae4864ad394586b2bd4cfda0d7 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 2 Jul 2008 16:16:27 +0000 Subject: [PATCH] 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 --- ChangeLog | 5 +++++ glib/gmain.c | 2 ++ 2 files changed, 7 insertions(+) diff --git a/ChangeLog b/ChangeLog index accf89cfe..a668f2b3f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-07-02 Matthias Clasen + + * 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 * configure.in: Workaround AC_C_BIGENDIAN breakage in autoconf 2.61. diff --git a/glib/gmain.c b/glib/gmain.c index b207ab7f6..8d666865a 100644 --- 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