Commit 10711769000d009189f83e468f25b719fa303086
2012-11-29T20:47:37
Deploy versioned git_transport structure
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
diff --git a/src/remote.c b/src/remote.c
index d516d07..5fc6b4f 100644
--- a/src/remote.c
+++ b/src/remote.c
@@ -1024,10 +1024,25 @@ void git_remote_set_cred_acquire_cb(
remote->cred_acquire_cb = cred_acquire_cb;
}
+static bool transport_has_valid_version(const git_transport *transport)
+{
+ if (!transport)
+ return true;
+
+ if (transport->version > 0 && transport->version <= GIT_TRANSPORT_VERSION)
+ return true;
+
+ giterr_set(GITERR_INVALID, "Invalid version %d on git_transport", transport->version);
+ return false;
+}
+
int git_remote_set_transport(git_remote *remote, git_transport *transport)
{
assert(remote && transport);
+ if (!transport_has_valid_version(transport))
+ return -1;
+
if (remote->transport) {
giterr_set(GITERR_NET, "A transport is already bound to this remote");
return -1;
diff --git a/src/transports/local.c b/src/transports/local.c
index 62e8024..768daf3 100644
--- a/src/transports/local.c
+++ b/src/transports/local.c
@@ -403,11 +403,10 @@ int git_transport_local(git_transport **out, git_remote *owner, void *param)
GIT_UNUSED(param);
- t = git__malloc(sizeof(transport_local));
+ t = git__calloc(1, sizeof(transport_local));
GITERR_CHECK_ALLOC(t);
- memset(t, 0x0, sizeof(transport_local));
-
+ t->parent.version = GIT_TRANSPORT_VERSION;
t->parent.connect = local_connect;
t->parent.negotiate_fetch = local_negotiate_fetch;
t->parent.download_pack = local_download_pack;
diff --git a/src/transports/smart.c b/src/transports/smart.c
index 94d389b..5300a47 100644
--- a/src/transports/smart.c
+++ b/src/transports/smart.c
@@ -303,6 +303,7 @@ int git_transport_smart(git_transport **out, git_remote *owner, void *param)
t = git__calloc(sizeof(transport_smart), 1);
GITERR_CHECK_ALLOC(t);
+ t->parent.version = GIT_TRANSPORT_VERSION;
t->parent.set_callbacks = git_smart__set_callbacks;
t->parent.connect = git_smart__connect;
t->parent.close = git_smart__close;
diff --git a/tests-clar/network/remotes.c b/tests-clar/network/remotes.c
index 14fda16..17f0704 100644
--- a/tests-clar/network/remotes.c
+++ b/tests-clar/network/remotes.c
@@ -279,3 +279,23 @@ void test_network_remotes__cannot_load_with_an_empty_url(void)
cl_git_fail(git_remote_load(&remote, _repo, "empty-remote-url"));
cl_assert(giterr_last()->klass == GITERR_INVALID);
}
+
+void test_network_remotes__check_structure_version(void)
+{
+ git_transport transport = GIT_TRANSPORT_INIT;
+ const git_error *err;
+
+ git_remote_free(_remote);
+ cl_git_pass(git_remote_new(&_remote, _repo, NULL, "test-protocol://localhost", NULL));
+
+ transport.version = 0;
+ cl_git_fail(git_remote_set_transport(_remote, &transport));
+ err = giterr_last();
+ cl_assert_equal_i(GITERR_INVALID, err->klass);
+
+ giterr_clear();
+ transport.version = 1024;
+ cl_git_fail(git_remote_set_transport(_remote, &transport));
+ err = giterr_last();
+ cl_assert_equal_i(GITERR_INVALID, err->klass);
+}