MTSR/minetest
3
0
Fork 0
mirror of https://github.com/minetest/minetest.git synced 2024-09-20 07:20:46 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Loïc Blot 2017-08-21 16:07:39 +02:00 committed by SmallJoker
parent 12562be393
commit d9c7af109a
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/util/serialize.cpp
View File

@ -28,8 +28,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include <iomanip> #include <iomanip>
#include <vector> #include <vector>
SerializationError eof_ser_err("Attempted read past end of data");
//// ////
//// BufReader //// BufReader
//// ////

6
src/util/serialize.h
View File

@ -429,8 +429,6 @@ bool deSerializeStringToStruct(std::string valstr,
//// BufReader //// BufReader
//// ////
extern SerializationError eof_ser_err;
#define MAKE_BUFREADER_GETNOEX_FXN(T, N, S) \ #define MAKE_BUFREADER_GETNOEX_FXN(T, N, S) \
inline bool get ## N ## NoEx(T *val) \ inline bool get ## N ## NoEx(T *val) \
{ \ { \
@ -446,7 +444,7 @@ extern SerializationError eof_ser_err;
{ \ { \
T val; \ T val; \
if (!get ## N ## NoEx(&val)) \ if (!get ## N ## NoEx(&val)) \
throw eof_ser_err; \ throw SerializationError("Attempted read past end of data"); \
return val; \ return val; \
} }
@ -504,7 +502,7 @@ public:
inline void getRawData(void *val, size_t len) inline void getRawData(void *val, size_t len)
{ {
if (!getRawDataNoEx(val, len)) if (!getRawDataNoEx(val, len))
throw eof_ser_err; throw SerializationError("Attempted read past end of data");
} }
inline size_t remaining() inline size_t remaining()