From 3c9d0414ed2db0167e6c828b547be8fc9f88fccc Mon Sep 17 00:00:00 2001 From: Greg Brockman Date: Tue, 20 Jul 2010 00:46:21 -0400 Subject: 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 Signed-off-by: Junio C Hamano diff --git a/setup.c b/setup.c index 0e4cfe6..3bb0461 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)) -- cgit v0.10.2-6-g49f6 From 971ecbd1f8d1468951274d01103f80dd7d32d110 Mon Sep 17 00:00:00 2001 From: Brandon Casey Date: Tue, 20 Jul 2010 12:17:12 -0500 Subject: t/README: clarify test_must_fail description Some have found the wording of the description to be somewhat ambiguous with respect to when it is desirable to use test_must_fail instead of "! ". Tweak the wording somewhat to hopefully clarify that it is _because_ test_must_fail can detect segmentation fault that it is desirable to use it instead of "! ". Signed-off-by: Brandon Casey Signed-off-by: Junio C Hamano diff --git a/t/README b/t/README index 0e4e8d8..fecb76e 100644 --- a/t/README +++ b/t/README @@ -275,6 +275,14 @@ library for your script to use. Merges the given rev using the given message. Like test_commit, creates a tag and calls test_tick before committing. + - test_must_fail + + Run a git command and ensure it fails in a controlled way. Use + this instead of "! ". When git-command dies due to a + segfault, test_must_fail diagnoses it as an error; "! " + treats it as just another expected failure, which would let such a + bug go unnoticed. + Tips for Writing Tests ---------------------- -- cgit v0.10.2-6-g49f6