Skip to content

Commit

Permalink
Merge branch 'maint'
Browse files Browse the repository at this point in the history
* maint:
  t/README: clarify test_must_fail description
  Check size of path buffer before writing into it

Conflicts:
	t/README
  • Loading branch information
Junio C Hamano committed Jul 20, 2010
2 parents c5212b8 + 971ecbd commit 5f7baac
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
2 changes: 2 additions & 0 deletions setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
6 changes: 4 additions & 2 deletions t/README
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down

0 comments on commit 5f7baac

Please sign in to comment.