From 706427931609f50c917c7e325d606b925d7b40e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Pierret=20=28fepitre=29?= Date: Thu, 22 Nov 2018 17:13:12 +0100 Subject: [PATCH 1/2] tracis-ci: add support for fc29 dom0 --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 5e373ba..4f7f4d3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,3 +5,4 @@ install: git clone https://github.com/QubesOS/qubes-builder ~/qubes-builder script: ~/qubes-builder/scripts/travis-build env: - DIST_DOM0=fc25 USE_QUBES_REPO_VERSION=4.0 USE_QUBES_REPO_TESTING=1 + - DIST_DOM0=fc29 USE_QUBES_REPO_VERSION=4.0 USE_QUBES_REPO_TESTING=1 From b36f2988151c192a9fee6fb0c16d06cd059e036c Mon Sep 17 00:00:00 2001 From: fepitre Date: Tue, 21 Aug 2018 16:08:19 +0200 Subject: [PATCH 2/2] Fix GCC8 warning QubesOS/qubes-issues#4225 --- qrexec/qrexec-client.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/qrexec/qrexec-client.c b/qrexec/qrexec-client.c index f5c9a6f..8b8d5a6 100644 --- a/qrexec/qrexec-client.c +++ b/qrexec/qrexec-client.c @@ -253,7 +253,8 @@ static void send_service_connect(int s, char *conn_ident, exec_params.connect_domain = connect_domain; exec_params.connect_port = connect_port; - strncpy(srv_params.ident, conn_ident, sizeof(srv_params.ident)); + strncpy(srv_params.ident, conn_ident, sizeof(srv_params.ident) - 1); + srv_params.ident[sizeof(srv_params.ident) - 1] = '\0'; if (!write_all(s, &hdr, sizeof(hdr)) || !write_all(s, &exec_params, sizeof(exec_params)) @@ -722,7 +723,8 @@ int main(int argc, char **argv) if (strcmp(domname, "dom0") == 0) { if (connect_existing) { msg_type = MSG_SERVICE_CONNECT; - strncpy(svc_params.ident, request_id, sizeof(svc_params.ident)); + strncpy(svc_params.ident, request_id, sizeof(svc_params.ident) - 1); + svc_params.ident[sizeof(svc_params.ident) - 1] = '\0'; } else if (just_exec) msg_type = MSG_JUST_EXEC; else