From: andy at warmcat.com (Andy Green)
Subject: [PATCH 1/2] gcc8.1: fix strncpy bounds warnings
Date: Wed, 13 Jun 2018 07:33:59 +0800 [thread overview]
Message-ID: <152884643982.29435.12041657288903581464.stgit@mail.warmcat.com> (raw)
These warnings are coming on default Fedora 28 build and probably others using gcc 8.1
../shared.c: In function ?expand_macro?:
../shared.c:483:3: warning: ?strncpy? specified bound depends on the length of the source argument [-Wstringop-overflow=]
strncpy(name, value, len);
^~~~~~~~~~~~~~~~~~~~~~~~~
../shared.c:480:9: note: length computed here
len = strlen(value);
^~~~~~~~~~~~~
strncpy with a computed length via strlen is usually
not the right thing.
../ui-shared.c: In function ?cgit_repobasename?:
../ui-shared.c:135:2: warning: ?strncpy? specified bound 1024 equals destination size [-Wstringop-truncation]
strncpy(rvbuf, reponame, sizeof(rvbuf));
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
add one char of padding and adjust so the code does the same.
Signed-off-by: Andy Green <andy at warmcat.com>
---
shared.c | 2 +-
ui-shared.c | 7 ++++---
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/shared.c b/shared.c
index 21ac8f4..477db0a 100644
--- a/shared.c
+++ b/shared.c
@@ -480,7 +480,7 @@ static char *expand_macro(char *name, int maxlength)
len = strlen(value);
if (len > maxlength)
len = maxlength;
- strncpy(name, value, len);
+ memcpy(name, value, len);
}
return name + len;
}
diff --git a/ui-shared.c b/ui-shared.c
index 9d8f66b..6656bd5 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -129,11 +129,12 @@ char *cgit_pageurl(const char *reponame, const char *pagename,
const char *cgit_repobasename(const char *reponame)
{
/* I assume we don't need to store more than one repo basename */
- static char rvbuf[1024];
+ static char rvbuf[1025];
int p;
const char *rv;
- strncpy(rvbuf, reponame, sizeof(rvbuf));
- if (rvbuf[sizeof(rvbuf)-1])
+
+ strncpy(rvbuf, reponame, sizeof(rvbuf) - 1);
+ if (rvbuf[sizeof(rvbuf) - 2])
die("cgit_repobasename: truncated repository name '%s'", reponame);
p = strlen(rvbuf)-1;
/* strip trailing slashes */
next reply other threads:[~2018-06-12 23:33 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-12 23:33 andy [this message]
2018-06-12 23:34 ` [PATCH 2/2] gcc8.1: fix strcat warning andy
2018-06-16 13:11 ` john
2018-06-16 21:52 ` list
2018-06-17 2:28 ` andy
2018-06-16 13:04 ` [PATCH 1/2] gcc8.1: fix strncpy bounds warnings john
2018-06-16 13:07 ` [PATCH 1/2] shared: allocate return value from expand_macros() john
2018-06-16 13:07 ` [PATCH 2/2] shared: use strbuf for expanding macros john
2018-06-16 13:12 ` [PATCH 1/2] gcc8.1: fix strncpy bounds warnings andy
2018-06-16 14:14 ` john
2018-06-26 11:36 ` [PATCH v2 0/2] " andy
2018-06-26 11:36 ` [PATCH v2 1/2] " andy
2018-06-26 11:36 ` [PATCH v2 2/2] cgit_repobasename: convert to allocated result andy
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=152884643982.29435.12041657288903581464.stgit@mail.warmcat.com \
--to=cgit@lists.zx2c4.com \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).