From: Jeff King <peff@peff.net>
To: git@vger.kernel.org
Cc: Jann Horn <jannh@google.com>
Subject: [PATCH 1/6] http: simplify update_url_from_redirect
Date: Thu, 1 Dec 2016 04:03:52 -0500 [thread overview]
Message-ID: <20161201090351.4sy4nwxjhbyvacb6@sigill.intra.peff.net> (raw)
In-Reply-To: <20161201090336.xjbb47bublfcpglo@sigill.intra.peff.net>
This function looks for a common tail between what we asked
for and where we were redirected to, but it open-codes the
comparison. We can avoid some confusing subtractions by
using strip_suffix_mem().
Signed-off-by: Jeff King <peff@peff.net>
---
http.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/http.c b/http.c
index 4c4a812fc..840dbd1c7 100644
--- a/http.c
+++ b/http.c
@@ -1664,7 +1664,7 @@ static int update_url_from_redirect(struct strbuf *base,
const struct strbuf *got)
{
const char *tail;
- size_t tail_len;
+ size_t new_len;
if (!strcmp(asked, got->buf))
return 0;
@@ -1673,14 +1673,12 @@ static int update_url_from_redirect(struct strbuf *base,
die("BUG: update_url_from_redirect: %s is not a superset of %s",
asked, base->buf);
- tail_len = strlen(tail);
-
- if (got->len < tail_len ||
- strcmp(tail, got->buf + got->len - tail_len))
+ new_len = got->len;
+ if (!strip_suffix_mem(got->buf, &new_len, tail))
return 0; /* insane redirect scheme */
strbuf_reset(base);
- strbuf_add(base, got->buf, got->len - tail_len);
+ strbuf_add(base, got->buf, new_len);
return 1;
}
--
2.11.0.319.g1f4e1e0
next prev parent reply other threads:[~2016-12-01 9:05 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-01 9:03 [PATCH 0/6] restricting http redirects Jeff King
2016-12-01 9:03 ` Jeff King [this message]
2016-12-01 9:04 ` [PATCH 2/6] http: always update the base URL for redirects Jeff King
2016-12-01 16:02 ` Ramsay Jones
2016-12-01 22:53 ` Brandon Williams
2016-12-01 23:12 ` Philip Oakley
2016-12-01 23:43 ` Junio C Hamano
2016-12-02 0:07 ` Ramsay Jones
2016-12-02 0:18 ` Jeff King
2016-12-02 1:21 ` Ramsay Jones
2016-12-01 9:04 ` [PATCH 3/6] remote-curl: rename shadowed options variable Jeff King
2016-12-01 9:04 ` [PATCH 4/6] http: make redirects more obvious Jeff King
2016-12-01 16:06 ` Ramsay Jones
2016-12-01 9:04 ` [PATCH 5/6] http: treat http-alternates like redirects Jeff King
2016-12-01 23:02 ` Brandon Williams
2016-12-02 0:06 ` Jeff King
2016-12-01 9:04 ` [PATCH 6/6] http-walker: complain about non-404 loose object errors Jeff King
2016-12-05 13:08 ` [PATCH 0/6] restricting http redirects Jeff King
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=20161201090351.4sy4nwxjhbyvacb6@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=jannh@google.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).