path: root/pkt-line.c
diff options
authorJeff King <>2015-06-12 21:28:08 (GMT)
committerJunio C Hamano <>2015-06-15 20:25:50 (GMT)
commitf3612acb9302fc9332958b77c5ca5fc05cacb029 (patch)
treedfd082d1ac1b51b36480be866f30f805396debfc /pkt-line.c
parenta5fe66802f8c4036badd54ff36ff327d43236e7e (diff)
pkt-line: simplify starts_with checks in packet tracing
We carefully check that our pkt buffer has enough characters before seeing if it starts with "PACK". The intent is to avoid reading random memory if we get a short buffer like "PAC". However, we know that the traced packets are always NUL-terminated. They come from one of these sources: 1. A string literal. 2. `format_packet`, which uses a strbuf. 3. `packet_read`, which defensively NUL-terminates what we read. We can therefore drop the length checks, as we know we will hit the trailing NUL if we have a short input. Signed-off-by: Jeff King <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'pkt-line.c')
1 files changed, 1 insertions, 2 deletions
diff --git a/pkt-line.c b/pkt-line.c
index 187a229..0477d2e 100644
--- a/pkt-line.c
+++ b/pkt-line.c
@@ -24,8 +24,7 @@ static void packet_trace(const char *buf, unsigned int len, int write)
strbuf_addf(&out, "packet: %12s%c ",
packet_trace_prefix, write ? '>' : '<');
- if ((len >= 4 && starts_with(buf, "PACK")) ||
- (len >= 5 && starts_with(buf+1, "PACK"))) {
+ if (starts_with(buf, "PACK") || starts_with(buf + 1, "PACK")) {
strbuf_addstr(&out, "PACK ...");