mirror of
https://github.com/OpenFusionProject/OpenFusion.git
synced 2024-11-05 23:10:04 +00:00
Fix bad size calculation due to pointer cast
This commit is contained in:
parent
3c5eefd9c2
commit
810ccffd9e
@ -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
|
||||||
|
@ -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());
|
||||||
|
Loading…
Reference in New Issue
Block a user