Make interval unsigned to match g_timeout_source_new(). (#82624, Tim

Thu Jun 13 16:12:04 2002  Owen Taylor  <otaylor@redhat.com>

        * glib/gmain.c (struct _GTimeoutSource): Make
        interval unsigned to match g_timeout_source_new().
        (#82624, Tim Janik.)

        * glib/gmain.c (g_timeout_prepare): Add some
        extra gymnastics to avoid signed/unisgned integer
        overflows.

diff --git a/ChangeLog b/ChangeLog
index 4214106..eae4f3f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Thu Jun 13 16:12:04 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * glib/gmain.c (struct _GTimeoutSource): Make 
+       interval unsigned to match g_timeout_source_new().
+       (#82624, Tim Janik.)
+
+       * glib/gmain.c (g_timeout_prepare): Add some
+       extra gymnastics to avoid signed/unisgned integer
+       overflows.
+
 Thu Jun 13 15:57:46 2002  Owen Taylor  <otaylor@redhat.com>
 
        * INSTALL.in: Add a note about the deficiency

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 4214106..eae4f3f 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,13 @@
+Thu Jun 13 16:12:04 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * glib/gmain.c (struct _GTimeoutSource): Make 
+       interval unsigned to match g_timeout_source_new().
+       (#82624, Tim Janik.)
+
+       * glib/gmain.c (g_timeout_prepare): Add some
+       extra gymnastics to avoid signed/unisgned integer
+       overflows.
+
 Thu Jun 13 15:57:46 2002  Owen Taylor  <otaylor@redhat.com>
 
        * INSTALL.in: Add a note about the deficiency

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 4214106..eae4f3f 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,13 @@
+Thu Jun 13 16:12:04 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * glib/gmain.c (struct _GTimeoutSource): Make 
+       interval unsigned to match g_timeout_source_new().
+       (#82624, Tim Janik.)
+
+       * glib/gmain.c (g_timeout_prepare): Add some
+       extra gymnastics to avoid signed/unisgned integer
+       overflows.
+
 Thu Jun 13 15:57:46 2002  Owen Taylor  <otaylor@redhat.com>
 
        * INSTALL.in: Add a note about the deficiency

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 4214106..eae4f3f 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,13 @@
+Thu Jun 13 16:12:04 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * glib/gmain.c (struct _GTimeoutSource): Make 
+       interval unsigned to match g_timeout_source_new().
+       (#82624, Tim Janik.)
+
+       * glib/gmain.c (g_timeout_prepare): Add some
+       extra gymnastics to avoid signed/unisgned integer
+       overflows.
+
 Thu Jun 13 15:57:46 2002  Owen Taylor  <otaylor@redhat.com>
 
        * INSTALL.in: Add a note about the deficiency

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 4214106..eae4f3f 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,13 @@
+Thu Jun 13 16:12:04 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * glib/gmain.c (struct _GTimeoutSource): Make 
+       interval unsigned to match g_timeout_source_new().
+       (#82624, Tim Janik.)
+
+       * glib/gmain.c (g_timeout_prepare): Add some
+       extra gymnastics to avoid signed/unisgned integer
+       overflows.
+
 Thu Jun 13 15:57:46 2002  Owen Taylor  <otaylor@redhat.com>
 
        * INSTALL.in: Add a note about the deficiency

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 4214106..eae4f3f 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,13 @@
+Thu Jun 13 16:12:04 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * glib/gmain.c (struct _GTimeoutSource): Make 
+       interval unsigned to match g_timeout_source_new().
+       (#82624, Tim Janik.)
+
+       * glib/gmain.c (g_timeout_prepare): Add some
+       extra gymnastics to avoid signed/unisgned integer
+       overflows.
+
 Thu Jun 13 15:57:46 2002  Owen Taylor  <otaylor@redhat.com>
 
        * INSTALL.in: Add a note about the deficiency

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 4214106..eae4f3f 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,13 @@
+Thu Jun 13 16:12:04 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * glib/gmain.c (struct _GTimeoutSource): Make 
+       interval unsigned to match g_timeout_source_new().
+       (#82624, Tim Janik.)
+
+       * glib/gmain.c (g_timeout_prepare): Add some
+       extra gymnastics to avoid signed/unisgned integer
+       overflows.
+
 Thu Jun 13 15:57:46 2002  Owen Taylor  <otaylor@redhat.com>
 
        * INSTALL.in: Add a note about the deficiency

diff --git a/glib/gmain.c b/glib/gmain.c
index 3c7c9f2..1c385e6 100644 (file)
--- a/glib/gmain.c
+++ b/glib/gmain.c
@@ -153,7 +153,7 @@ struct _GTimeoutSource
 {
   GSource     source;
   GTimeVal    expiration;
-  gint        interval;
+  guint       interval;
 };
 
 struct _GPollRec
@@ -2937,11 +2937,11 @@ g_timeout_prepare  (GSource  *source,
           * this at least avoids hanging for long periods of time.
           */
          g_timeout_set_expiration (timeout_source, &current_time);
-         msec = timeout_source->interval;
+         msec = MIN (G_MAXINT, timeout_source->interval);
        }
       else
        {
-         msec += sec * 1000;
+         msec = MIN (G_MAXINT, (guint)msec + 1000 * (guint)sec);
        }
     }