From 10998add430ec56204092b9bc014921398238cf4 Mon Sep 17 00:00:00 2001 From: casey langen Date: Sun, 1 Mar 2020 00:16:29 -0800 Subject: [PATCH] Fixed NULL dereference. --- src/3rdparty/win32_include/curses.h | 3 ++- src/musikcube/cursespp/ScrollAdapterBase.cpp | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/3rdparty/win32_include/curses.h b/src/3rdparty/win32_include/curses.h index d3612d01e..252a31bab 100755 --- a/src/3rdparty/win32_include/curses.h +++ b/src/3rdparty/win32_include/curses.h @@ -136,7 +136,8 @@ enum PDC_port PDC_PORT_OS2 = 4, PDC_PORT_SDL1 = 5, PDC_PORT_SDL2 = 6, - PDC_PORT_VT = 7 + PDC_PORT_VT = 7, + PDC_PORT_DOSVGA = 8 }; /* Use this structure with PDC_get_version() for run-time info about the diff --git a/src/musikcube/cursespp/ScrollAdapterBase.cpp b/src/musikcube/cursespp/ScrollAdapterBase.cpp index fd013cb01..b3e5856de 100755 --- a/src/musikcube/cursespp/ScrollAdapterBase.cpp +++ b/src/musikcube/cursespp/ScrollAdapterBase.cpp @@ -111,6 +111,11 @@ size_t ScrollAdapterBase::GetVisibleItems( void ScrollAdapterBase::DrawPage(ScrollableWindow* scrollable, size_t index, ScrollPosition& result) { WINDOW* window = scrollable->GetContent(); + + if (!window) { + return; + } + werase(window); if (!scrollable->IsVisible() || !window || this->height == 0 || this->width == 0 || this->GetEntryCount() == 0) {