From 853290413f9e914d910fcfb401800ab6b67b375f Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Thu, 20 Aug 2015 16:18:15 +0200 Subject: [PATCH] fix segfault, disable intermittent test --- cmake | 2 +- critbit | 2 +- cutest | 2 +- dlmalloc | 2 +- iniparser | 2 +- quicklist | 2 +- src/buildno.h | 2 +- src/kernel/save.c | 2 +- storage | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cmake b/cmake index cd779ba36..f1fb3943a 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit cd779ba36efb4045a040af170588a8dfe496d7b9 +Subproject commit f1fb3943ace59994d90d71a891b80033dc2700a2 diff --git a/critbit b/critbit index 61989d933..e538739b3 160000 --- a/critbit +++ b/critbit @@ -1 +1 @@ -Subproject commit 61989d93368022602a2a7ac4218c83f254701f0f +Subproject commit e538739b38593b90312831a5e52d2e3bd731069b diff --git a/cutest b/cutest index 788659594..6e268687d 160000 --- a/cutest +++ b/cutest @@ -1 +1 @@ -Subproject commit 788659594ef87e9f497b8039da764182adfd2943 +Subproject commit 6e268687dbf6ae55afb63210c3753530d216a622 diff --git a/dlmalloc b/dlmalloc index 4292cd5e8..f1446c47c 160000 --- a/dlmalloc +++ b/dlmalloc @@ -1 +1 @@ -Subproject commit 4292cd5e81395d09a7457ab93659ea3b7784e958 +Subproject commit f1446c47ca1774ae84bf86a28502e91daf6b421a diff --git a/iniparser b/iniparser index f84066fb7..ecf956b98 160000 --- a/iniparser +++ b/iniparser @@ -1 +1 @@ -Subproject commit f84066fb7d3254bdd9e89694acc4c1c20d001eed +Subproject commit ecf956b9808c28c2db52e6b73930f57876dbb258 diff --git a/quicklist b/quicklist index 40ae38310..45f4577b8 160000 --- a/quicklist +++ b/quicklist @@ -1 +1 @@ -Subproject commit 40ae383100a8f012393ab29bc3d98e182fe57c19 +Subproject commit 45f4577b8205d87b78d2b1f30b5c9baa25c86779 diff --git a/src/buildno.h b/src/buildno.h index a0d2bfde8..d1479017e 100644 --- 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 index 0c7608ea5..1223ac034 100644 --- 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 index bcc2874cf..86b967441 160000 --- a/storage +++ b/storage @@ -1 +1 @@ -Subproject commit bcc2874cf289a1d0fc9cc79ff3ed271403b2e24c +Subproject commit 86b96744157eb08c55998df4c12fa2e073005b49