git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Tay Ray Chuan <rctay89@gmail.com>
To: "Git Mailing List" <git@vger.kernel.org>
Cc: "Junio C Hamano" <gitster@pobox.com>,
	"Jonathan Nieder" <jrnieder@gmail.com>,
	Gabriel Corona <gabriel.corona@enst-bretagne.fr>
Subject: [PATCH 5/6] http-push: check path length before using it
Date: Fri, 19 Nov 2010 20:46:29 +0800	[thread overview]
Message-ID: <1290170790-2200-6-git-send-email-rctay89@gmail.com> (raw)
In-Reply-To: <1290170790-2200-5-git-send-email-rctay89@gmail.com>

We use path_len to skip the base url/path, but we do not know for sure
if path does indeed contain the base url/path. Check if this is so.

Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
---
 http-push.c |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/http-push.c b/http-push.c
index 565e580..1c34b00 100644
--- a/http-push.c
+++ b/http-push.c
@@ -1116,8 +1116,14 @@ static void handle_remote_ls_ctx(struct xml_ctx *ctx, int tag_closed)
 				}
 			}
 			if (path) {
-				path += repo->path_len;
-				ls->dentry_name = xstrdup(path);
+				if (strncmp(path,
+					    (repo->path ? repo->path : repo->url),
+					    repo->path_len) == 0) {
+					path += repo->path_len;
+					ls->dentry_name = xstrdup(path);
+				} else
+					error("Parsed path '%s' does not match url: '%s'\n",
+					      path, (repo->path ? repo->path : repo->url));
 			}
 		} else if (!strcmp(ctx->name, DAV_PROPFIND_COLLECTION)) {
 			ls->dentry_flags |= IS_DIR;
-- 
1.7.3.67.g2a10b

  reply	other threads:[~2010-11-19 12:47 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-11-19  0:06 [PATCH] Normalise directory names when pushing to some WebDAV servers Gabriel Corona
2010-11-19  4:02 ` Tay Ray Chuan
2010-11-19  5:10   ` Jonathan Nieder
2010-11-19 12:46     ` [PATCH 0/6] http (dumb): end urls with slash Tay Ray Chuan
2010-11-19 12:46       ` [PATCH 1/6] shift end_url_with_slash() from http.[ch] to url.[ch] Tay Ray Chuan
2010-11-19 12:46         ` [PATCH 2/6] url: add str wrapper for end_url_with_slash() Tay Ray Chuan
2010-11-19 12:46           ` [PATCH 3/6] http-push: Normalise directory names when pushing to some WebDAV servers Tay Ray Chuan
2010-11-19 12:46             ` [PATCH 4/6] http-backend: use end_url_with_slash() Tay Ray Chuan
2010-11-19 12:46               ` Tay Ray Chuan [this message]
2010-11-19 12:46                 ` [PATCH 6/6] http-push: add trailing slash at arg-parse time, instead of later on Tay Ray Chuan
2010-11-19 18:33                 ` [PATCH 5/6] http-push: check path length before using it Jonathan Nieder
2010-11-20  4:28                   ` Tay Ray Chuan
2010-11-19 19:18       ` [PATCH 0/6] http (dumb): end urls with slash Jonathan Nieder
2010-11-19 22:54       ` Junio C Hamano
2010-11-20  4:32         ` Tay Ray Chuan

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=1290170790-2200-6-git-send-email-rctay89@gmail.com \
    --to=rctay89@gmail.com \
    --cc=gabriel.corona@enst-bretagne.fr \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=jrnieder@gmail.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).