Katana_mirror/kde-workspace
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kde-workspace.git synced 2025-02-23 18:32:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kgreeter: fix crash in case of null glib error pointer

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2022-04-03 19:37:28 +03:00
parent 161d331948
commit c4550ea0b2
1 changed files with 25 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
kgreeter/kgreeter.cpp
View file

@ -61,6 +61,7 @@ private:
void setUser(const QString &user);
void setSession(const QString &session);
bool isUserLogged() const;
static QString glibErrorString(const GError *const gliberror);
Ui::KGreeter m_ui;
LightDMGreeter *m_ldmgreeter;
@ -282,7 +283,7 @@ void KGreeter::showPromptCb(LightDMGreeter *ldmgreeter, const char *ldmtext, Lig
g_autoptr(GError) gliberror = NULL;
if (!lightdm_greeter_respond(ldmgreeter, kgreeterpass.constData(), &gliberror)) {
kgreeter->statusBar()->showMessage(i18n("Failed to repsond: %1", gliberror->message));
kgreeter->statusBar()->showMessage(i18n("Failed to repsond: %1", KGreeter::glibErrorString(gliberror)));
}
}
}
@ -296,13 +297,18 @@ void KGreeter::authenticationCompleteCb(LightDMGreeter *ldmgreeter, gpointer ldm
const QByteArray kgreetersession = kgreeter->getSession();
g_autoptr(GError) gliberror = NULL;
if (!lightdm_greeter_get_is_authenticated(ldmgreeter) ||
!lightdm_greeter_start_session_sync(ldmgreeter, kgreetersession.constData(), &gliberror)) {
kgreeter->statusBar()->showMessage(i18n("Failed to authenticate or start session: %1", gliberror->message));
} else {
qApp->quit();
if (!lightdm_greeter_get_is_authenticated(ldmgreeter)) {
kgreeter->statusBar()->showMessage(i18n("Failed to authenticate"));
return;
}
g_autoptr(GError) gliberror = NULL;
if (!lightdm_greeter_start_session_sync(ldmgreeter, kgreetersession.constData(), &gliberror)) {
kgreeter->statusBar()->showMessage(i18n("Failed to start session: %1", KGreeter::glibErrorString(gliberror)));
return;
}
qApp->quit();
}
void KGreeter::showMessageCb(LightDMGreeter *ldmgreeter, const gchar *ldmtext, LightDMMessageType ldmtype, gpointer ldmptr)
@ -319,7 +325,7 @@ void KGreeter::slotSuspend()
{
g_autoptr(GError) gliberror = NULL;
if (!lightdm_suspend(&gliberror)) {
statusBar()->showMessage(i18n("Could not suspend: %1", gliberror->message));
statusBar()->showMessage(i18n("Could not suspend: %1", KGreeter::glibErrorString(gliberror)));
}
}
@ -327,7 +333,7 @@ void KGreeter::slotHibernate()
{
g_autoptr(GError) gliberror = NULL;
if (!lightdm_hibernate(&gliberror)) {
statusBar()->showMessage(i18n("Could not hibernate: %1", gliberror->message));
statusBar()->showMessage(i18n("Could not hibernate: %1", KGreeter::glibErrorString(gliberror)));
}
}
@ -345,7 +351,7 @@ void KGreeter::slotPoweroff()
g_autoptr(GError) gliberror = NULL;
if (!lightdm_shutdown(&gliberror)) {
statusBar()->showMessage(i18n("Could not poweroff: %1", gliberror->message));
statusBar()->showMessage(i18n("Could not poweroff: %1", KGreeter::glibErrorString(gliberror)));
}
}
@ -363,7 +369,7 @@ void KGreeter::slotReboot()
g_autoptr(GError) gliberror = NULL;
if (!lightdm_restart(&gliberror)) {
statusBar()->showMessage(i18n("Could not reboot: %1", gliberror->message));
statusBar()->showMessage(i18n("Could not reboot: %1", KGreeter::glibErrorString(gliberror)));
}
}
@ -462,6 +468,14 @@ bool KGreeter::isUserLogged() const
return false;
}
QString KGreeter::glibErrorString(const GError *const gliberror)
{
if (!gliberror) {
return i18n("Unknown error");
}
return QString::fromUtf8(gliberror->message);
}
int main(int argc, char**argv)
{
QApplication app(argc, argv);