proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-08 22:08:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '25_smartpktparse' into maint/v0.25

Browse Source
This commit is contained in:
Edward Thomson 2017-01-06 17:12:16 +00:00
commit 6850b516b9
2 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/transports/smart_pkt.c
View File

@ -427,15 +427,23 @@ int git_pkt_parse_line(
if (bufflen > 0 && bufflen < (size_t)len) if (bufflen > 0 && bufflen < (size_t)len)
return GIT_EBUFS; return GIT_EBUFS;
/*
* The length has to be exactly 0 in case of a flush
* packet or greater than PKT_LEN_SIZE, as the decoded
* length includes its own encoded length of four bytes.
*/
if (len != 0 && len < PKT_LEN_SIZE)
return GIT_ERROR;
line += PKT_LEN_SIZE; line += PKT_LEN_SIZE;
/* /*
* TODO: How do we deal with empty lines? Try again? with the next * The Git protocol does not specify empty lines as part
* line? * of the protocol. Not knowing what to do with an empty
* line, we should return an error upon hitting one.
*/ */
if (len == PKT_LEN_SIZE) { if (len == PKT_LEN_SIZE) {
*head = NULL; giterr_set_str(GITERR_NET, "Invalid empty packet");
*out = line; return GIT_ERROR;
return 0;
} }
if (len == 0) { /* Flush pkt */ if (len == 0) { /* Flush pkt */

11
src/transports/smart_protocol.c
View File

@ -763,14 +763,6 @@ static int add_push_report_sideband_pkt(git_push *push, git_pkt_data *data_pkt,
line_len -= (line_end - line); line_len -= (line_end - line);
line = line_end; line = line_end;
/* When a valid packet with no content has been
* read, git_pkt_parse_line does not report an
* error, but the pkt pointer has not been set.
* Handle this by skipping over empty packets.
*/
if (pkt == NULL)
continue;
error = add_push_report_pkt(push, pkt); error = add_push_report_pkt(push, pkt);
git_pkt_free(pkt); git_pkt_free(pkt);
@ -825,9 +817,6 @@ static int parse_report(transport_smart *transport, git_push *push)
error = 0; error = 0;
if (pkt == NULL)
continue;
switch (pkt->type) { switch (pkt->type) {
case GIT_PKT_DATA: case GIT_PKT_DATA:
/* This is a sideband packet which contains other packets */ /* This is a sideband packet which contains other packets */