X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fui%2Fgui%2Fpsppire-var-store.c;h=4cdc295886009a7961b2832daf7f2d02ee12a338;hb=b64685d06f8db1aff292ec409abe25f8a483d775;hp=36538723d43bf01da71940d6f3a147fb35d46395;hpb=75aeeafa67aa460512683311566a83917d399c70;p=pspp-builds.git

diff --git a/src/ui/gui/psppire-var-store.c b/src/ui/gui/psppire-var-store.c
index 36538723..4cdc2958 100644
--- a/src/ui/gui/psppire-var-store.c
+++ b/src/ui/gui/psppire-var-store.c
@@ -617,14 +617,21 @@ text_for_column(const struct PsppireVariable *pv, gint c, GError **err)
       }
       break;
     case COL_ALIGN:
-      return g_locale_to_utf8(gettext(alignments[psppire_variable_get_alignment(pv)]), 
-					 -1, -0, 0, err);
+      {
+	const gint align = psppire_variable_get_alignment(pv);
+
+	g_assert(align < n_ALIGNMENTS);
+	return g_locale_to_utf8(gettext(alignments[align]),-1, -0, 0, err);
+      }
       break;
     case COL_MEASURE:
-      return g_locale_to_utf8(gettext(measures[psppire_variable_get_measure(pv)]), 
-					 -1, -0, 0, err);
-      break;
+      {
+	const gint measure = psppire_variable_get_measure(pv);
 
+	g_assert(measure < n_MEASURES);
+	return g_locale_to_utf8(gettext(measures[measure]), -1, -0, 0, err);
+      }
+      break;
     }
   return 0;
 }
@@ -640,7 +647,7 @@ psppire_var_store_get_var_cnt(PsppireVarStore  *store)
 
 
 void
-psppire_var_store_set_font(PsppireVarStore *store, PangoFontDescription *fd)
+psppire_var_store_set_font(PsppireVarStore *store, const PangoFontDescription *fd)
 {
   g_return_if_fail (store);
   g_return_if_fail (PSPPIRE_IS_VAR_STORE (store));