This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository libx2goclient. commit 83477b16273f12b442a376c8bd5fa2fadbae64a5 Author: Mihai Moldovan <ionic@ionic.de> Date: Thu May 28 14:28:48 2020 +0200 src/x2goclient-{network{,-ssh},openssh-version}.c: add GErr-checking where needed. --- src/x2goclient-network-ssh.c | 10 +++++++--- src/x2goclient-network.c | 1 + src/x2goclient-openssh-version.c | 2 ++ 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/x2goclient-network-ssh.c b/src/x2goclient-network-ssh.c index 01b68cb..288c35e 100644 --- a/src/x2goclient-network-ssh.c +++ b/src/x2goclient-network-ssh.c @@ -303,7 +303,7 @@ static GSocketAddress* x2goclient_network_ssh_parse_sockspec_unix_socket (const static guint16 x2goclient_network_ssh_parse_sockspec_port (const GString *portspec, GError **gerr) { guint16 ret = 0; - g_return_val_if_fail (gerr == NULL || *gerr == NULL, ret); + g_return_val_if_fail (((gerr == NULL) || (*gerr == NULL)), ret); if (':' == portspec->str[0]) { /* @@ -361,7 +361,7 @@ static GString* x2goclient_network_ssh_sanitize_sockspec (const GString *sockspe static GSocketAddress* x2goclient_network_ssh_parse_sockspec_ip (const GString *sockspec, const gboolean want_v6, GError **gerr) { GSocketAddress *ret = NULL; - g_return_val_if_fail (gerr == NULL || *gerr == NULL, ret); + g_return_val_if_fail (((gerr == NULL) || (*gerr == NULL)), ret); /* We're free to sanitize the string now. */ GString *work_sockspec = x2goclient_network_ssh_sanitize_sockspec (sockspec); @@ -528,7 +528,7 @@ static GSocketAddress* x2goclient_network_ssh_parse_sockspec_ip (const GString * static GSocketAddress* x2goclient_network_ssh_parse_sockspec_alias (const GString *sockspec, GError **gerr) { GSocketAddress *ret = NULL; - g_return_val_if_fail (gerr == NULL || *gerr == NULL, ret); + g_return_val_if_fail (((gerr == NULL) || (*gerr == NULL)), ret); /* We're free to sanitize the string now. */ GString *work_sockspec = x2goclient_network_ssh_sanitize_sockspec (sockspec); @@ -713,6 +713,8 @@ gboolean x2goclient_network_ssh_connect (X2GoClientNetworkSSH *self, GError **ge gboolean ret = FALSE; g_return_val_if_fail (X2GOCLIENT_IS_NETWORK_SSH (self), ret); + g_return_val_if_fail (((gerr == NULL) || (*gerr == NULL)), ret); + X2GoClientNetwork *parent = X2GOCLIENT_NETWORK (self); X2GoClientNetworkClass *parent_class = X2GOCLIENT_NETWORK_GET_CLASS (parent); @@ -725,6 +727,8 @@ static gboolean x2goclient_network_ssh_parent_connect (X2GoClientNetwork *parent gboolean ret = TRUE; g_return_val_if_fail (X2GOCLIENT_IS_NETWORK_SSH (parent), ret); + g_return_val_if_fail (((gerr == NULL) || (*gerr == NULL)), ret); + X2GoClientNetworkSSH *self = X2GOCLIENT_NETWORK_SSH (parent); /* Actual implementation here. */ diff --git a/src/x2goclient-network.c b/src/x2goclient-network.c index 423d186..21e6796 100644 --- a/src/x2goclient-network.c +++ b/src/x2goclient-network.c @@ -168,6 +168,7 @@ gboolean x2goclient_network_connect (X2GoClientNetwork *self, GError **gerr) { X2GoClientNetworkClass *class = X2GOCLIENT_NETWORK_GET_CLASS (self); g_return_val_if_fail (X2GOCLIENT_IS_NETWORK (self), FALSE); + g_return_val_if_fail (((gerr == NULL) || (*gerr == NULL)), FALSE); g_return_val_if_fail (class->connect, FALSE); return (class->connect (self, gerr)); diff --git a/src/x2goclient-openssh-version.c b/src/x2goclient-openssh-version.c index f6fabbe..3391ed6 100644 --- a/src/x2goclient-openssh-version.c +++ b/src/x2goclient-openssh-version.c @@ -120,6 +120,8 @@ G_DEFINE_BOXED_TYPE (X2GoClientOpenSSHVersion, x2goclient_openssh_version, &x2go _Bool x2goclient_openssh_version_parse (X2GoClientOpenSSHVersion *openssh_version, const gchar *version_string, GError **gerr) { _Bool ret = FALSE; + g_return_val_if_fail (((gerr == NULL) || (*gerr == NULL)), ret); + /* Basic sanity checks on struct and string. */ if (!(openssh_version)) { g_set_error_literal (gerr, ERROR_QUARK, X2GOCLIENT_OPENSSH_VERSION_ERROR_INVALID_STRUCT, "No version struct passed, cannot store extracted information."); -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/libx2goclient.git