Tarantool development patches archive
 help / color / mirror / Atom feed
From: Chris Sosnin <k.sosnin@tarantool.org>
To: tarantool-patches@dev.tarantool.org
Subject: [Tarantool-patches] [PATCH v2] build: GCC warning on strncpy
Date: Thu, 28 Nov 2019 00:30:37 +0300	[thread overview]
Message-ID: <20191127213037.94837-2-k.sosnin@tarantool.org> (raw)
In-Reply-To: <20191127213037.94837-1-k.sosnin@tarantool.org>

Thank you for the review!
See second version below.
branch: https://github.com/tarantool/tarantool/tree/ksosnin/gh-4515-build-warning
issue: https://github.com/tarantool/tarantool/issues/4515

As long as we are sure, that strlen(sd_unix_path) < sizeof(sa.sun_path)
we can assume that there is always enough space and the path will be
null-terminated. Thus, copy 1 byte less to get rid of the warning.

Closes #4515
---
 src/systemd.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/systemd.c b/src/systemd.c
index 6686c3ce0..c80259f06 100644
--- a/src/systemd.c
+++ b/src/systemd.c
@@ -67,7 +67,7 @@ int systemd_init() {
 		.sun_path = { '\0' }
 	};
 	if (strlen(sd_unix_path) >= sizeof(sa.sun_path)) {
-		say_error("systemd: NOTIFY_SOCKET is longer that MAX_UNIX_PATH");
+		say_error("systemd: NOTIFY_SOCKET is longer than MAX_UNIX_PATH");
 		goto error;
 	}
 	if ((systemd_fd = socket(AF_UNIX, SOCK_DGRAM, 0)) == -1) {
@@ -117,7 +117,7 @@ int systemd_notify(const char *message) {
 		.sun_family = AF_UNIX,
 	};

-	strncpy(sa.sun_path, sd_unix_path, sizeof(sa.sun_path));
+	strncpy(sa.sun_path, sd_unix_path, sizeof(sa.sun_path) - 1);
 	if (sa.sun_path[0] == '@')
 		sa.sun_path[0] = '\0';

--
2.21.0 (Apple Git-122.2)

  reply	other threads:[~2019-11-27 21:30 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-11-27 21:30 [Tarantool-patches] [PATCH v2] box: frommap() bug fix Chris Sosnin
2019-11-27 21:30 ` Chris Sosnin [this message]
2019-11-27 23:40   ` [Tarantool-patches] [PATCH v2] build: GCC warning on strncpy Vladislav Shpilevoy
2019-12-16 13:40   ` Kirill Yukhin
2019-11-27 23:40 ` [Tarantool-patches] [PATCH v2] box: frommap() bug fix Vladislav Shpilevoy

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191127213037.94837-2-k.sosnin@tarantool.org \
    --to=k.sosnin@tarantool.org \
    --cc=tarantool-patches@dev.tarantool.org \
    --subject='Re: [Tarantool-patches] [PATCH v2] build: GCC warning on strncpy' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox