Skip to content

Commit

Permalink
vcs-svn: Check for errors from open()
Browse files Browse the repository at this point in the history
test-svn-fe segfaults when passed a bogus path.  Simplify debugging by
exiting with a meaningful error message instead.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
jrn authored and gitster committed Nov 24, 2010
1 parent 1f05d07 commit 5c28a8b
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 5 deletions.
3 changes: 2 additions & 1 deletion contrib/svn-fe/svn-fe.c
Expand Up @@ -8,7 +8,8 @@

int main(int argc, char **argv)
{
svndump_init(NULL);
if (svndump_init(NULL))
return 1;
svndump_read((argc > 1) ? argv[1] : NULL);
svndump_deinit();
svndump_reset();
Expand Down
3 changes: 2 additions & 1 deletion test-svn-fe.c
Expand Up @@ -9,7 +9,8 @@ int main(int argc, char *argv[])
{
if (argc != 2)
usage("test-svn-fe <file>");
svndump_init(argv[1]);
if (svndump_init(argv[1]))
return 1;
svndump_read(NULL);
svndump_deinit();
svndump_reset();
Expand Down
6 changes: 4 additions & 2 deletions vcs-svn/svndump.c
Expand Up @@ -290,14 +290,16 @@ void svndump_read(const char *url)
handle_revision();
}

void svndump_init(const char *filename)
int svndump_init(const char *filename)
{
buffer_init(filename);
if (buffer_init(filename))
return error("cannot open %s: %s", filename, strerror(errno));
repo_init();
reset_dump_ctx(~0);
reset_rev_ctx(0);
reset_node_ctx(NULL);
init_keys();
return 0;
}

void svndump_deinit(void)
Expand Down
2 changes: 1 addition & 1 deletion vcs-svn/svndump.h
@@ -1,7 +1,7 @@
#ifndef SVNDUMP_H_
#define SVNDUMP_H_

void svndump_init(const char *filename);
int svndump_init(const char *filename);
void svndump_read(const char *url);
void svndump_deinit(void);
void svndump_reset(void);
Expand Down

0 comments on commit 5c28a8b

Please sign in to comment.