mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'cb/plug-leaks-in-alloca-emu-users'

Browse Source 
Leakfix.

* cb/plug-leaks-in-alloca-emu-users:
  t0000: avoid masking git exit value through pipes
  tree-diff: fix leak when not HAVE_ALLOCA_H
This commit is contained in:
Junio C Hamano
2021-09-23 13:44:49 -07:00
parent f7511fdfbd 66c0c44df6
commit 50eb005eb3
2 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
t/t0000-basic.sh
View File

@ -1271,28 +1271,29 @@ P=$(test_oid root)
test_expect_success 'git commit-tree records the correct tree in a commit' ' test_expect_success 'git commit-tree records the correct tree in a commit' '
commit0=$(echo NO | git commit-tree $P) && commit0=$(echo NO | git commit-tree $P) &&
tree=$(git show --pretty=raw $commit0 | git show --pretty=raw $commit0 >out &&
sed -n -e "s/^tree //p" -e "/^author /q") && tree=$(sed -n -e "s/^tree //p" -e "/^author /q" out) &&
test "z$tree" = "z$P" test "z$tree" = "z$P"
' '
test_expect_success 'git commit-tree records the correct parent in a commit' ' test_expect_success 'git commit-tree records the correct parent in a commit' '
commit1=$(echo NO | git commit-tree $P -p $commit0) && commit1=$(echo NO | git commit-tree $P -p $commit0) &&
parent=$(git show --pretty=raw $commit1 | git show --pretty=raw $commit1 >out &&
sed -n -e "s/^parent //p" -e "/^author /q") && parent=$(sed -n -e "s/^parent //p" -e "/^author /q" out) &&
test "z$commit0" = "z$parent" test "z$commit0" = "z$parent"
' '
test_expect_success 'git commit-tree omits duplicated parent in a commit' ' test_expect_success 'git commit-tree omits duplicated parent in a commit' '
commit2=$(echo NO | git commit-tree $P -p $commit0 -p $commit0) && commit2=$(echo NO | git commit-tree $P -p $commit0 -p $commit0) &&
parent=$(git show --pretty=raw $commit2 | git show --pretty=raw $commit2 >out &&
sed -n -e "s/^parent //p" -e "/^author /q" | cat >match.sed <<-\EOF &&
sort -u) && s/^parent //p
/^author /q
EOF
parent=$(sed -n -f match.sed out | sort -u) &&
test "z$commit0" = "z$parent" && test "z$commit0" = "z$parent" &&
numparent=$(git show --pretty=raw $commit2 | git show --pretty=raw $commit2 >out &&
sed -n -e "s/^parent //p" -e "/^author /q" | test_stdout_line_count = 1 sed -n -f match.sed out
wc -l) &&
test $numparent = 1
' '
test_expect_success 'update-index D/F conflict' ' test_expect_success 'update-index D/F conflict' '

4
tree-diff.c
View File

@ -21,7 +21,9 @@
ALLOC_ARRAY((x), nr); \ ALLOC_ARRAY((x), nr); \
} while(0) } while(0)
#define FAST_ARRAY_FREE(x, nr) do { \ #define FAST_ARRAY_FREE(x, nr) do { \
if ((nr) > 2) \ if ((nr) <= 2) \
xalloca_free((x)); \
else \
free((x)); \ free((x)); \
} while(0) } while(0)