commit 5224cd1188b67bf768cbcfcf69ddc1e91147b386b38a031793919a6dc18ccb8f from: Stefan Sperling date: Sat Aug 22 14:19:03 2026 UTC do not leak a duplicate tree entry on error in write_tree() commit - 3a30f50101b878720ed20050320b1343d9e4f99192158e20e0275c9ddab8cc65 commit + 5224cd1188b67bf768cbcfcf69ddc1e91147b386b38a031793919a6dc18ccb8f blob - 2e14c99cac6aec1e12cdb49383de9752bd5cca1846eb67c16ffbe980ecdf0a8b blob + c149df7c32c65e6297bc13b201475de51b8f69af2ff12808f4d9f5c89af95da6 --- lib/worktree.c +++ lib/worktree.c @@ -6321,6 +6321,7 @@ write_tree(struct got_object_id **new_tree_id, int *ne err = insert_tree_entry(new_te, &paths); if (err) goto done; + new_te = NULL; (*nentries)++; } else { *slash = '\0'; /* trim trailing path components */ @@ -6336,6 +6337,7 @@ write_tree(struct got_object_id **new_tree_id, int *ne err = insert_tree_entry(new_te, &paths); if (err) goto done; + new_te = NULL; (*nentries)++; } } @@ -6363,6 +6365,7 @@ write_tree(struct got_object_id **new_tree_id, int *ne err = insert_tree_entry(new_te, &paths); if (err) goto done; + new_te = NULL; (*nentries)++; continue; } @@ -6398,6 +6401,7 @@ write_tree(struct got_object_id **new_tree_id, int *ne err = insert_tree_entry(new_te, &paths); if (err) goto done; + new_te = NULL; (*nentries)++; continue; } @@ -6419,6 +6423,7 @@ write_tree(struct got_object_id **new_tree_id, int *ne err = insert_tree_entry(new_te, &paths); if (err) goto done; + new_te = NULL; (*nentries)++; } err = report_ct_status(ct, status_cb, @@ -6433,6 +6438,7 @@ write_tree(struct got_object_id **new_tree_id, int *ne err = insert_tree_entry(new_te, &paths); if (err) goto done; + new_te = NULL; (*nentries)++; } } @@ -6441,6 +6447,7 @@ write_tree(struct got_object_id **new_tree_id, int *ne /* Write new list of entries; deleted entries have been dropped. */ err = got_object_tree_create(new_tree_id, &paths, *nentries, repo); done: + free(new_te); got_pathlist_free(&paths, GOT_PATHLIST_FREE_DATA); return err; }