Merge branch 'jd/fix-strbuf-add-urlencode-bytes'

gitster · gitster · commit a741e2825b3a · 2018-01-05T13:28:10.000-08:00
Bytes with high-bit set were encoded incorrectly and made
credential helper fail.

* jd/fix-strbuf-add-urlencode-bytes:
  strbuf: fix urlencode format string on signed char
diff --git a/strbuf.c b/strbuf.c
@@ -683,7 +683,7 @@ static void strbuf_add_urlencode(struct strbuf *sb, const char *s, size_t len,
 		    (!reserved && is_rfc3986_reserved(ch)))
 			strbuf_addch(sb, ch);
 		else
-			strbuf_addf(sb, "%%%02x", ch);
+			strbuf_addf(sb, "%%%02x", (unsigned char)ch);
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -683,7 +683,7 @@ static void strbuf_add_urlencode(struct strbuf sb, const char s, size_t len,`
`683`	`683`	`(!reserved && is_rfc3986_reserved(ch)))`
`684`	`684`	`strbuf_addch(sb, ch);`
`685`	`685`	`else`
`686`		`- strbuf_addf(sb, "%%%02x", ch);`
	`686`	`+ strbuf_addf(sb, "%%%02x", (unsigned char)ch);`
`687`	`687`	`}`
`688`	`688`	`}`
`689`	`689`