X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-dict.c;h=04bd3e319ce82052c6a857375e0828f0ae6ccc5f;hb=7946115772a36f8bc255c6164703720b3a910594;hp=16576dc3aa5f80e38b58c8e21f24805b85ba236d;hpb=27bd188495ec1a6085354b10545daba47771b517;p=pspp

diff --git a/src/ui/gui/psppire-dict.c b/src/ui/gui/psppire-dict.c
index 16576dc3aa..04bd3e319c 100644
--- a/src/ui/gui/psppire-dict.c
+++ b/src/ui/gui/psppire-dict.c
@@ -464,14 +464,17 @@ psppire_dict_set_name (PsppireDict* d, gint idx, const gchar *name)
 
 
 
-/* Return the IDXth variable in D. */
+/* Return the IDXth variable.
+   Will return NULL if IDX  exceeds the number of variables in the dictionary.
+ */
 struct variable *
 psppire_dict_get_variable (const PsppireDict *d, gint idx)
 {
   g_return_val_if_fail (d, NULL);
   g_return_val_if_fail (d->dict, NULL);
-  g_return_val_if_fail (idx < 0, NULL);
-  g_return_val_if_fail (dict_get_var_cnt (d->dict) <= idx, NULL);
+
+  if ( dict_get_var_cnt (d->dict) <= idx )
+    return NULL;
 
   return dict_get_var (d->dict, idx);
 }