summaryrefslogtreecommitdiffabout
authorLukas Fleischer <cgit@cryptocrack.de>2011-03-30 23:21:39 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2011-05-23 20:58:35 (UTC)
commit070e109c1413d28b54eb6123a9fd24ac98897554 (patch) (unidiff)
tree70f10262cdbc29cb9d083d24c03b1524a3d90ecd
parentc9059710e7a1dbd47c22c412e0ba8f591105e3cf (diff)
downloadcgit-070e109c1413d28b54eb6123a9fd24ac98897554.zip
cgit-070e109c1413d28b54eb6123a9fd24ac98897554.tar.gz
cgit-070e109c1413d28b54eb6123a9fd24ac98897554.tar.bz2
Fix memory leak in http_parse_querystring().
Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--html.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/html.c b/html.c
index 6f31097..a0f6db4 100644
--- a/html.c
+++ b/html.c
@@ -281,42 +281,43 @@ char *convert_query_hexchar(char *txt)
281 if (d1<0 || d2<0) { 281 if (d1<0 || d2<0) {
282 memmove(txt, txt+3, n-2); 282 memmove(txt, txt+3, n-2);
283 return txt-1; 283 return txt-1;
284 } else { 284 } else {
285 *txt = d1 * 16 + d2; 285 *txt = d1 * 16 + d2;
286 memmove(txt+1, txt+3, n-2); 286 memmove(txt+1, txt+3, n-2);
287 return txt; 287 return txt;
288 } 288 }
289} 289}
290 290
291int http_parse_querystring(const char *txt_, void (*fn)(const char *name, const char *value)) 291int http_parse_querystring(const char *txt_, void (*fn)(const char *name, const char *value))
292{ 292{
293 char *t, *txt, *value = NULL, c; 293 char *o, *t, *txt, *value = NULL, c;
294 294
295 if (!txt_) 295 if (!txt_)
296 return 0; 296 return 0;
297 297
298 t = txt = strdup(txt_); 298 o = t = txt = strdup(txt_);
299 if (t == NULL) { 299 if (t == NULL) {
300 printf("Out of memory\n"); 300 printf("Out of memory\n");
301 exit(1); 301 exit(1);
302 } 302 }
303 while((c=*t) != '\0') { 303 while((c=*t) != '\0') {
304 if (c=='=') { 304 if (c=='=') {
305 *t = '\0'; 305 *t = '\0';
306 value = t+1; 306 value = t+1;
307 } else if (c=='+') { 307 } else if (c=='+') {
308 *t = ' '; 308 *t = ' ';
309 } else if (c=='%') { 309 } else if (c=='%') {
310 t = convert_query_hexchar(t); 310 t = convert_query_hexchar(t);
311 } else if (c=='&') { 311 } else if (c=='&') {
312 *t = '\0'; 312 *t = '\0';
313 (*fn)(txt, value); 313 (*fn)(txt, value);
314 txt = t+1; 314 txt = t+1;
315 value = NULL; 315 value = NULL;
316 } 316 }
317 t++; 317 t++;
318 } 318 }
319 if (t!=txt) 319 if (t!=txt)
320 (*fn)(txt, value); 320 (*fn)(txt, value);
321 free(o);
321 return 0; 322 return 0;
322} 323}