From: John Darrington <john@darrington.wattle.id.au>
Date: Fri, 12 Aug 2016 04:53:35 +0000 (+0200)
Subject: Fix potential null pointer dereference
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=20921a454b4e10f27ca4ccfef811f5b482911b49;p=pspp

Fix potential null pointer dereference

Found by cppcheck
---

diff --git a/src/ui/gui/psppire-dict.c b/src/ui/gui/psppire-dict.c
index b88bbe7766..0ee608cade 100644
--- a/src/ui/gui/psppire-dict.c
+++ b/src/ui/gui/psppire-dict.c
@@ -680,11 +680,11 @@ tree_model_iter_next (GtkTreeModel *model, GtkTreeIter *iter)
   struct variable *var;
   gint idx;
 
-  g_return_val_if_fail (iter->stamp == dict->stamp, FALSE);
-
   if ( iter == NULL || iter->user_data == NULL)
     return FALSE;
 
+  g_return_val_if_fail (iter->stamp == dict->stamp, FALSE);
+
   var = iter->user_data;
 
   idx = var_get_dict_index (var);