From: "René Scharfe" <l.s.r@web.de>
To: Git List <git@vger.kernel.org>
Cc: Junio C Hamano <gitster@pobox.com>
Subject: [PATCH] apply: use strcmp(3) for comparing strings in gitdiff_verify_name()
Date: Sat, 8 Jul 2017 10:58:42 +0200 [thread overview]
Message-ID: <d1bb978b-a7df-48a8-15c8-80730c77e11c@web.de> (raw)
Avoid running over the end of another -- a C string whose length we
don't know -- by using strcmp(3) instead of memcmp(3) for comparing it
with another C string.
Signed-off-by: Rene Scharfe <l.s.r@web.de>
---
apply.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/apply.c b/apply.c
index 946be4d2f5..9b3df8a3aa 100644
--- a/apply.c
+++ b/apply.c
@@ -962,13 +962,12 @@ static int gitdiff_verify_name(struct apply_state *state,
}
if (*name) {
- int len = strlen(*name);
char *another;
if (isnull)
return error(_("git apply: bad git-diff - expected /dev/null, got %s on line %d"),
*name, state->linenr);
another = find_name(state, line, NULL, state->p_value, TERM_TAB);
- if (!another || memcmp(another, *name, len + 1)) {
+ if (!another || strcmp(another, *name)) {
free(another);
return error((side == DIFF_NEW_NAME) ?
_("git apply: bad git-diff - inconsistent new filename on line %d") :
--
2.13.2
next reply other threads:[~2017-07-08 8:59 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-08 8:58 René Scharfe [this message]
2017-07-08 11:08 ` [PATCH] apply: use strcmp(3) for comparing strings in gitdiff_verify_name() Andreas Schwab
2017-07-08 11:43 ` René Scharfe
2017-07-08 13:38 ` Andreas Schwab
2017-07-09 12:20 ` René Scharfe
2017-07-09 12:37 ` Andreas Schwab
2017-07-09 13:19 ` René Scharfe
2017-07-09 17:05 ` Junio C Hamano
2017-07-08 11:08 ` Ramsay Jones
2017-07-08 11:52 ` René Scharfe
2017-07-08 22:29 ` Junio C Hamano
2017-07-09 12:20 ` René Scharfe
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=d1bb978b-a7df-48a8-15c8-80730c77e11c@web.de \
--to=l.s.r@web.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).