From: John Darrington <john@darrington.wattle.id.au>
Date: Sat, 6 Dec 2008 07:13:20 +0000 (+0900)
Subject: Improved robustness of axis implementation
X-Git-Tag: v0.7.1~63
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=pspp-builds.git;a=commitdiff_plain;h=ebfc3d13efe5b2dfb975dd5b4a1b9187f2934f0e

Improved robustness of axis implementation
---

diff --git a/lib/gtksheet/psppire-axis-impl.c b/lib/gtksheet/psppire-axis-impl.c
index dd515a57..2e9228f3 100644
--- a/lib/gtksheet/psppire-axis-impl.c
+++ b/lib/gtksheet/psppire-axis-impl.c
@@ -266,9 +266,10 @@ split (PsppireAxisImpl *a, gint posn)
   struct tower_node *n;
   struct axis_node *existing_node;
 
+  g_return_if_fail (posn <= tower_height (&a->unit_tower));
 
   /* Nothing needs to be done */
-  if ( posn == 0)
+  if ( posn == 0 || posn  == tower_height (&a->unit_tower))
     return;
 
   n = tower_lookup (&a->unit_tower, posn, &start);
@@ -344,6 +345,9 @@ make_single (PsppireAxisImpl *a, gint posn)
 {
   unsigned long int start;
   struct tower_node *n;
+
+  g_return_val_if_fail (posn < tower_height (&a->unit_tower), NULL);
+
   n = tower_lookup (&a->unit_tower, posn, &start);
 
   if ( 1 != tower_node_get_size (n))
@@ -367,7 +371,15 @@ make_single (PsppireAxisImpl *a, gint posn)
 void
 psppire_axis_impl_resize (PsppireAxisImpl *a, gint posn, gint size)
 {
-  struct axis_node *an =  make_single (a, posn);
+  struct axis_node *an;
+  g_return_if_fail (posn >= 0);
+
+  /* Silently ignore this request if the position is greater than the number of
+     units in the axis */
+  if (posn >= tower_height (&a->unit_tower))
+    return ;
+
+  an = make_single (a, posn);
 
   tower_resize (&a->pixel_tower, &an->pixel_node, size);
 }