From: Jason at zx2c4.com (Jason A. Donenfeld)
Subject: [PATCH 1/2] ui-ssdiff: ban strncat()
Date: Sat, 9 Feb 2019 12:31:57 +0100 [thread overview]
Message-ID: <CAHmME9p1vsxeOuwUASCexEM=z9q5KwrWNrQHHEXzHy1bbD29Lw@mail.gmail.com> (raw)
In-Reply-To: <20190208214812.26937-1-list@eworm.de>
You sure those statements are the same? Snprintf doesn't append like
strncat. Wouldn't strlcat be the more apt replacement?
--
Sent from my telephone.
On Fri, Feb 8, 2019, 22:49 Christian Hesse <list at eworm.de wrote:
> From: Christian Hesse <mail at eworm.de>
>
> Git version v2.21.0 marks strncat() as banned (commit
> ace5707a803eda0f1dde3d776dc3729d3bc7759a), so replace it.
>
> Signed-off-by: Christian Hesse <mail at eworm.de>
> Reviewed-by: John Keeping <john at keeping.me.uk>
> ---
> ui-ssdiff.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/ui-ssdiff.c b/ui-ssdiff.c
> index c456033..1f12cfc 100644
> --- a/ui-ssdiff.c
> +++ b/ui-ssdiff.c
> @@ -136,10 +136,10 @@ static char *replace_tabs(char *line)
> for (;;) {
> cur_buf = strchr(prev_buf, '\t');
> if (!cur_buf) {
> - strncat(result, prev_buf, result_len);
> + snprintf(result, result_len, "%s", prev_buf);
> break;
> } else {
> - strncat(result, prev_buf, cur_buf - prev_buf);
> + snprintf(result, cur_buf - prev_buf, "%s",
> prev_buf);
> linelen = strlen(result);
> memset(&result[linelen], ' ', 8 - (linelen % 8));
> result[linelen + 8 - (linelen % 8)] = '\0';
> _______________________________________________
> CGit mailing list
> CGit at lists.zx2c4.com
> https://lists.zx2c4.com/mailman/listinfo/cgit
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.zx2c4.com/pipermail/cgit/attachments/20190209/79257db3/attachment.html>
next prev parent reply other threads:[~2019-02-09 11:31 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-07 10:21 [PATCH 1/1] RFC: git: update to v2.21.0-rc0 list
2019-02-07 10:57 ` john
2019-02-08 21:48 ` [PATCH 1/2] ui-ssdiff: ban strncat() list
2019-02-09 11:31 ` Jason [this message]
2019-02-10 13:08 ` list
2019-02-12 20:07 ` list
2019-02-12 20:55 ` [PATCH v2 1/1] " list
2019-02-13 8:29 ` e
2019-02-14 22:41 ` list
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='CAHmME9p1vsxeOuwUASCexEM=z9q5KwrWNrQHHEXzHy1bbD29Lw@mail.gmail.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).