mirror/gmni
1
0
Fork 0
mirror of https://git.sr.ht/~sircmpwn/gmni synced 2024-11-23 09:02:04 +01:00
Code

Fix segfault moving to next result outside search

Browse Source
This commit is contained in:
Drew DeVault 2020-09-20 22:34:27 -04:00
parent 5799323f4c
commit 144693a3d0
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/gmnlm.c
View File

@ -78,9 +78,13 @@ history_free(struct history *history)
static bool
set_url(struct browser *browser, char *new_url, struct history **history)
{
if (curl_url_set(browser->url, CURLUPART_URL, new_url, 0) != CURLUE_OK) {
fprintf(stderr, "Error: invalid URL\n");
return false;
}
if (history) {
struct history *next = calloc(1, sizeof(struct history));
next->url = strdup(new_url);
curl_url_get(browser->url, CURLUPART_URL, &next->url, 0);
next->prev = *history;
if (*history) {
if ((*history)->next) {
@ -90,10 +94,6 @@ set_url(struct browser *browser, char *new_url, struct history **history)
}
*history = next;
}
if (curl_url_set(browser->url, CURLUPART_URL, new_url, 0) != CURLUE_OK) {
fprintf(stderr, "Error: invalid URL\n");
return false;
}
return true;
}
@ -153,8 +153,14 @@ do_prompts(const char *prompt, struct browser *browser)
}
goto exit_re;
case 'n':
result = PROMPT_NEXT;
goto exit_re;
if (browser->searching) {
result = PROMPT_NEXT;
goto exit_re;
} else {
fprintf(stderr, "Cannot move to next result; we are not searching for anything\n");
result = PROMPT_AGAIN;
goto exit;
}
case '?':
fprintf(browser->tty, "%s", help_msg);
result = PROMPT_AGAIN;