diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-07-20 11:29:30 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-07-20 11:29:30 -0700 |
| commit | 5f7baac1e34440d3805ef488c97af748f3c20640 (patch) | |
| tree | a33d6e002427c7f1ecbc43567c7a0e8b37257bd3 | |
| parent | Merge branch 'maint' (diff) | |
| parent | t/README: clarify test_must_fail description (diff) | |
| download | git-5f7baac1e34440d3805ef488c97af748f3c20640.tar.gz git-5f7baac1e34440d3805ef488c97af748f3c20640.zip | |
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.c | 2 | ||||
| -rw-r--r-- | t/README | 6 |
2 files changed, 6 insertions, 2 deletions
@@ -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)) @@ -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> |