summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@gmail.com>2010-11-20 00:46:06 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-11-24 22:51:42 (GMT)
commit5c28a8b054cb69a37638b0261fc370422c8fab58 (patch)
tree111356892e3a73a6439fb0506971d178096f6277
parent1f05d07c456e23c0827efbbb3e738afc9f3152e7 (diff)
downloadgit-5c28a8b054cb69a37638b0261fc370422c8fab58.zip
git-5c28a8b054cb69a37638b0261fc370422c8fab58.tar.gz
git-5c28a8b054cb69a37638b0261fc370422c8fab58.tar.bz2
vcs-svn: Check for errors from open()
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>
-rw-r--r--contrib/svn-fe/svn-fe.c3
-rw-r--r--test-svn-fe.c3
-rw-r--r--vcs-svn/svndump.c6
-rw-r--r--vcs-svn/svndump.h2
4 files changed, 9 insertions, 5 deletions
diff --git a/contrib/svn-fe/svn-fe.c b/contrib/svn-fe/svn-fe.c
index a2677b0..35db24f 100644
--- a/contrib/svn-fe/svn-fe.c
+++ b/contrib/svn-fe/svn-fe.c
@@ -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();
diff --git a/test-svn-fe.c b/test-svn-fe.c
index 77cf78a..b42ba78 100644
--- a/test-svn-fe.c
+++ b/test-svn-fe.c
@@ -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();
diff --git a/vcs-svn/svndump.c b/vcs-svn/svndump.c
index 6b64c1b..db11851 100644
--- a/vcs-svn/svndump.c
+++ b/vcs-svn/svndump.c
@@ -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)
diff --git a/vcs-svn/svndump.h b/vcs-svn/svndump.h
index 93c412f..df9ceb0 100644
--- a/vcs-svn/svndump.h
+++ b/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);