glib r7142 - in trunk: . glib

[matthiasc svn gnome org]

Author: matthiasc
Date: Wed Jul  2 16:16:27 2008
New Revision: 7142
URL: http://svn.gnome.org/viewvc/glib?rev=7142&view=rev

Log:
        * 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.


Modified:
   trunk/ChangeLog
   trunk/glib/gmain.c

Modified: trunk/glib/gmain.c
==============================================================================
--- trunk/glib/gmain.c	(original)
+++ trunk/glib/gmain.c	Wed Jul  2 16:16:27 2008
@@ -1715,6 +1715,8 @@
   FILETIME ft;
   guint64 *time64 = (guint64 *) &ft;
 
+  g_return_if_fail (result != NULL);
+
   GetSystemTimeAsFileTime (&ft);
 
   /* Convert from 100s of nanoseconds since 1601-01-01