From 1781230ad8ba7b271487380a931678ee3a1925fa Mon Sep 17 00:00:00 2001 From: Bart De Vries Date: Sun, 18 Jun 2023 16:32:10 +0200 Subject: [PATCH] Fix mMedia nullptr dereference in VLC backend metadata call CCBUG: 470263 --- src/kmediasession/mediabackends/vlcmediabackend.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/kmediasession/mediabackends/vlcmediabackend.cpp b/src/kmediasession/mediabackends/vlcmediabackend.cpp index 64b40f29..ec80c902 100644 --- a/src/kmediasession/mediabackends/vlcmediabackend.cpp +++ b/src/kmediasession/mediabackends/vlcmediabackend.cpp @@ -679,16 +679,16 @@ void VlcMediaBackendPrivate::signalErrorChange(KMediaSession::Error errorCode) void VlcMediaBackendPrivate::parseMetaData() { qCDebug(VlcSignalsLog) << "VlcMediaBackendPrivate::parseMetaData()"; - if (mKMediaSession->metaData()->title().isEmpty()) { + if (mMedia && mKMediaSession->metaData()->title().isEmpty()) { mKMediaSession->metaData()->setTitle(QString::fromUtf8(libvlc_media_get_meta(mMedia, libvlc_meta_Title))); } - if (mKMediaSession->metaData()->artist().isEmpty()) { + if (mMedia && mKMediaSession->metaData()->artist().isEmpty()) { mKMediaSession->metaData()->setArtist(QString::fromUtf8(libvlc_media_get_meta(mMedia, libvlc_meta_Artist))); } - if (mKMediaSession->metaData()->album().isEmpty()) { + if (mMedia && mKMediaSession->metaData()->album().isEmpty()) { mKMediaSession->metaData()->setAlbum(QString::fromUtf8(libvlc_media_get_meta(mMedia, libvlc_meta_Album))); } - if (mKMediaSession->metaData()->artworkUrl().isEmpty()) { + if (mMedia && mKMediaSession->metaData()->artworkUrl().isEmpty()) { mKMediaSession->metaData()->setArtworkUrl(QUrl(QString::fromUtf8(libvlc_media_get_meta(mMedia, libvlc_meta_ArtworkURL)))); } }