summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeterN <peter@fuzzle.org>2019-02-13 09:01:49 +0000
committerGitHub <noreply@github.com>2019-02-13 09:01:49 +0000
commitc0c8fb25fb84d498207713f89720e38a98f16435 (patch)
tree0dc517d9edc2c103829c3867376bf0716182a954
parent830ed6be6114b2b1ed6680c3acc422cd8a849874 (diff)
downloadopenttd-c0c8fb25fb84d498207713f89720e38a98f16435.tar.xz
Change: Use SlErrorCorrupt() on pool index error when loading a savegame, instead of terminating. (#7219)
-rw-r--r--src/core/pool_func.hpp8
-rw-r--r--src/saveload/saveload.cpp19
-rw-r--r--src/saveload/saveload.h1
3 files changed, 25 insertions, 3 deletions
diff --git a/src/core/pool_func.hpp b/src/core/pool_func.hpp
index 5569addbd..64af17564 100644
--- a/src/core/pool_func.hpp
+++ b/src/core/pool_func.hpp
@@ -152,18 +152,20 @@ DEFINE_POOL_METHOD(void *)::GetNew(size_t size)
* @param size size of item
* @param index index of item
* @return pointer to allocated item
- * @note usererror() on failure! (index out of range or already used)
+ * @note SlErrorCorruptFmt() on failure! (index out of range or already used)
*/
DEFINE_POOL_METHOD(void *)::GetNew(size_t size, size_t index)
{
+ extern void NORETURN SlErrorCorruptFmt(const char *format, ...);
+
if (index >= Tmax_size) {
- usererror("failed loading savegame: %s index " PRINTF_SIZE " out of range (" PRINTF_SIZE ")", this->name, index, Tmax_size);
+ SlErrorCorruptFmt("%s index " PRINTF_SIZE " out of range (" PRINTF_SIZE ")", this->name, index, Tmax_size);
}
if (index >= this->size) this->ResizeFor(index);
if (this->data[index] != NULL) {
- usererror("failed loading savegame: %s index " PRINTF_SIZE " already in use", this->name, index);
+ SlErrorCorruptFmt("%s index " PRINTF_SIZE " already in use", this->name, index);
}
return this->AllocateItem(size, index);
diff --git a/src/saveload/saveload.cpp b/src/saveload/saveload.cpp
index 9be9506b1..bff85dfc6 100644
--- a/src/saveload/saveload.cpp
+++ b/src/saveload/saveload.cpp
@@ -350,6 +350,25 @@ void NORETURN SlErrorCorrupt(const char *msg)
SlError(STR_GAME_SAVELOAD_ERROR_BROKEN_SAVEGAME, msg);
}
+/**
+ * Issue an SlErrorCorrupt with a format string.
+ * @param format format string
+ * @param ... arguments to format string
+ * @note This function does never return as it throws an exception to
+ * break out of all the saveload code.
+ */
+void NORETURN SlErrorCorruptFmt(const char *format, ...)
+{
+ va_list ap;
+ char msg[256];
+
+ va_start(ap, format);
+ vseprintf(msg, lastof(msg), format, ap);
+ va_end(ap);
+
+ SlErrorCorrupt(msg);
+}
+
typedef void (*AsyncSaveFinishProc)(); ///< Callback for when the savegame loading is finished.
static AsyncSaveFinishProc _async_save_finish = NULL; ///< Callback to call when the savegame loading is finished.
diff --git a/src/saveload/saveload.h b/src/saveload/saveload.h
index e5e2e1fa2..ad6b76e05 100644
--- a/src/saveload/saveload.h
+++ b/src/saveload/saveload.h
@@ -836,6 +836,7 @@ void SlObject(void *object, const SaveLoad *sld);
bool SlObjectMember(void *object, const SaveLoad *sld);
void NORETURN SlError(StringID string, const char *extra_msg = NULL);
void NORETURN SlErrorCorrupt(const char *msg);
+void NORETURN SlErrorCorruptFmt(const char *format, ...);
bool SaveloadCrashWithMissingNewGRFs();