OpenPunk/OpenFusion
1
0
Fork 0
mirror of https://github.com/OpenFusionProject/OpenFusion.git synced 2024-11-05 15:00:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix bad size calculation due to pointer cast

Browse Source
This commit is contained in:
Gent Semaj 2024-09-06 11:58:26 -04:00
parent 3c5eefd9c2
commit 810ccffd9e
Signed by untrusted user: ycc
GPG Key ID: 2D76C57BF6BEADC4
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/CNStructs.hpp
View File

@ -40,7 +40,7 @@
// wrapper for U16toU8 // wrapper for U16toU8
#define ARRLEN(x) (sizeof(x)/sizeof(*x)) #define ARRLEN(x) (sizeof(x)/sizeof(*x))
#define AUTOU8(x) std::string(x, ARRLEN(x)) #define AUTOU8(x) std::string((char*)x, ARRLEN(x))
#define AUTOU16TOU8(x) U16toU8(x, ARRLEN(x)) #define AUTOU16TOU8(x) U16toU8(x, ARRLEN(x))
// TODO: rewrite U16toU8 & U8toU16 to not use codecvt // TODO: rewrite U16toU8 & U8toU16 to not use codecvt

4
src/servers/CNLoginServer.cpp
View File

@ -116,11 +116,11 @@ void CNLoginServer::login(CNSocket* sock, CNPacketData* data) {
*/ */
if (isCookieAuth) { if (isCookieAuth) {
// username encoded in TEGid raw // username encoded in TEGid raw
userLogin = std::string(AUTOU8((char*)login->szCookie_TEGid).c_str()); userLogin = std::string(AUTOU8(login->szCookie_TEGid).c_str());
// N.B. clients that use web login without proper cookies // N.B. clients that use web login without proper cookies
// send their passwords in the cookie field // send their passwords in the cookie field
userPassword = std::string(AUTOU8((char*)login->szCookie_authid).c_str()); userPassword = std::string(AUTOU8(login->szCookie_authid).c_str());
} else { } else {
userLogin = std::string(AUTOU16TOU8(login->szID).c_str()); userLogin = std::string(AUTOU16TOU8(login->szID).c_str());
userPassword = std::string(AUTOU16TOU8(login->szPassword).c_str()); userPassword = std::string(AUTOU16TOU8(login->szPassword).c_str());