AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-16 19:15:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

Don't leak memory when a resource fails to download in launcher

Browse Source
This commit is contained in:
UnknownShadow200 2019-07-29 22:53:16 +10:00
parent 186172e1d1
commit 1a9ada3590
4 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/LScreens.c
View File

@ -844,8 +844,8 @@ static void MainScreen_TickSignIn(struct MainScreen* s) {
LWebTask_Tick(&SignInTask.Base); LWebTask_Tick(&SignInTask.Base);
if (!SignInTask.Base.Completed) return; if (!SignInTask.Base.Completed) return;
if (SignInTask.Error.length) { if (SignInTask.Error) {
LLabel_SetText(&s->lblStatus, &SignInTask.Error); LLabel_SetConst(&s->lblStatus, SignInTask.Error);
LWidget_Redraw(&s->lblStatus); LWidget_Redraw(&s->lblStatus);
} else if (SignInTask.Base.Success) { } else if (SignInTask.Base.Success) {
/* website returns case correct username */ /* website returns case correct username */

12
src/LWeb.c
View File

@ -264,16 +264,12 @@ struct SignInTaskData SignInTask;
char userBuffer[STRING_SIZE]; char userBuffer[STRING_SIZE];
static void SignInTask_LogError(const String* str) { static void SignInTask_LogError(const String* str) {
static const String userErr = String_FromConst("&cWrong username or password");
static const String verErr = String_FromConst("&cAccount verification required");
static const String unkErr = String_FromConst("&cUnknown error occurred");
if (String_CaselessEqualsConst(str, "username") || String_CaselessEqualsConst(str, "password")) { if (String_CaselessEqualsConst(str, "username") || String_CaselessEqualsConst(str, "password")) {
SignInTask.Error = userErr; SignInTask.Error = "&cWrong username or password";
} else if (String_CaselessEqualsConst(str, "verification")) { } else if (String_CaselessEqualsConst(str, "verification")) {
SignInTask.Error = verErr; SignInTask.Error = "&cAccount verification required";
} else if (str->length) { } else if (str->length) {
SignInTask.Error = unkErr; SignInTask.Error = "&cUnknown error occurred";
} }
} }
@ -302,7 +298,7 @@ void SignInTask_Run(const String* user, const String* pass) {
LWebTask_Reset(&SignInTask.Base); LWebTask_Reset(&SignInTask.Base);
String_InitArray(SignInTask.Username, userBuffer); String_InitArray(SignInTask.Username, userBuffer);
SignInTask.Error.length = 0; SignInTask.Error = NULL;
String_InitArray(tmp, tmpBuffer); String_InitArray(tmp, tmpBuffer);
SignInTask_Append(&tmp, "username=", user); SignInTask_Append(&tmp, "username=", user);

2
src/LWeb.h
View File

@ -68,7 +68,7 @@ void GetTokenTask_Run(void);
extern struct SignInTaskData { extern struct SignInTaskData {
struct LWebTask Base; struct LWebTask Base;
String Username; /* Username to sign in as. Changed to case correct username. */ String Username; /* Username to sign in as. Changed to case correct username. */
String Error; /* If sign in fails, the reason as to why. */ const char* Error; /* If sign in fails, the reason as to why. */
} SignInTask; } SignInTask;
void SignInTask_Run(const String* user, const String* pass); void SignInTask_Run(const String* user, const String* pass);

1
src/Resources.c
View File

@ -763,6 +763,7 @@ CC_NOINLINE static bool Fetcher_Get(const String* id, struct HttpRequest* req) {
Fetcher_Result = req->Result; Fetcher_Result = req->Result;
Fetcher_StatusCode = req->StatusCode; Fetcher_StatusCode = req->StatusCode;
HttpRequest_Free(req);
Fetcher_Finish(); Fetcher_Finish();
return false; return false;
} }