kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

sequencer: assign only free()able strings to gpg_sign 

The gpg_sign member of the replay_opts structure is of type `char *`,
meaning that the sequencer deems the string to which gpg_sign points to
be under its custody, i.e. it needs to be free()d by the sequencer.

Therefore, let's only assign malloc()ed buffers to it.

Reported-by: Kaartic Sivaraam <kaartic.sivaraam@gmail.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Johannes Schindelin 2017-12-22 12:50:50 +01:00 committed by Junio C Hamano
parent 28d6daed4f
commit ed1e52822e
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sequencer.c
View File

@ -160,7 +160,7 @@ static int git_sequencer_config(const char *k, const char *v, void *cb)
} }


if (!strcmp(k, "commit.gpgsign")) { if (!strcmp(k, "commit.gpgsign")) {
opts->gpg_sign = git_config_bool(k, v) ? "" : NULL; opts->gpg_sign = git_config_bool(k, v) ? xstrdup("") : NULL;
return 0; return 0;
} }



10
t/t3404-rebase-interactive.sh
View File

@ -1318,6 +1318,16 @@ test_expect_success 'editor saves as CR/LF' '


SQ="'" SQ="'"
test_expect_success 'rebase -i --gpg-sign=<key-id>' ' test_expect_success 'rebase -i --gpg-sign=<key-id>' '
test_when_finished "test_might_fail git rebase --abort" &&
set_fake_editor &&
FAKE_LINES="edit 1" git rebase -i --gpg-sign="\"S I Gner\"" HEAD^ \
>out 2>err &&
test_i18ngrep "$SQ-S\"S I Gner\"$SQ" err
'

test_expect_success 'rebase -i --gpg-sign=<key-id> overrides commit.gpgSign' '
test_when_finished "test_might_fail git rebase --abort" &&
test_config commit.gpgsign true &&
set_fake_editor && set_fake_editor &&
FAKE_LINES="edit 1" git rebase -i --gpg-sign="\"S I Gner\"" HEAD^ \ FAKE_LINES="edit 1" git rebase -i --gpg-sign="\"S I Gner\"" HEAD^ \
>out 2>err && >out 2>err &&