Skip to content

fix(backlight): replace Q_ASSERT with error handling and guard division by zero #1091

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

Closed
deepin-wm wants to merge 1 commit into from
Closed

fix(backlight): replace Q_ASSERT with error handling and guard division by zero #1091

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
36 changes: 29 additions & 7 deletions src/output/backlight.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,23 +11,40 @@
QW_USE_NAMESPACE

Backlight::Backlight(const QString &name)
: m_name(name)
: m_maxBrightness(0)
, m_brightnessLevel(0)
, m_name(name)
{
QFile maxBrightnessFile(QString("/sys/class/backlight/%1/max_brightness").arg(name));
Q_ASSERT(maxBrightnessFile.open(QIODevice::ReadOnly));
if (!maxBrightnessFile.open(QIODevice::ReadOnly)) {
qCWarning(lcTlOutput) << "Backlight: Failed to open max_brightness for" << name;
return;
}

bool ok = false;
m_maxBrightness = maxBrightnessFile.readLine().trimmed().toLongLong(&ok);
maxBrightnessFile.close();
Q_ASSERT(ok);
Q_ASSERT(m_maxBrightness > 0);
if (!ok || m_maxBrightness <= 0) {
qCWarning(lcTlOutput) << "Backlight: Invalid max_brightness for" << name;
m_maxBrightness = 0;
return;
}

QFile brightnessFile(QString("/sys/class/backlight/%1/brightness").arg(name));
Q_ASSERT(brightnessFile.open(QIODevice::ReadOnly));
if (!brightnessFile.open(QIODevice::ReadOnly)) {
qCWarning(lcTlOutput) << "Backlight: Failed to open brightness for" << name;
m_maxBrightness = 0;
return;
}

m_brightnessLevel = brightnessFile.readLine().trimmed().toLongLong(&ok);
brightnessFile.close();
Q_ASSERT(ok);
if (!ok) {
qCWarning(lcTlOutput) << "Backlight: Invalid brightness for" << name;
m_maxBrightness = 0;
m_brightnessLevel = 0;
return;
}
}

Backlight::~Backlight()
Expand All @@ -37,6 +54,8 @@ Backlight::~Backlight()

qreal Backlight::brightness() const
{
if (m_maxBrightness <= 0)
return 0.0;
return m_brightnessLevel / static_cast<qreal>(m_maxBrightness);
}

Expand All @@ -57,7 +76,10 @@ qreal Backlight::setBrightness(qreal brightness)
QByteArray brightnessStr = QByteArray::number(brightnessLevel);
qint64 written = brightnessFile.write(brightnessStr);
brightnessFile.close();
Q_ASSERT(written == brightnessStr.size());
if (written != brightnessStr.size()) {
qCWarning(lcTlOutput) << "Output" << m_name << ": Failed to write backlight brightness.";
return this->brightness();
}

m_brightnessLevel = brightnessLevel;
return this->brightness();
Expand Down
Loading