serialize: use a temporary for SerializeException

Exception must always use temporary instead of global copied exception instances, it's not recommended and should have undefined issues
minetest · Aug 21, 2017 · e2a6b7c8d29a674504f80b7948a71c4a36af4ad0 · e2a6b7c
1 parent 1dd535c
commit e2a6b7c8d29a674504f80b7948a71c4a36af4ad0
Unified Split

Showing with 2 additions and 6 deletions.

+0 −2 src/util/serialize.cpp

+2 −4 src/util/serialize.h
diff --git a/src/util/serialize.cpp b/src/util/serialize.cpp
@@ -28,8 +28,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <iomanip>
 #include <vector>
 
-SerializationError eof_ser_err("Attempted read past end of data");
-
 ////
 //// BufReader
 ////

diff --git a/src/util/serialize.h b/src/util/serialize.h
@@ -428,8 +428,6 @@ bool deSerializeStringToStruct(std::string valstr,
 //// BufReader
 ////
 
-extern SerializationError eof_ser_err;
-
 #define MAKE_BUFREADER_GETNOEX_FXN(T, N, S) \
 	inline bool get ## N ## NoEx(T *val)    \
 	{                                       \
@@ -445,7 +443,7 @@ extern SerializationError eof_ser_err;
 	{                                \
 		T val;                       \
 		if (!get ## N ## NoEx(&val)) \
-			throw eof_ser_err;       \
+			throw SerializationError("Attempted read past end of data"); \
 		return val;                  \
 	}
 
@@ -502,7 +500,7 @@ class BufReader {
 	inline void getRawData(void *val, size_t len)
 	{
 		if (!getRawDataNoEx(val, len))
-			throw eof_ser_err;
+			throw SerializationError("Attempted read past end of data");
 	}
 
 	inline size_t remaining()