From 5cd328dad37ed219db8fc74cf4fdcc5aa9390c72 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Wed, 28 Jun 2017 08:44:59 -0400 Subject: [PATCH] Clang: if we're going to crash on purpose, crash the C++ way --- src/libcalamares/utils/CalamaresUtils.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libcalamares/utils/CalamaresUtils.cpp b/src/libcalamares/utils/CalamaresUtils.cpp index 139636cf7..9df222217 100644 --- a/src/libcalamares/utils/CalamaresUtils.cpp +++ b/src/libcalamares/utils/CalamaresUtils.cpp @@ -48,7 +48,7 @@ static bool s_isAppDataDirOverridden = false; static QTranslator* s_brandingTranslator = nullptr; static QTranslator* s_translator = nullptr; static QTranslator* s_qtTranslator = nullptr; -static QString s_translatorLocaleName = QString(); +static QString s_translatorLocaleName; static bool @@ -342,7 +342,7 @@ obscure( const QString& string ) void crash() { - volatile int* a = (int*)(NULL); + volatile int* a = nullptr; *a = 1; }