AMajor/SoftEtherVPN
1
0
Fork 0
mirror of https://github.com/SoftEtherVPN/SoftEtherVPN.git synced 2025-11-20 18:31:51 +03:00
Code Releases Activity

Mayaqua/Pack: Fix PackGetStrSize() and PackGetStrSizeEx()'s return data type

Browse Source 
The bug caused ProtoOptionsGet and ProtoOptionsSet not to work anymore after c90617e0e86dedf78e0e3c8a71263a80eec29caa.

The functions were introduced in aa65327e73, but the issue went unnoticed because bool was the same as UINT.
This commit is contained in:
Davide Beatrici
2021-02-28 06:49:36 +01:00
parent 914bfe7d44
commit 562ffe8945
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Mayaqua/Pack.c
View File

@ -1430,11 +1430,11 @@ bool PackGetStrEx(PACK *p, char *name, char *str, UINT size, UINT index)
} }
// Get the string size from the PACK // Get the string size from the PACK
bool PackGetStrSize(PACK *p, char *name) UINT PackGetStrSize(PACK *p, char *name)
{ {
return PackGetStrSizeEx(p, name, 0); return PackGetStrSizeEx(p, name, 0);
} }
bool PackGetStrSizeEx(PACK *p, char *name, UINT index) UINT PackGetStrSizeEx(PACK *p, char *name, UINT index)
{ {
ELEMENT *e; ELEMENT *e;
// Validate arguments // Validate arguments

4
src/Mayaqua/Pack.h
View File

@ -143,8 +143,8 @@ ELEMENT *PackAddData(PACK *p, char *name, void *data, UINT size);
ELEMENT *PackAddDataEx(PACK *p, char *name, void *data, UINT size, UINT index, UINT total); ELEMENT *PackAddDataEx(PACK *p, char *name, void *data, UINT size, UINT index, UINT total);
ELEMENT *PackAddBuf(PACK *p, char *name, BUF *b); ELEMENT *PackAddBuf(PACK *p, char *name, BUF *b);
ELEMENT *PackAddBufEx(PACK *p, char *name, BUF *b, UINT index, UINT total); ELEMENT *PackAddBufEx(PACK *p, char *name, BUF *b, UINT index, UINT total);
bool PackGetStrSize(PACK *p, char *name); UINT PackGetStrSize(PACK *p, char *name);
bool PackGetStrSizeEx(PACK *p, char *name, UINT index); UINT PackGetStrSizeEx(PACK *p, char *name, UINT index);
bool PackGetStr(PACK *p, char *name, char *str, UINT size); bool PackGetStr(PACK *p, char *name, char *str, UINT size);
bool PackGetStrEx(PACK *p, char *name, char *str, UINT size, UINT index); bool PackGetStrEx(PACK *p, char *name, char *str, UINT size, UINT index);
bool PackGetUniStr(PACK *p, char *name, wchar_t *unistr, UINT size); bool PackGetUniStr(PACK *p, char *name, wchar_t *unistr, UINT size);