From 1b0b962d771fb734cbf273f216b487bb58dec7b9 Mon Sep 17 00:00:00 2001
From: Greg Brockman <gdb@MIT.EDU>
Date: Tue, 20 Jul 2010 00:46:21 -0400
Subject: [PATCH 1/2] Check size of path buffer before writing into it
This prevents a buffer overrun that could otherwise be triggered by
creating a file called '.git' with contents
gitdir: (something really long)
Signed-off-by: Greg Brockman <gdb@mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
setup.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/setup.c b/setup.c
index e3781b656d7..01e1a6a7c5c 100644
--- a/setup.c
+++ b/setup.c
@@ -153,6 +153,8 @@ static int is_git_directory(const char *suspect)
char path[PATH_MAX];
size_t len = strlen(suspect);
+ if (PATH_MAX <= len + strlen("/objects"))
+ die("Too long path: %.*s", 60, suspect);
strcpy(path, suspect);
if (getenv(DB_ENVIRONMENT)) {
if (access(getenv(DB_ENVIRONMENT), X_OK))
From d8e3ac7e7264863544c95069024f1cbaedb5db3d Mon Sep 17 00:00:00 2001
From: Stephen Boyd <bebarino@gmail.com>
Date: Fri, 23 Jul 2010 09:31:27 -0700
Subject: [PATCH 2/2] request-pull.txt: Document -p option
Signed-off-by: Stephen Boyd <bebarino@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
Documentation/git-request-pull.txt | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/Documentation/git-request-pull.txt b/Documentation/git-request-pull.txt
index 19335fddae2..400f61f6e24 100644
--- a/Documentation/git-request-pull.txt
+++ b/Documentation/git-request-pull.txt
@@ -7,7 +7,7 @@ git-request-pull - Generates a summary of pending changes
SYNOPSIS
--------
-'git request-pull' <start> <url> [<end>]
+'git request-pull' [-p] <start> <url> [<end>]
DESCRIPTION
-----------
@@ -17,6 +17,9 @@ the given URL in the generated summary.
OPTIONS
-------
+-p::
+ Show patch text
+
<start>::
Commit to start at.