From 663af15aa2521a10fdcb428287e9b10fb44b7bdf Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Thu, 1 Sep 2022 07:17:25 +0200
Subject: [PATCH] qt: fix usage of NULL config_GetUserDir result
---
modules/gui/qt/qt.cpp | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/modules/gui/qt/qt.cpp b/modules/gui/qt/qt.cpp
index 8acfbaa744a1..0f2dc9cef6ee 100644
--- a/modules/gui/qt/qt.cpp
+++ b/modules/gui/qt/qt.cpp
@@ -726,11 +726,14 @@ static void *Thread( void *obj )
/* All the settings are in the .conf/.ini style */
#ifdef _WIN32
char *cConfigDir = config_GetUserDir( VLC_CONFIG_DIR );
- QString configDir = cConfigDir;
- free( cConfigDir );
- if( configDir.endsWith( "\\vlc" ) )
- configDir.chop( 4 ); /* the "\vlc" dir is added again by QSettings */
- QSettings::setPath( QSettings::IniFormat, QSettings::UserScope, configDir );
+ if (likely(cConfigDir != nullptr))
+ {
+ QString configDir = cConfigDir;
+ free( cConfigDir );
+ if( configDir.endsWith( "\\vlc" ) )
+ configDir.chop( 4 ); /* the "\vlc" dir is added again by QSettings */
+ QSettings::setPath( QSettings::IniFormat, QSettings::UserScope, configDir );
+ }
#endif
p_intf->mainSettings = new QSettings(
--
GitLab