Commit fdc0c5f6 by Carlos Martín Nieto

pkt: bring back GIT_ESHORTBUFFER

The recent 64-bit Windows fixes changed the return code in
git_pkt_parse_line() so it wouldn't signal a short buffer, breaking
the network code. Bring it back.
parent 8af503bc
...@@ -188,10 +188,8 @@ int git_pkt_parse_line( ...@@ -188,10 +188,8 @@ int git_pkt_parse_line(
int32_t len; int32_t len;
/* Not even enough for the length */ /* Not even enough for the length */
if (bufflen > 0 && bufflen < PKT_LEN_SIZE) { if (bufflen > 0 && bufflen < PKT_LEN_SIZE)
giterr_set(GITERR_NET, "Insufficient buffer data"); return GIT_ESHORTBUFFER;
return -1;
}
len = parse_len(line); len = parse_len(line);
if (len < 0) { if (len < 0) {
...@@ -211,10 +209,8 @@ int git_pkt_parse_line( ...@@ -211,10 +209,8 @@ int git_pkt_parse_line(
* If we were given a buffer length, then make sure there is * If we were given a buffer length, then make sure there is
* enough in the buffer to satisfy this line * enough in the buffer to satisfy this line
*/ */
if (bufflen > 0 && bufflen < (size_t)len) { if (bufflen > 0 && bufflen < (size_t)len)
giterr_set(GITERR_NET, "Insufficient buffer data for packet length"); return GIT_ESHORTBUFFER;
return -1;
}
line += PKT_LEN_SIZE; line += PKT_LEN_SIZE;
/* /*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment