From c9c9592685abacf398d9e9f0bfa6e60b36c1c130 Mon Sep 17 00:00:00 2001 From: "Coren[m]" Date: Wed, 11 Sep 2013 01:34:29 +0200 Subject: [PATCH] if tox_new() fails, don't crash and leave the terminal in a broken state --- src/main.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/main.c b/src/main.c index 9018257..beef19b 100644 --- a/src/main.c +++ b/src/main.c @@ -91,6 +91,8 @@ static Tox *init_tox() { /* Init core */ Tox *m = tox_new(); + if (!m) + return NULL; /* Callbacks */ tox_callback_connectionstatus(m, on_connectionchange, NULL); @@ -403,6 +405,12 @@ int main(int argc, char *argv[]) init_term(); Tox *m = init_tox(); + if (!m) { + endwin(); + fprintf(stderr, "Failed to initialize network. Aborting...\n"); + exit(1); + } + prompt = init_windows(m); if (f_loadfromfile)