Commit 1d94a7d0f6c8cb0d1fcf288a1734a7a5abd1b094
2012-06-20T02:15:42
diff: make sure we free all allocated resources When the creation of one iterator fails, we need to free the prefix and possibly one of the iterators. Make sure we do so.
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
diff --git a/src/diff.c b/src/diff.c
index bc8708e..4fea894 100644
--- a/src/diff.c
+++ b/src/diff.c
@@ -704,12 +704,17 @@ int git_diff_index_to_tree(
assert(repo && diff);
if (git_iterator_for_tree_range(&a, repo, old_tree, prefix, prefix) < 0 ||
- git_iterator_for_index_range(&b, repo, prefix, prefix) < 0)
- return -1;
+ git_iterator_for_index_range(&b, repo, prefix, prefix) < 0)
+ goto on_error;
git__free(prefix);
return diff_from_iterators(repo, opts, a, b, diff);
+
+on_error:
+ git__free(prefix);
+ git_iterator_free(a);
+ return -1;
}
int git_diff_workdir_to_index(
@@ -723,12 +728,17 @@ int git_diff_workdir_to_index(
assert(repo && diff);
if (git_iterator_for_index_range(&a, repo, prefix, prefix) < 0 ||
- git_iterator_for_workdir_range(&b, repo, prefix, prefix) < 0)
- return -1;
+ git_iterator_for_workdir_range(&b, repo, prefix, prefix) < 0)
+ goto on_error;
git__free(prefix);
return diff_from_iterators(repo, opts, a, b, diff);
+
+on_error:
+ git__free(prefix);
+ git_iterator_free(a);
+ return -1;
}
@@ -744,12 +754,17 @@ int git_diff_workdir_to_tree(
assert(repo && old_tree && diff);
if (git_iterator_for_tree_range(&a, repo, old_tree, prefix, prefix) < 0 ||
- git_iterator_for_workdir_range(&b, repo, prefix, prefix) < 0)
- return -1;
+ git_iterator_for_workdir_range(&b, repo, prefix, prefix) < 0)
+ goto on_error;
git__free(prefix);
return diff_from_iterators(repo, opts, a, b, diff);
+
+on_error:
+ git__free(prefix);
+ git_iterator_free(a);
+ return -1;
}
int git_diff_merge(