From 2c637ce1c26145269b09c62afb451240a8def401 Mon Sep 17 00:00:00 2001 From: est31 Date: Mon, 31 Aug 2015 13:26:40 +0200 Subject: [PATCH] Make ClientInterface::statenames consistent with the state enum again Fixes minetest.get_player_information segfault due to out of bounds access problems, when compiled as debug build. --- src/clientiface.cpp | 6 ++++-- src/clientiface.h | 3 +++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/clientiface.cpp b/src/clientiface.cpp index d4efe60ef..a6ab1ef41 100644 --- a/src/clientiface.cpp +++ b/src/clientiface.cpp @@ -38,10 +38,12 @@ const char *ClientInterface::statenames[] = { "Disconnecting", "Denied", "Created", - "InitSent", + "AwaitingInit2", + "HelloSent", "InitDone", "DefinitionsSent", - "Active" + "Active", + "SudoMode", }; diff --git a/src/clientiface.h b/src/clientiface.h index 9be8bda61..0d2bca196 100644 --- a/src/clientiface.h +++ b/src/clientiface.h @@ -167,6 +167,9 @@ namespace con { #define CI_ARRAYSIZE(a) (sizeof(a) / sizeof((a)[0])) +// Also make sure to update the ClientInterface::statenames +// array when modifying these enums + enum ClientState { CS_Invalid,