Release binaries after creating writable copy

This commit is contained in:
Carlos Martín Nieto
2013-06-04 23:37:03 +02:00
parent 369a2e5151
commit 9f500e3fa0
3 changed files with 11 additions and 8 deletions

View File

@@ -61,6 +61,7 @@ geef_reference_lookup(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[])
error = git_reference_lookup(&ref, repo->repo, (char *)bin.data); error = git_reference_lookup(&ref, repo->repo, (char *)bin.data);
enif_release_binary(&bin);
if (error < 0) if (error < 0)
return geef_error(env); return geef_error(env);
@@ -140,6 +141,7 @@ geef_reference_glob(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[])
error = git_reference_foreach_glob(repo->repo, (char *) bin.data, append_to_list, &data); error = git_reference_foreach_glob(repo->repo, (char *) bin.data, append_to_list, &data);
enif_release_binary(&bin);
if (error < 0) if (error < 0)
return geef_error(env); return geef_error(env);
@@ -270,12 +272,9 @@ geef_reference_create(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[])
if (!enif_inspect_iolist_as_binary(env, argv[3], &target)) if (!enif_inspect_iolist_as_binary(env, argv[3], &target))
return enif_make_badarg(env); return enif_make_badarg(env);
/* Allocate the extra byte for the NUL terminator */ if (!geef_terminate_binary(&name))
if (!enif_realloc_binary(&name, name.size + 1))
return geef_oom(env); return geef_oom(env);
name.data[name.size-1] = '\0';
ref = enif_alloc_resource(geef_ref_type, sizeof(geef_ref)); ref = enif_alloc_resource(geef_ref_type, sizeof(geef_ref));
force = enif_is_identical(argv[4], atoms.true); force = enif_is_identical(argv[4], atoms.true);
@@ -285,17 +284,20 @@ geef_reference_create(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[])
const git_oid *oid = (const git_oid *) target.data; const git_oid *oid = (const git_oid *) target.data;
error = git_reference_create(&ref->ref, repo->repo, pname, oid, force); error = git_reference_create(&ref->ref, repo->repo, pname, oid, force);
} else if (enif_is_identical(argv[2], atoms.symbolic)) { } else if (enif_is_identical(argv[2], atoms.symbolic)) {
/* Allocate the extra byte for the NUL terminator */ if (!geef_terminate_binary(&target))
if (!enif_realloc_binary(&target, target.size + 1))
return geef_oom(env); return geef_oom(env);
target.data[target.size - 1] = '\0';
ptarget = (const char *) target.data; ptarget = (const char *) target.data;
error = git_reference_symbolic_create(&ref->ref, repo->repo, pname, ptarget, force); error = git_reference_symbolic_create(&ref->ref, repo->repo, pname, ptarget, force);
enif_release_binary(&target);
} else { } else {
enif_release_binary(&target);
enif_release_binary(&name);
return enif_make_badarg(env); return enif_make_badarg(env);
} }
enif_release_binary(&name);
if (error < 0) if (error < 0)
return geef_error(env); return geef_error(env);

View File

@@ -92,6 +92,7 @@ geef_repository_discover(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[])
} }
if (error < 0) { if (error < 0) {
enif_release_binary(&path);
return geef_error(env); return geef_error(env);
} }

View File

@@ -40,7 +40,6 @@ static ERL_NIF_TERM tree_entry_to_term(ErlNifEnv *env, const git_tree_entry *ent
ERL_NIF_TERM ERL_NIF_TERM
geef_tree_bypath(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]) geef_tree_bypath(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[])
{ {
int error;
geef_object *obj; geef_object *obj;
ErlNifBinary bin; ErlNifBinary bin;
git_tree_entry *entry; git_tree_entry *entry;
@@ -57,5 +56,6 @@ geef_tree_bypath(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[])
if (git_tree_entry_bypath(&entry, (git_tree *)obj->obj, (char *) bin.data) < 0) if (git_tree_entry_bypath(&entry, (git_tree *)obj->obj, (char *) bin.data) < 0)
return geef_error(env); return geef_error(env);
enif_release_binary(&bin);
return tree_entry_to_term(env, entry); return tree_entry_to_term(env, entry);
} }