From 23890bbf8212eab0a49ead03429082a002776142 Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Thu, 1 Sep 2022 06:44:46 +0200
Subject: [PATCH] medialibrary: fix usage of NULL config_GetUserDir result
---
modules/misc/medialibrary/medialibrary.cpp | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/modules/misc/medialibrary/medialibrary.cpp b/modules/misc/medialibrary/medialibrary.cpp
index 8144637c37b4..5231202476df 100644
--- a/modules/misc/medialibrary/medialibrary.cpp
+++ b/modules/misc/medialibrary/medialibrary.cpp
@@ -395,7 +395,10 @@ void MediaLibrary::onRescanStarted()
MediaLibrary* MediaLibrary::create( vlc_medialibrary_module_t* vlc_ml )
{
- auto userDir = vlc::wrap_cptr( config_GetUserDir( VLC_USERDATA_DIR ) );
+ char *userdir = config_GetUserDir( VLC_USERDATA_DIR );
+ if (unlikely(userdir == nullptr))
+ return nullptr;
+ auto userDir = vlc::wrap_cptr( userdir );
auto mlDir = std::string{ userDir.get() } + "/ml/";
auto dbPath = mlDir + "ml.db";
auto mlFolderPath = mlDir + "mlstorage/";
--
GitLab