From 52355a5cd5e451c2bf4f969c039e529eb6245a8e Mon Sep 17 00:00:00 2001 From: Syndamia Date: Fri, 8 Dec 2023 18:25:01 +0200 Subject: [browser] Fixed memory leaks and did slight reorganizing --- browser.c | 22 ++++++++++++++-------- util.c | 7 +++++-- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/browser.c b/browser.c index f5a10cc..22d4b90 100644 --- a/browser.c +++ b/browser.c @@ -122,25 +122,31 @@ int main(int argc, char* argv[]) { */ page = get_page("127.0.0.1", "8080", address); - - free(anchorIndecies); - anchorCount = 0; renderPage(page, &md, &anchorIndecies, &anchorCount); /* * Handle user input */ + scanf("%d", &gotoIndex); - sdsfree(address); - char* newplace = strchr(page + anchorIndecies[gotoIndex], '(') + 1; - address = sdscatlen(sdsnew(argv[1]), newplace, strchr(newplace, ')') - newplace); + if (gotoIndex < anchorCount) { + char* newplace = strchr(page + anchorIndecies[gotoIndex], '(') + 1; + sdsfree(address); + address = sdscatlen(sdsnew(argv[1]), newplace, strchr(newplace, ')') - newplace); + + free(anchorIndecies); + anchorCount = 0; + } + else { + printf("error\n"); + } + sdsfree(page); count++; } regfree(&md.anchor); - sdsfree(page); - sdsfree(address); free(anchorIndecies); + sdsfree(address); } diff --git a/util.c b/util.c index 8d1fa60..0d8f7c6 100644 --- a/util.c +++ b/util.c @@ -104,8 +104,11 @@ sds gsub_getm(sds str, const regex_t *regex, const char* repl, int* *matches, in * repl can include matched subexpressions */ for(size_t i = 0; i < replLen; i++) { if (repl[i] <= '\10') { - if (pmatch[repl[i] % 10].rm_so > -1) - ret = sdscatsds(ret, getMatch(MATCHSTART, pmatch[repl[i] % 10])); + if (pmatch[repl[i] % 10].rm_so > -1) { + sds match = getMatch(MATCHSTART, pmatch[repl[i] % 10]); + ret = sdscatsds(ret, match); + sdsfree(match); + } } else ret = sdscatlen(ret, &repl[i], 1); -- cgit v1.2.3