[gnome-keyring] ssh-agent: Don't treat packet write error as fatal
- From: Daiki Ueno <dueno src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-keyring] ssh-agent: Don't treat packet write error as fatal
- Date: Mon, 7 May 2018 07:26:30 +0000 (UTC)
commit 2b8a73efffef00b6bcb0de16abdee55635930a85
Author: Daiki Ueno <dueno src gnome org>
Date: Mon May 7 09:17:45 2018 +0200
ssh-agent: Don't treat packet write error as fatal
daemon/ssh-agent/gkd-ssh-agent-util.c | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/daemon/ssh-agent/gkd-ssh-agent-util.c b/daemon/ssh-agent/gkd-ssh-agent-util.c
index 07bae1f..22c64b5 100644
--- a/daemon/ssh-agent/gkd-ssh-agent-util.c
+++ b/daemon/ssh-agent/gkd-ssh-agent-util.c
@@ -76,8 +76,11 @@ _gkd_ssh_agent_write_packet (GSocketConnection *connection,
gsize bytes_written;
stream = g_io_stream_get_output_stream (G_IO_STREAM (connection));
- if (!egg_buffer_set_uint32 (buffer, 0, buffer->len - 4))
- g_return_val_if_reached (FALSE);
+ if (!egg_buffer_set_uint32 (buffer, 0, buffer->len - 4)) {
+ g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
+ "cannot read packet length");
+ return FALSE;
+ }
return g_output_stream_write_all (stream, buffer->buf, buffer->len, &bytes_written, cancellable,
error);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]