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>
Jonathan Nieder committed
Nov 19, 2010 at 18:46 UTC
5c28a8b054cb69a37638b0261fc370422c8fab58
4 files changed
+9
-5
contrib/svn-fe/svn-fe.c
+2
-1
@@ -8,7 +8,8 @@
8
9
int main(int argc, char **argv)
10
{
11
- svndump_init(NULL);
11
+ if (svndump_init(NULL))
12
+ return 1;
13
svndump_read((argc > 1) ? argv[1] : NULL);
14
svndump_deinit();
15
svndump_reset();
test-svn-fe.c
+2
-1
@@ -9,7 +9,8 @@ int main(int argc, char *argv[])
9
{
10
if (argc != 2)
11
usage("test-svn-fe <file>");
12
- svndump_init(argv[1]);
12
+ if (svndump_init(argv[1]))
13
+ return 1;
14
svndump_read(NULL);
15
svndump_deinit();
16
svndump_reset();
vcs-svn/svndump.c
+4
-2
@@ -290,14 +290,16 @@ void svndump_read(const char *url)
290
handle_revision();
291
}
292
293
-void svndump_init(const char *filename)
293
+int svndump_init(const char *filename)
294
{
295
- buffer_init(filename);
295
+ if (buffer_init(filename))
296
+ return error("cannot open %s: %s", filename, strerror(errno));
297
repo_init();
298
reset_dump_ctx(~0);
299
reset_rev_ctx(0);
300
reset_node_ctx(NULL);
301
init_keys();
302
+ return 0;
303
}
304
305
void svndump_deinit(void)
vcs-svn/svndump.h
+1
-1
@@ -1,7 +1,7 @@
1
#ifndef SVNDUMP_H_
2
#define SVNDUMP_H_
3
4
-void svndump_init(const char *filename);
4
+int svndump_init(const char *filename);
5
void svndump_read(const char *url);
6
void svndump_deinit(void);
7
void svndump_reset(void);