Commit 83c8b3b81dddacaeb4db8081fdcfd68c514f4276
2019-06-29T22:40:42
plug leaks in got_repo_match_object_id_prefix()
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
diff --git a/lib/repository.c b/lib/repository.c
index 9211257..4bb4b6a 100644
--- a/lib/repository.c
+++ b/lib/repository.c
@@ -1045,29 +1045,35 @@ got_repo_match_object_id_prefix(struct got_object_id **id,
if (len >= 2) {
err = match_packed_object(id, repo, id_str_prefix);
if (err)
- return err;
+ goto done;
object_dir = strndup(id_str_prefix, 2);
- if (object_dir == NULL)
- return got_error_from_errno("strdup");
+ if (object_dir == NULL) {
+ err = got_error_from_errno("strdup");
+ goto done;
+ }
err = match_loose_object(id, path_objects, object_dir,
id_str_prefix, repo);
} else if (len == 1) {
int i;
for (i = 0; i < 0xf; i++) {
if (asprintf(&object_dir, "%s%.1x", id_str_prefix, i)
- == -1)
- return got_error_from_errno("asprintf");
+ == -1) {
+ err = got_error_from_errno("asprintf");
+ goto done;
+ }
err = match_packed_object(id, repo, object_dir);
if (err)
- return err;
+ goto done;
err = match_loose_object(id, path_objects, object_dir,
id_str_prefix, repo);
if (err)
- break;
+ goto done;
}
- } else
- return got_error(GOT_ERR_BAD_OBJ_ID_STR);
-
+ } else {
+ err = got_error(GOT_ERR_BAD_OBJ_ID_STR);
+ goto done;
+ }
+done:
free(object_dir);
if (err) {
free(*id);