Merge 810ccffd9e into 52833f7fb3

src/core/CNStructs.hpp

@@ -40,7 +40,7 @@
 
 // wrapper for U16toU8
 #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)) 
 
 // TODO: rewrite U16toU8 & U8toU16 to not use codecvt

src/servers/CNLoginServer.cpp

@@ -116,11 +116,11 @@ void CNLoginServer::login(CNSocket* sock, CNPacketData* data) {
      */
     if (isCookieAuth) {
         // 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
         // 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 {
         userLogin = std::string(AUTOU16TOU8(login->szID).c_str());
         userPassword = std::string(AUTOU16TOU8(login->szPassword).c_str());