url: decode buffers that are not NUL-terminated
The url_decode function needs only minor tweaks to handle arbitrary buffers. Let's do those tweaks, which cleans up an unreadable mess of temporary strings in http.c. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King committed
Jul 18, 2011 at 03:48 UTC
66c8448543432308e8fce5e3e04076e875410f67
3 files changed
+23
-31
http.c
+4
-23
@@ -307,8 +307,7 @@ static CURL *get_curl_handle(void)
307
308
static void http_auth_init(const char *url)
309
{
310
- char *at, *colon, *cp, *slash, *decoded;
311
- int len;
310
+ char *at, *colon, *cp, *slash;
311
312
cp = strstr(url, "://");
313
if (!cp)
@@ -328,29 +327,11 @@ static void http_auth_init(const char *url)
327
return; /* No credentials */
328
if (!colon || at <= colon) {
329
/* Only username */
331
- len = at - cp;
332
- user_name = xmalloc(len + 1);
333
- memcpy(user_name, cp, len);
334
- user_name[len] = '\0';
335
- decoded = url_decode(user_name);
336
- free(user_name);
337
- user_name = decoded;
330
+ user_name = url_decode_mem(cp, at - cp);
331
user_pass = NULL;
332
} else {
340
- len = colon - cp;
341
- user_name = xmalloc(len + 1);
342
- memcpy(user_name, cp, len);
343
- user_name[len] = '\0';
344
- decoded = url_decode(user_name);
345
- free(user_name);
346
- user_name = decoded;
347
- len = at - (colon + 1);
348
- user_pass = xmalloc(len + 1);
349
- memcpy(user_pass, colon + 1, len);
350
- user_pass[len] = '\0';
351
- decoded = url_decode(user_pass);
352
- free(user_pass);
353
- user_pass = decoded;
333
+ user_name = url_decode_mem(cp, colon - cp);
334
+ user_pass = url_decode_mem(colon + 1, at - (colon + 1));
335
}
336
}
337
url.c
+18
-8
@@ -68,18 +68,20 @@ static int url_decode_char(const char *q)
68
return val;
69
}
70
71
-static char *url_decode_internal(const char **query, const char *stop_at,
72
- struct strbuf *out, int decode_plus)
71
+static char *url_decode_internal(const char **query, int len,
72
+ const char *stop_at, struct strbuf *out,
73
+ int decode_plus)
74
{
75
const char *q = *query;
76
76
- do {
77
+ while (len) {
78
unsigned char c = *q;
79
80
if (!c)
81
break;
82
if (stop_at && strchr(stop_at, c)) {
83
q++;
84
+ len--;
85
break;
86
}
87
@@ -88,6 +90,7 @@ static char *url_decode_internal(const char **query, const char *stop_at,
90
if (0 <= val) {
91
strbuf_addch(out, val);
92
q += 3;
93
+ len -= 3;
94
continue;
95
}
96
}
@@ -97,34 +100,41 @@ static char *url_decode_internal(const char **query, const char *stop_at,
100
else
101
strbuf_addch(out, c);
102
q++;
100
- } while (1);
103
+ len--;
104
+ }
105
*query = q;
106
return strbuf_detach(out, NULL);
107
}
108
109
char *url_decode(const char *url)
110
+{
111
+ return url_decode_mem(url, strlen(url));
112
+}
113
+
114
+char *url_decode_mem(const char *url, int len)
115
{
116
struct strbuf out = STRBUF_INIT;
108
- const char *colon = strchr(url, ':');
117
+ const char *colon = memchr(url, ':', len);
118
119
/* Skip protocol part if present */
120
if (colon && url < colon) {
121
strbuf_add(&out, url, colon - url);
122
+ len -= colon - url;
123
url = colon;
124
}
115
- return url_decode_internal(&url, NULL, &out, 0);
125
+ return url_decode_internal(&url, len, NULL, &out, 0);
126
}
127
128
char *url_decode_parameter_name(const char **query)
129
{
130
struct strbuf out = STRBUF_INIT;
121
- return url_decode_internal(query, "&=", &out, 1);
131
+ return url_decode_internal(query, -1, "&=", &out, 1);
132
}
133
134
char *url_decode_parameter_value(const char **query)
135
{
136
struct strbuf out = STRBUF_INIT;
127
- return url_decode_internal(query, "&", &out, 1);
137
+ return url_decode_internal(query, -1, "&", &out, 1);
138
}
139
140
void end_url_with_slash(struct strbuf *buf, const char *url)
url.h
+1
@@ -4,6 +4,7 @@
4
extern int is_url(const char *url);
5
extern int is_urlschemechar(int first_flag, int ch);
6
extern char *url_decode(const char *url);
7
+extern char *url_decode_mem(const char *url, int len);
8
extern char *url_decode_parameter_name(const char **query);
9
extern char *url_decode_parameter_value(const char **query);
10