Commit 967d3f2e3e81b2f21d2b3dee12c58de35572cecb
2014-03-05T21:06:59
Merge pull request #2163 from ethomson/nobackend_odb_write ODB writing fails gracefully when unsupported
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94
diff --git a/src/odb.c b/src/odb.c
index b413f83..139949e 100644
--- a/src/odb.c
+++ b/src/odb.c
@@ -862,7 +862,7 @@ int git_odb_open_wstream(
{
size_t i, writes = 0;
int error = GIT_ERROR;
- git_hash_ctx *ctx;
+ git_hash_ctx *ctx = NULL;
assert(stream && db);
@@ -883,22 +883,28 @@ int git_odb_open_wstream(
}
}
- if (error == GIT_PASSTHROUGH)
- error = 0;
- if (error < 0 && !writes)
- error = git_odb__error_unsupported_in_backend("write object");
+ if (error < 0) {
+ if (error == GIT_PASSTHROUGH)
+ error = 0;
+ else if (!writes)
+ error = git_odb__error_unsupported_in_backend("write object");
+
+ goto done;
+ }
ctx = git__malloc(sizeof(git_hash_ctx));
GITERR_CHECK_ALLOC(ctx);
+ if ((error = git_hash_ctx_init(ctx)) < 0)
+ goto done;
- git_hash_ctx_init(ctx);
hash_header(ctx, size, type);
(*stream)->hash_ctx = ctx;
(*stream)->declared_size = size;
(*stream)->received_bytes = 0;
+done:
return error;
}
diff --git a/tests/odb/backend/nobackend.c b/tests/odb/backend/nobackend.c
new file mode 100644
index 0000000..7ed5acc
--- /dev/null
+++ b/tests/odb/backend/nobackend.c
@@ -0,0 +1,41 @@
+#include "clar_libgit2.h"
+#include "repository.h"
+#include "git2/sys/repository.h"
+
+static git_repository *_repo;
+
+void test_odb_backend_nobackend__initialize(void)
+{
+ git_config *config;
+ git_odb *odb;
+ git_refdb *refdb;
+
+ cl_git_pass(git_repository_new(&_repo));
+ cl_git_pass(git_config_new(&config));
+ cl_git_pass(git_odb_new(&odb));
+ cl_git_pass(git_refdb_new(&refdb, _repo));
+
+ git_repository_set_config(_repo, config);
+ git_repository_set_odb(_repo, odb);
+ git_repository_set_refdb(_repo, refdb);
+}
+
+void test_odb_backend_nobackend__cleanup(void)
+{
+ git_repository_free(_repo);
+}
+
+void test_odb_backend_nobackend__write_fails_gracefully(void)
+{
+ git_oid id;
+ git_odb *odb;
+ const git_error *err;
+
+ git_repository_odb(&odb, _repo);
+ cl_git_fail(git_odb_write(&id, odb, "Hello world!\n", 13, GIT_OBJ_BLOB));
+
+ err = giterr_last();
+ cl_assert_equal_s(err->message, "Cannot write object - unsupported in the loaded odb backends");
+
+ git_odb_free(odb);
+}