psppire-dict: g_return_if_fail for idx in psppire_dict_get_variable().

[pspp] / src / ui / gui / psppire-dict.c

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