From f51ef574b51d93eca5650fa37f55775b24b65ff1 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Wed, 12 Jun 2002 19:42:48 +0000 Subject: [PATCH] Handle 0 increment, to fix division-by-zero problem. (#82816, George Wed Jun 12 15:43:38 2002 Owen Taylor * gtk/gtkspinbutton.c (gtk_spin_button_snap): Handle 0 increment, to fix division-by-zero problem. (#82816, George Lebl.) --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-2 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gtk/gtkspinbutton.c | 3 +++ 7 files changed, 39 insertions(+) diff --git a/ChangeLog b/ChangeLog index 639a66b11..7e0855c45 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Wed Jun 12 15:43:38 2002 Owen Taylor + + * gtk/gtkspinbutton.c (gtk_spin_button_snap): Handle + 0 increment, to fix division-by-zero problem. + (#82816, George Lebl.) + Wed Jun 12 15:38:01 2002 Owen Taylor * gtk/gtkimmulticontext.c (gtk_im_multicontext_append_menuitems): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 639a66b11..7e0855c45 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Wed Jun 12 15:43:38 2002 Owen Taylor + + * gtk/gtkspinbutton.c (gtk_spin_button_snap): Handle + 0 increment, to fix division-by-zero problem. + (#82816, George Lebl.) + Wed Jun 12 15:38:01 2002 Owen Taylor * gtk/gtkimmulticontext.c (gtk_im_multicontext_append_menuitems): diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 639a66b11..7e0855c45 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Wed Jun 12 15:43:38 2002 Owen Taylor + + * gtk/gtkspinbutton.c (gtk_spin_button_snap): Handle + 0 increment, to fix division-by-zero problem. + (#82816, George Lebl.) + Wed Jun 12 15:38:01 2002 Owen Taylor * gtk/gtkimmulticontext.c (gtk_im_multicontext_append_menuitems): diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 639a66b11..7e0855c45 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Wed Jun 12 15:43:38 2002 Owen Taylor + + * gtk/gtkspinbutton.c (gtk_spin_button_snap): Handle + 0 increment, to fix division-by-zero problem. + (#82816, George Lebl.) + Wed Jun 12 15:38:01 2002 Owen Taylor * gtk/gtkimmulticontext.c (gtk_im_multicontext_append_menuitems): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 639a66b11..7e0855c45 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Wed Jun 12 15:43:38 2002 Owen Taylor + + * gtk/gtkspinbutton.c (gtk_spin_button_snap): Handle + 0 increment, to fix division-by-zero problem. + (#82816, George Lebl.) + Wed Jun 12 15:38:01 2002 Owen Taylor * gtk/gtkimmulticontext.c (gtk_im_multicontext_append_menuitems): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 639a66b11..7e0855c45 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Wed Jun 12 15:43:38 2002 Owen Taylor + + * gtk/gtkspinbutton.c (gtk_spin_button_snap): Handle + 0 increment, to fix division-by-zero problem. + (#82816, George Lebl.) + Wed Jun 12 15:38:01 2002 Owen Taylor * gtk/gtkimmulticontext.c (gtk_im_multicontext_append_menuitems): diff --git a/gtk/gtkspinbutton.c b/gtk/gtkspinbutton.c index 8642b271b..7c7efc872 100644 --- a/gtk/gtkspinbutton.c +++ b/gtk/gtkspinbutton.c @@ -1318,6 +1318,9 @@ gtk_spin_button_snap (GtkSpinButton *spin_button, gdouble tmp; inc = spin_button->adjustment->step_increment; + if (inc == 0) + return; + tmp = (val - spin_button->adjustment->lower) / inc; if (tmp - floor (tmp) < ceil (tmp) - tmp) val = spin_button->adjustment->lower + floor (tmp) * inc;