diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-07-29 22:38:17 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-07-29 22:38:17 +0300 |
| commit | c5d81d7f5938909544e86d503d2c7cbc2f600e2f (patch) | |
| tree | 9339e5e47ea9ec5b3d5cbec14443c0c783022d1c | |
| parent | 17952bd1bf4d758c5431eafe06059193c3977881 (diff) | |
| parent | 64c45dc72ef039215f23d1b8f077dd6f9f254d38 (diff) | |
Merge branch 'sr/gpg-interface-stop-at-the-end' into maint
A codepath that reads from GPG for signed object verification read
past the end of allocated buffer, which has been fixed.
* sr/gpg-interface-stop-at-the-end:
gpg-interface: do not scan past the end of buffer
| -rw-r--r-- | gpg-interface.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/gpg-interface.c b/gpg-interface.c index 8ed274533f..d60115ca40 100644 --- a/gpg-interface.c +++ b/gpg-interface.c @@ -116,6 +116,9 @@ static void parse_gpg_output(struct signature_check *sigc) for (line = buf; *line; line = strchrnul(line+1, '\n')) { while (*line == '\n') line++; + if (!*line) + break; + /* Skip lines that don't start with GNUPG status */ if (!skip_prefix(line, "[GNUPG:] ", &line)) continue; |