From c985ba258d95fb267e35a96e92eb6f8461b83668 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 18 Nov 2008 21:51:07 +0100 Subject: screen_browser: check if filelist is set When calling browser_change_directory() before a filelist was set, ncmpc would crash due to a NULL pointer dereference. This scenario is not possible currently, since the open() method allocates the filelist. --- src/screen_browser.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/screen_browser.c b/src/screen_browser.c index a9ed37991..bcf749ed7 100644 --- a/src/screen_browser.c +++ b/src/screen_browser.c @@ -201,15 +201,20 @@ browser_change_directory(struct screen_browser *browser, mpdclient_t *c, } else return false; - old_path = g_strdup(browser->filelist->path); + if (browser->filelist != NULL) { + old_path = g_strdup(browser->filelist->path); + filelist_free(browser->filelist); + } else + old_path = NULL; - filelist_free(browser->filelist); browser->filelist = mpdclient_filelist_get(c, path); #ifndef NCMPC_MINI sync_highlights(c, browser->filelist); #endif - idx = filelist_find_directory(browser->filelist, old_path); + idx = old_path != NULL + ? filelist_find_directory(browser->filelist, old_path) + : -1; g_free(old_path); list_window_reset(browser->lw); -- cgit v1.2.3