fix segfault, disable intermittent test

eressea · Aug 20, 2015 · 8532904 · 8532904
1 parent 1641e6e
commit 8532904
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 9 deletions.
diff --git a/cmake b/cmake
diff --git a/critbit b/critbit
diff --git a/cutest b/cutest
diff --git a/dlmalloc b/dlmalloc
diff --git a/iniparser b/iniparser
diff --git a/quicklist b/quicklist
diff --git a/src/buildno.h b/src/buildno.h
@@ -1,3 +1,3 @@
 #define VERSION_MAJOR 3
 #define VERSION_MINOR 5
-#define VERSION_BUILD 5
+#define VERSION_BUILD 6
diff --git a/src/kernel/save.c b/src/kernel/save.c
@@ -1686,7 +1686,7 @@ int readgame(const char *filename, int backup)
                     }
                 }
             }
-            if (global.data_version < SPELL_LEVEL_VERSION) {
+            if (global.data_version < SPELL_LEVEL_VERSION && f->spellbook) {
                 spellbook_foreach(f->spellbook, cb_sb_maxlevel, f);
             }
         }

diff --git a/storage b/storage