From 5c478e3754bbccb8752934bf5cfb1ce3cdfddcdb Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Mon, 14 Feb 2000 20:03:04 +0000 Subject: [PATCH] Add some sanity checks to make sure we never divide by zero. (Problem Mon Feb 14 15:01:23 2000 Owen Taylor * gtk/gtkpaned.c (gtk_paned_compute_position): Add some sanity checks to make sure we never divide by zero. (Problem pointed out by Michal Jaegermann ) --- ChangeLog | 6 ++++++ ChangeLog.pre-2-0 | 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/gtkpaned.c | 8 +++++--- 8 files changed, 47 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 51e1074a63..3e85537dfa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Mon Feb 14 15:01:23 2000 Owen Taylor + + * gtk/gtkpaned.c (gtk_paned_compute_position): Add some sanity checks + to make sure we never divide by zero. + (Problem pointed out by Michal Jaegermann ) + Mon Feb 14 12:29:38 2000 Owen Taylor * gtk/gtkfontsel.c: Apply patch from diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 51e1074a63..3e85537dfa 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +Mon Feb 14 15:01:23 2000 Owen Taylor + + * gtk/gtkpaned.c (gtk_paned_compute_position): Add some sanity checks + to make sure we never divide by zero. + (Problem pointed out by Michal Jaegermann ) + Mon Feb 14 12:29:38 2000 Owen Taylor * gtk/gtkfontsel.c: Apply patch from diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 51e1074a63..3e85537dfa 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Mon Feb 14 15:01:23 2000 Owen Taylor + + * gtk/gtkpaned.c (gtk_paned_compute_position): Add some sanity checks + to make sure we never divide by zero. + (Problem pointed out by Michal Jaegermann ) + Mon Feb 14 12:29:38 2000 Owen Taylor * gtk/gtkfontsel.c: Apply patch from diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 51e1074a63..3e85537dfa 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Mon Feb 14 15:01:23 2000 Owen Taylor + + * gtk/gtkpaned.c (gtk_paned_compute_position): Add some sanity checks + to make sure we never divide by zero. + (Problem pointed out by Michal Jaegermann ) + Mon Feb 14 12:29:38 2000 Owen Taylor * gtk/gtkfontsel.c: Apply patch from diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 51e1074a63..3e85537dfa 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Mon Feb 14 15:01:23 2000 Owen Taylor + + * gtk/gtkpaned.c (gtk_paned_compute_position): Add some sanity checks + to make sure we never divide by zero. + (Problem pointed out by Michal Jaegermann ) + Mon Feb 14 12:29:38 2000 Owen Taylor * gtk/gtkfontsel.c: Apply patch from diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 51e1074a63..3e85537dfa 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Mon Feb 14 15:01:23 2000 Owen Taylor + + * gtk/gtkpaned.c (gtk_paned_compute_position): Add some sanity checks + to make sure we never divide by zero. + (Problem pointed out by Michal Jaegermann ) + Mon Feb 14 12:29:38 2000 Owen Taylor * gtk/gtkfontsel.c: Apply patch from diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 51e1074a63..3e85537dfa 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Mon Feb 14 15:01:23 2000 Owen Taylor + + * gtk/gtkpaned.c (gtk_paned_compute_position): Add some sanity checks + to make sure we never divide by zero. + (Problem pointed out by Michal Jaegermann ) + Mon Feb 14 12:29:38 2000 Owen Taylor * gtk/gtkfontsel.c: Apply patch from diff --git a/gtk/gtkpaned.c b/gtk/gtkpaned.c index de38f61ace..9069a600fc 100644 --- a/gtk/gtkpaned.c +++ b/gtk/gtkpaned.c @@ -575,15 +575,17 @@ gtk_paned_compute_position (GtkPaned *paned, paned->child1_size = MAX (1, allocation - child2_req); else if (!paned->child1_resize && paned->child2_resize) paned->child1_size = child1_req; - else + else if (child1_req + child2_req != 0) paned->child1_size = allocation * ((gdouble)child1_req / (child1_req + child2_req)); + else + paned->child1_size = allocation * 0.5; } else { /* If the position was set before the initial allocation. - * (paned->last_allocation < 0) just clamp it and leave it. + * (paned->last_allocation <= 0) just clamp it and leave it. */ - if (paned->last_allocation >= 0) + if (paned->last_allocation > 0) { if (paned->child1_resize && !paned->child2_resize) paned->child1_size += (allocation - paned->last_allocation);