Skip to content

fix: add null pointer checks for D-Bus proxy member variables #3255

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
deepin-bot merged 1 commit into from
Jun 4, 2026
+50 −14
Merged

fix: add null pointer checks for D-Bus proxy member variables #3255

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 50 additions & 14 deletions src/plugin-sound/operation/sounddbusproxy.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2024 - 2027 UnionTech Software Technology Co., Ltd.
// SPDX-FileCopyrightText: 2024 - 2026 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: GPL-3.0-or-later
#include "sounddbusproxy.h"
Expand Down Expand Up @@ -186,12 +186,15 @@
m_defaultSink->setSuffix("Sink");
}

bool SoundDBusProxy::muteSink()

Check warning on line 189 in src/plugin-sound/operation/sounddbusproxy.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

The function 'muteSink' is never used.
{
return qvariant_cast<bool>(m_defaultSink->property("MuteSink"));
if (m_defaultSink) {
return qvariant_cast<bool>(m_defaultSink->property("MuteSink"));
}
return false;
}

void SoundDBusProxy::SetMuteSink(bool in0)

Check warning on line 197 in src/plugin-sound/operation/sounddbusproxy.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

The function 'SetMuteSink' is never used.
{
if (m_defaultSink) {
QList<QVariant> argumentList;
Expand All @@ -202,12 +205,18 @@

double SoundDBusProxy::balanceSink()
{
return qvariant_cast<double>(m_defaultSink->property("BalanceSink"));
if (m_defaultSink) {
return qvariant_cast<double>(m_defaultSink->property("BalanceSink"));
}
return 0.0;
}

double SoundDBusProxy::baseVolumeSink()

Check warning on line 214 in src/plugin-sound/operation/sounddbusproxy.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

The function 'baseVolumeSink' is never used.
{
return qvariant_cast<double>(m_defaultSink->property("BaseVolumeSink"));
if (m_defaultSink) {
return qvariant_cast<double>(m_defaultSink->property("BaseVolumeSink"));
}
return 0.0;
}

void SoundDBusProxy::SetBalanceSink(double in0, bool in1)
Expand All @@ -219,12 +228,15 @@
}
}

double SoundDBusProxy::volumeSink()

Check warning on line 231 in src/plugin-sound/operation/sounddbusproxy.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

The function 'volumeSink' is never used.
{
return qvariant_cast<double>(m_defaultSink->property("VolumeSink"));
if (m_defaultSink) {
return qvariant_cast<double>(m_defaultSink->property("VolumeSink"));
}
return 0.0;
}

void SoundDBusProxy::SetVolumeSink(double in0, bool in1)

Check warning on line 239 in src/plugin-sound/operation/sounddbusproxy.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

The function 'SetVolumeSink' is never used.
{
if (m_defaultSink) {
QList<QVariant> argumentList;
Expand All @@ -235,17 +247,23 @@
}
}

AudioPort SoundDBusProxy::activePortSink()

Check warning on line 250 in src/plugin-sound/operation/sounddbusproxy.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

The function 'activePortSink' is never used.
{
return qvariant_cast<AudioPort>(m_defaultSink->property("ActivePortSink"));
if (m_defaultSink) {
return qvariant_cast<AudioPort>(m_defaultSink->property("ActivePortSink"));
}
return AudioPort();
}

uint SoundDBusProxy::cardSink()

Check warning on line 258 in src/plugin-sound/operation/sounddbusproxy.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

The function 'cardSink' is never used.
{
return qvariant_cast<uint>(m_defaultSink->property("CardSink"));
if (m_defaultSink) {
return qvariant_cast<uint>(m_defaultSink->property("CardSink"));
}
return 0;
}

void SoundDBusProxy::setSourceDevicePath(const QString &path)

Check warning on line 266 in src/plugin-sound/operation/sounddbusproxy.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

The function 'setSourceDevicePath' is never used.
{
if (m_defaultSource) {
m_defaultSource->deleteLater();
Expand All @@ -264,14 +282,20 @@
}
}

double SoundDBusProxy::volumeSource()

Check warning on line 285 in src/plugin-sound/operation/sounddbusproxy.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

The function 'volumeSource' is never used.
{
return qvariant_cast<double>(m_defaultSource->property("VolumeSource"));
if (m_defaultSource) {
return qvariant_cast<double>(m_defaultSource->property("VolumeSource"));
}
return 0.0;
}

AudioPort SoundDBusProxy::activePortSource()

Check warning on line 293 in src/plugin-sound/operation/sounddbusproxy.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

The function 'activePortSource' is never used.
{
return qvariant_cast<AudioPort>(m_defaultSource->property("ActivePortSource"));
if (m_defaultSource) {
return qvariant_cast<AudioPort>(m_defaultSource->property("ActivePortSource"));
}
return AudioPort();
}

void SoundDBusProxy::SetSourceVolume(double in0, bool in1)
Expand All @@ -285,13 +309,19 @@

uint SoundDBusProxy::cardSource()
{
return qvariant_cast<uint>(m_defaultSource->property("CardSource"));
if (m_defaultSource) {
return qvariant_cast<uint>(m_defaultSource->property("CardSource"));
}
return 0;
}

QDBusObjectPath SoundDBusProxy::GetMeter()
{
QList<QVariant> argumentList;
return QDBusPendingReply<QDBusObjectPath>(m_defaultSource->asyncCallWithArgumentList(QStringLiteral("GetMeter"), argumentList));
if (m_defaultSource) {
QList<QVariant> argumentList;
return QDBusPendingReply<QDBusObjectPath>(m_defaultSource->asyncCallWithArgumentList(QStringLiteral("GetMeter"), argumentList));
}
return QDBusObjectPath();
}

void SoundDBusProxy::setMeterDevicePath(const QString &path)
Expand All @@ -305,7 +335,10 @@

double SoundDBusProxy::volumeMeter()
{
return qvariant_cast<double>(m_sourceMeter->property("VolumeMeter"));
if (m_sourceMeter) {
return qvariant_cast<double>(m_sourceMeter->property("VolumeMeter"));
}
return 0.0;
}

void SoundDBusProxy::Tick()
Expand Down Expand Up @@ -333,7 +366,10 @@

bool SoundDBusProxy::muteSource()
{
return qvariant_cast<bool>(m_defaultSource->property("MuteSource"));
if (m_defaultSource) {
return qvariant_cast<bool>(m_defaultSource->property("MuteSource"));
}
return false;
}

bool SoundDBusProxy::audioMono()
Expand Down
Loading