brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gdm/util: Make sure error is GError before checking it

Browse Source 
The fingerprint device fetching code has a generic error handler,
that assumes the passed in error is GError. If it's not a
GError it will fail trying to use GError specific methods.

This commit adds some validation checking.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3319>
This commit is contained in:
Ray Strode 2024-05-15 10:47:40 -04:00 committed by Marge Bot
parent 3220005eea
commit d8ab090d47
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
js/gdm/util.js
View File

@ -395,15 +395,16 @@ export class ShellUserVerifier extends Signals.EventEmitter {
_handleFingerprintError(e) {
this._fingerprintReaderType = FingerprintReaderType.NONE;
if (e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED))
return;
if (e.matches(Gio.DBusError, Gio.DBusError.SERVICE_UNKNOWN))
return;
if (Gio.DBusError.is_remote_error(e) &&
Gio.DBusError.get_remote_error(e) ===
'net.reactivated.Fprint.Error.NoSuchDevice')
return;
if (e instanceof GLib.Error) {
if (e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED))
return;
if (e.matches(Gio.DBusError, Gio.DBusError.SERVICE_UNKNOWN))
return;
if (Gio.DBusError.is_remote_error(e) &&
Gio.DBusError.get_remote_error(e) ===
'net.reactivated.Fprint.Error.NoSuchDevice')
return;
}
logError(e, 'Failed to interact with fprintd service');
}