Fix a missed check for division by zero. (#77820, Gareth Pearce)

Thu May 16 12:56:38 2002  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtkrange.c (gtk_range_calc_layout): Fix a missed
        check for division by zero. (#77820, Gareth Pearce)

diff --git a/ChangeLog b/ChangeLog
index 0a8ca6ae3c06a16396cc979fe756ea47286a3f77..c22935ecce470566d0291f3a061e47982adcb725 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu May 16 12:56:38 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkrange.c (gtk_range_calc_layout): Fix a missed
+       check for division by zero. (#77820, Gareth Pearce)
+
 Thu May 16 12:50:13 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/x11/gdkevents-x11.c (gdk_xsettings_notify_cb):

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 0a8ca6ae3c06a16396cc979fe756ea47286a3f77..c22935ecce470566d0291f3a061e47982adcb725 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Thu May 16 12:56:38 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkrange.c (gtk_range_calc_layout): Fix a missed
+       check for division by zero. (#77820, Gareth Pearce)
+
 Thu May 16 12:50:13 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/x11/gdkevents-x11.c (gdk_xsettings_notify_cb):

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 0a8ca6ae3c06a16396cc979fe756ea47286a3f77..c22935ecce470566d0291f3a061e47982adcb725 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Thu May 16 12:56:38 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkrange.c (gtk_range_calc_layout): Fix a missed
+       check for division by zero. (#77820, Gareth Pearce)
+
 Thu May 16 12:50:13 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/x11/gdkevents-x11.c (gdk_xsettings_notify_cb):

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 0a8ca6ae3c06a16396cc979fe756ea47286a3f77..c22935ecce470566d0291f3a061e47982adcb725 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Thu May 16 12:56:38 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkrange.c (gtk_range_calc_layout): Fix a missed
+       check for division by zero. (#77820, Gareth Pearce)
+
 Thu May 16 12:50:13 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/x11/gdkevents-x11.c (gdk_xsettings_notify_cb):

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 0a8ca6ae3c06a16396cc979fe756ea47286a3f77..c22935ecce470566d0291f3a061e47982adcb725 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Thu May 16 12:56:38 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkrange.c (gtk_range_calc_layout): Fix a missed
+       check for division by zero. (#77820, Gareth Pearce)
+
 Thu May 16 12:50:13 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/x11/gdkevents-x11.c (gdk_xsettings_notify_cb):

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 0a8ca6ae3c06a16396cc979fe756ea47286a3f77..c22935ecce470566d0291f3a061e47982adcb725 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Thu May 16 12:56:38 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkrange.c (gtk_range_calc_layout): Fix a missed
+       check for division by zero. (#77820, Gareth Pearce)
+
 Thu May 16 12:50:13 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/x11/gdkevents-x11.c (gdk_xsettings_notify_cb):

diff --git a/gtk/gtkrange.c b/gtk/gtkrange.c
index 6ce27d35a846a075767bec1aaeb49835ce7a30e5..d815343de29b6b94bd7c235ad163c27f67bbbc5f 100644 (file)
--- a/gtk/gtkrange.c
+++ b/gtk/gtkrange.c
@@ -2181,8 +2181,12 @@ gtk_range_calc_layout (GtkRange *range,
         /* slider width is the fraction (page_size /
          * total_adjustment_range) times the trough width in pixels
          */
-        width = ((right - left) * (range->adjustment->page_size /
+       
+       if (range->adjustment->upper - range->adjustment->lower != 0)
+         width = ((right - left) * (range->adjustment->page_size /
                                    (range->adjustment->upper - range->adjustment->lower)));
+       else
+         width = range->min_slider_size;
         
         if (width < range->min_slider_size ||
             range->slider_size_fixed)