Evolinx/packagekit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Correctly store file descriptor from logind (#94070)

Browse Source 
The code had the issue that the file descriptor would be first
stored, but then automatically cleaned up as it was only peeked
from the list. Simplify this to check the length and then get
the single file descriptor explictly.

Signed-off-by: Benjamin Berg <benjamin@sipsolutions.net>
Signed-off-by: Richard Hughes <richard@hughsie.com>
This commit is contained in:
Benjamin Berg 2016-02-11 00:40:29 +01:00 committed by Richard Hughes
parent de33b843c0
commit a6fc0ece27
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/pk-engine.c
View File

@ -275,8 +275,6 @@ static void
pk_engine_inhibit (PkEngine *engine)
{
#ifdef HAVE_SYSTEMD
const gint *fd_list;
gint fd_list_len = 0;
g_autoptr(GError) error = NULL;
g_autoptr(GUnixFDList) out_fd_list = NULL;
g_autoptr(GVariant) res = NULL;
@ -311,12 +309,11 @@ pk_engine_inhibit (PkEngine *engine)
}
/* keep fd as cookie */
fd_list = g_unix_fd_list_peek_fds (out_fd_list, &fd_list_len);
if (fd_list_len != 1) {
if (g_unix_fd_list_get_length (out_fd_list) != 1) {
g_warning ("invalid response from logind");
return;
}
engine->priv->logind_fd = fd_list[0];
engine->priv->logind_fd = g_unix_fd_list_get (out_fd_list, 0, NULL);
g_debug ("opened logind fd %i", engine->priv->logind_fd);
#endif
}