From 7c7b3749d0dad0c50d36d758e4191309b72ffc64 Mon Sep 17 00:00:00 2001 From: Kirill Mitrakhovich Date: Mon, 23 Sep 2019 13:15:36 +0200 Subject: geniviextras: Fix potential crash during Qt cleanup V2 Access to static object pointer without checking. Object might be already destroyed. Change-Id: Ida459bc0e41f0b475293f2b69c44789f535df549 Reviewed-by: Bernd Weimer --- src/geniviextras/qdltregistration.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src') diff --git a/src/geniviextras/qdltregistration.cpp b/src/geniviextras/qdltregistration.cpp index 47abe21..d8dccdc 100644 --- a/src/geniviextras/qdltregistration.cpp +++ b/src/geniviextras/qdltregistration.cpp @@ -55,6 +55,9 @@ QT_BEGIN_NAMESPACE void qtGeniviLogLevelChangedHandler(char context_id[], uint8_t log_level, uint8_t trace_status) { + if (!globalDltRegistration()) + return; + auto d = globalDltRegistration()->d_ptr; d->m_mutex.lock(); const QLoggingCategory *category = d->dltLogLevelChanged(context_id, log_level, trace_status); -- cgit v1.2.1