dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Saveload: Fix sign and narrowing conversion warnings calculating list sizes

Browse Source
This commit is contained in:
Jonathan G Rennison
2024-07-11 01:43:18 +01:00
parent 2de0dd17c2
commit 651610cd2a
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/sl/saveload.cpp
View File

@@ -1578,8 +1578,8 @@ public:
const SlStorageT *list = static_cast<const SlStorageT *>(storage); const SlStorageT *list = static_cast<const SlStorageT *>(storage);
int type_size = SlGetListTypeLengthSize(list->size()); // Size of the length of the list. uint type_size = SlGetListTypeLengthSize(list->size()); // Size of the length of the list.
int item_size = SlCalcConvFileLen(cmd == SL_VAR ? conv : (VarType)SLE_FILE_U32); uint item_size = SlCalcConvFileLen(cmd == SL_VAR ? conv : (VarType)SLE_FILE_U32);
return list->size() * item_size + type_size; return list->size() * item_size + type_size;
} }
@@ -1656,8 +1656,8 @@ static inline size_t SlCalcRefListLen(const void *list)
{ {
const PtrList *l = (const PtrList *) list; const PtrList *l = (const PtrList *) list;
int type_size = SlGetListTypeLengthSize(l->size()); uint type_size = SlGetListTypeLengthSize(l->size());
int item_size = SlCalcRefLen(); size_t item_size = SlCalcRefLen();
/* Each entry is saved as item_size bytes, plus type_size bytes are used for the length /* Each entry is saved as item_size bytes, plus type_size bytes are used for the length
* of the list */ * of the list */
return l->size() * item_size + type_size; return l->size() * item_size + type_size;
@@ -1671,7 +1671,7 @@ static inline size_t SlCalcRefListLen(const void *list)
static inline size_t SlCalcVarListLen(const void *list, size_t item_size) static inline size_t SlCalcVarListLen(const void *list, size_t item_size)
{ {
const PtrList *l = (const PtrList *) list; const PtrList *l = (const PtrList *) list;
int type_size = SlGetListTypeLengthSize(l->size()); uint type_size = SlGetListTypeLengthSize(l->size());
/* Each entry is saved as item_size bytes, plus type_size bytes are used for the length /* Each entry is saved as item_size bytes, plus type_size bytes are used for the length
* of the list */ * of the list */
return l->size() * item_size + type_size; return l->size() * item_size + type_size;