feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Help: fix possible nullptr deref.

Browse Source 
Setting QTC_HELPVIEWER_BACKEND to "native" when the native backend is
not compiled in, would result in a nullptr deref.

Change-Id: I5618650e0c4ae1c986a54a46232e8f782e43f350
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
This commit is contained in:
Erik Verbruggen
2014-09-11 11:02:05 +02:00
parent 7f2e3fc296
commit f52c1db02f
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/help/helpplugin.cpp
View File

@@ -566,6 +566,9 @@ HelpViewer *HelpPlugin::createHelpViewer(qreal zoom)
if (backend.compare(QLatin1String("native"), Qt::CaseInsensitive) == 0) { if (backend.compare(QLatin1String("native"), Qt::CaseInsensitive) == 0) {
#ifdef QTC_MAC_NATIVE_HELPVIEWER #ifdef QTC_MAC_NATIVE_HELPVIEWER
viewer = new MacWebKitHelpViewer(zoom); viewer = new MacWebKitHelpViewer(zoom);
#else
qWarning() << "native help viewer is requested, but was not enabled during compilation";
viewer = new TextBrowserHelpViewer(zoom);
#endif #endif
} else if (backend.compare(QLatin1String("textbrowser"), Qt::CaseInsensitive) == 0) { } else if (backend.compare(QLatin1String("textbrowser"), Qt::CaseInsensitive) == 0) {
viewer = new TextBrowserHelpViewer(zoom); viewer = new TextBrowserHelpViewer(zoom);