ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix crash for forbidden non-mxc media

Browse Source 
BUG: 476698
This commit is contained in:
Tobias Fella
2023-11-24 18:38:00 +01:00
parent c0f9b6ba93
commit 7e8a8615b1
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/models/messageeventmodel.cpp
View File

@@ -944,12 +944,12 @@ QVariantMap MessageEventModel::getMediaInfoFromFileInfo(const EventContent::File
QVariantMap mediaInfo; QVariantMap mediaInfo;
// Get the mxc URL for the media. // Get the mxc URL for the media.
if (!fileInfo->url().isValid() || eventId.isEmpty()) { if (!fileInfo->url().isValid() || fileInfo->url().scheme() != QStringLiteral("mxc") || eventId.isEmpty()) {
mediaInfo["source"] = QUrl(); mediaInfo["source"] = QUrl();
} else { } else {
QUrl source = m_currentRoom->makeMediaUrl(eventId, fileInfo->url()); QUrl source = m_currentRoom->makeMediaUrl(eventId, fileInfo->url());
if (source.isValid() && source.scheme() == QStringLiteral("mxc")) { if (source.isValid()) {
mediaInfo["source"] = source; mediaInfo["source"] = source;
} else { } else {
mediaInfo["source"] = QUrl(); mediaInfo["source"] = QUrl();