From f3f92e6b8db1b94418dc244cd30c7fa2ca4a9548 Mon Sep 17 00:00:00 2001 From: Jihoon Kim Date: Fri, 18 Dec 2015 16:56:14 +0900 Subject: [PATCH] Fix 'dereferenced after NULL' issues After having been compared to NULL value, Some pointer values are dereferenced. Change-Id: Iea5805157d1fd49d68e6a732f70efe088dcf783a --- scl/sclgwes.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/scl/sclgwes.cpp b/scl/sclgwes.cpp index c4d1d44..00b352c 100644 --- a/scl/sclgwes.cpp +++ b/scl/sclgwes.cpp @@ -45,15 +45,21 @@ void CSCLGwes::init(sclwindow parent, scl16 width, scl16 height) if (m_windows) { m_windows->init(); } + if (m_graphics) { m_graphics->init(); } + if (m_events) { m_events->init(); } - sclwindow wnd = m_windows->create_base_window(parent, width, height); - m_events->connect_window_events(wnd, SCL_EVENT_MOUSE | SCL_EVENT_EXPOSE); + if (m_windows) { + sclwindow wnd = m_windows->create_base_window(parent, width, height); + if (m_events) { + m_events->connect_window_events(wnd, SCL_EVENT_MOUSE | SCL_EVENT_EXPOSE); + } + } } void CSCLGwes::fini() -- 2.7.4