From c6c513b23c4a3ecf0a4e397c47a10ac2783cec45 Mon Sep 17 00:00:00 2001 From: Jay Sorg Date: Tue, 7 Nov 2017 11:51:23 -0800 Subject: [PATCH] use g_memcpy, braces --- common/os_calls.c | 2 +- common/trans.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/common/os_calls.c b/common/os_calls.c index 7bd3e68f..7bbeddfe 100644 --- a/common/os_calls.c +++ b/common/os_calls.c @@ -1011,7 +1011,7 @@ g_sck_vsock_bind(int sck, const char *port) #if defined(XRDP_ENABLE_VSOCK) struct sockaddr_vm s; - memset(&s, 0, sizeof(struct sockaddr_vm)); + g_memset(&s, 0, sizeof(struct sockaddr_vm)); s.svm_family = AF_VSOCK; s.svm_port = atoi(port); s.svm_cid = VMADDR_CID_ANY; diff --git a/common/trans.c b/common/trans.c index 24004dbf..9448760c 100644 --- a/common/trans.c +++ b/common/trans.c @@ -835,7 +835,9 @@ trans_listen_address(struct trans *self, char *port, const char *address) { self->sck = g_sck_vsock_socket(); if (self->sck < 0) + { return 1; + } g_tcp_set_non_blocking(self->sck);