X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fhash.c;h=b3595ad4ce4517f8f4b50ab5a7ee847ae1513422;hb=edaa850fd2d2cae7ec31961fae3d56487e710c71;hp=4dd904c9caac425fd3b485357980d3d67ffba6e1;hpb=81dd3f141822023be2ce419c082dcf68d0ab973d;p=rocksndiamonds.git

diff --git a/src/libgame/hash.c b/src/libgame/hash.c
index 4dd904c9..b3595ad4 100644
--- a/src/libgame/hash.c
+++ b/src/libgame/hash.c
@@ -423,18 +423,24 @@ hashtable_iterator(struct hashtable *h)
 /* key - return the key of the (key, value) pair at the current position */
 
 void *
-hashtable_iterator_key(struct hashtable_itr *i)
+hashtable_iterator_key(struct hashtable_itr *itr)
 {
-  return i->e->k;
+  if (itr == NULL || itr->e == NULL)
+    return NULL;
+
+  return itr->e->k;
 }
 
 /*****************************************************************************/
 /* value - return the value of the (key, value) pair at the current position */
 
 void *
-hashtable_iterator_value(struct hashtable_itr *i)
+hashtable_iterator_value(struct hashtable_itr *itr)
 {
-  return i->e->v;
+  if (itr == NULL || itr->e == NULL)
+    return NULL;
+
+  return itr->e->v;
 }
 
 /*****************************************************************************/