summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Steinhardt <ps@pks.im>2016-11-15 11:44:51 +0100
committerEdward Thomson <ethomson@github.com>2017-01-09 14:06:13 -0500
commit921e3a68e26ad23d9c5b389fdc61c9591bdc4cff (patch)
treec35e2ad59af10dd6d12ee55721e1e695a3070bcc
parentccee8cabc3fd187046bbfccb407de95dafc310f6 (diff)
downloadlibgit2-bindings/libgit2sharp/022_1.tar.gz
smart_pkt: treat empty packet lines as errorbindings/libgit2sharp/022_1
The Git protocol does not specify what should happen in the case of an empty packet line (that is a packet line "0004"). We currently indicate success, but do not return a packet in the case where we hit an empty line. The smart protocol was not prepared to handle such packets in all cases, though, resulting in a `NULL` pointer dereference. Fix the issue by returning an error instead. As such kind of packets is not even specified by upstream, this is the right thing to do.
-rw-r--r--src/transports/smart_pkt.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/transports/smart_pkt.c b/src/transports/smart_pkt.c
index b1eee3e3b..e05196cd8 100644
--- a/src/transports/smart_pkt.c
+++ b/src/transports/smart_pkt.c
@@ -437,12 +437,13 @@ int git_pkt_parse_line(
line += PKT_LEN_SIZE;
/*
- * TODO: How do we deal with empty lines? Try again? with the next
- * line?
+ * The Git protocol does not specify empty lines as part
+ * 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) {
- *out = line;
- return 0;
+ giterr_set_str(GITERR_NET, "Invalid empty packet");
+ return GIT_ERROR;
}
if (len == 0) { /* Flush pkt */