From: NHOrus Date: Fri, 30 Jun 2017 18:30:01 +0000 (+0300) Subject: Plugged little linenoise memory leaks. X-Git-Tag: takebird~173 X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=commitdiff_plain;h=94ea37d2bceffd4842a1af8d12c1c43f7e9c9fe8 Plugged little linenoise memory leaks. --- diff --git a/main.c b/main.c index 95acac2..aa7a900 100644 --- a/main.c +++ b/main.c @@ -1181,7 +1181,6 @@ Laction: default: BUG(ACTION_RETURNED_PHASE_CODE_BEYOND_END_OF_SWITCH); // LCOV_EXCL_LINE } - linenoiseFree(input); } } diff --git a/misc.c b/misc.c index 0d2311c..59c33bd 100644 --- a/misc.c +++ b/misc.c @@ -351,9 +351,10 @@ char* get_input() if (input == NULL) // Got EOF; return with it. return (input); - else if (input[0] == '#') // Ignore comments. + else if (input[0] == '#') { // Ignore comments. + linenoiseFree(input); continue; - else // We have a 'normal' line; leave the loop. + } else // We have a 'normal' line; leave the loop. break; } @@ -389,6 +390,8 @@ bool silent_yes() char* firstword = (char*) xmalloc(strlen(reply) + 1); sscanf(reply, "%s", firstword); + linenoiseFree(reply); + for (int i = 0; i < (int)strlen(firstword); ++i) firstword[i] = tolower(firstword[i]); @@ -408,7 +411,6 @@ bool silent_yes() } else rspeak(PLEASE_ANSWER); } - linenoiseFree(reply); return (outcome); } @@ -435,6 +437,8 @@ bool yes(const char* question, const char* yes_response, const char* no_response char* firstword = (char*) xmalloc(strlen(reply) + 1); sscanf(reply, "%s", firstword); + linenoiseFree(reply); + for (int i = 0; i < (int)strlen(firstword); ++i) firstword[i] = tolower(firstword[i]); @@ -455,8 +459,9 @@ bool yes(const char* question, const char* yes_response, const char* no_response break; } else rspeak(PLEASE_ANSWER); + } - linenoiseFree(reply); + return (outcome); }