summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-07-20 18:29:30 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-07-20 18:29:30 (GMT)
commit5f7baac1e34440d3805ef488c97af748f3c20640 (patch)
treea33d6e002427c7f1ecbc43567c7a0e8b37257bd3
parentc5212b87dafb3f559ceb898bd9b40bfc3cd0ad68 (diff)
parent971ecbd1f8d1468951274d01103f80dd7d32d110 (diff)
downloadgit-5f7baac1e34440d3805ef488c97af748f3c20640.zip
git-5f7baac1e34440d3805ef488c97af748f3c20640.tar.gz
git-5f7baac1e34440d3805ef488c97af748f3c20640.tar.bz2
Merge branch 'maint'
* maint: t/README: clarify test_must_fail description Check size of path buffer before writing into it Conflicts: t/README
-rw-r--r--setup.c2
-rw-r--r--t/README6
2 files changed, 6 insertions, 2 deletions
diff --git a/setup.c b/setup.c
index 87c21f0..2769160 100644
--- a/setup.c
+++ b/setup.c
@@ -170,6 +170,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))
diff --git a/t/README b/t/README
index b906ceb..a590142 100644
--- a/t/README
+++ b/t/README
@@ -451,8 +451,10 @@ library for your script to use.
- test_must_fail <git-command>
Run a git command and ensure it fails in a controlled way. Use
- this instead of "! <git-command>" to fail when git commands
- segfault.
+ this instead of "! <git-command>". When git-command dies due to a
+ segfault, test_must_fail diagnoses it as an error; "! <git-command>"
+ treats it as just another expected failure, which would let such a
+ bug go unnoticed.
- test_might_fail <git-command>