applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sharing/remote-desktop: handle gracefully when unable to get username

Browse source 
getlogin() can fail for several reasons as detailed in the man page, and
the current behaviour is a segmentation fault when it fails with NULL,
such as due to an unset loginuid.

* Check return value for error and act accordingly.
* Change to getpwuid(getuid())->pw_name, which is less likely to error.
This commit is contained in:
Hu Jialun 2022-03-28 14:35:21 +08:00 • committed by Georges Basile Stavracas Neto
parent 414d4537cd
commit 8809dbc565
1 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
panels/sharing/cc-sharing-panel.c
View file

@ -45,6 +45,9 @@
#include <config.h>
#include <unistd.h>
#include <pwd.h>
static void cc_sharing_panel_setup_label_with_hostname (CcSharingPanel *self, GtkWidget *label);
static GtkWidget *cc_sharing_panel_new_media_sharing_row (const char *uri_or_path,
CcSharingPanel *self);
@ -1378,10 +1381,20 @@ cc_sharing_panel_setup_remote_desktop_dialog (CcSharingPanel *self)
"notify::text",
G_CALLBACK (remote_desktop_credentials_changed),
self);
if (username == NULL)
gtk_editable_set_text (GTK_EDITABLE (self->remote_desktop_username_entry),
getlogin ());
{
struct passwd *pw = getpwuid (getuid ());
if (pw != NULL)
{
gtk_editable_set_text (GTK_EDITABLE (self->remote_desktop_username_entry),
pw->pw_name);
}
else
{
g_warning ("Failed to get username: %s", g_strerror (errno));
}
}
if (password == NULL)
gtk_editable_set_text (GTK_EDITABLE (self->remote_desktop_password_entry),
pw_generate ());