@matheusbsbs / matheus-bagliano / commits / eb30aed7c6
Fork 0

Removed memory leaks from interpolation table uses.

Clarified that parse_extra_args()s results in interpolation table entries. Removed a few trailing whitespace occurrences. Signed-off-by: Jon Loeliger <jdl@jdl.com> Signed-off-by: Junio C Hamano <junkio@cox.net>

Jon Loeliger committed Sep 27, 2006 at 11:16 UTC eb30aed7c69190fd648947d54bbb9ebe53c67715
3 files changed +61 -20
daemon.c
+32 -20
@@ -71,7 +71,7 @@ static struct interp interp_table[] = {
71 { "%IP", 0},
72 { "%P", 0},
73 { "%D", 0},
74 - { "%%", "%"},
74 + { "%%", 0},
75 };
76
77
@@ -405,7 +405,11 @@ static void make_service_overridable(const char *name, int ena) {
405 die("No such service %s", name);
406 }
407
408 -static void parse_extra_args(char *extra_args, int buflen)
408 +/*
409 + * Separate the "extra args" information as supplied by the client connection.
410 + * Any resulting data is squirrelled away in the given interpolation table.
411 + */
412 +static void parse_extra_args(struct interp *table, char *extra_args, int buflen)
413 {
414 char *val;
415 int vallen;
@@ -417,18 +421,17 @@ static void parse_extra_args(char *extra_args, int buflen)
421 val = extra_args + 5;
422 vallen = strlen(val) + 1;
423 if (*val) {
420 - char *port;
421 - char *save = xmalloc(vallen); /* FIXME: Leak */
422 -
423 - interp_table[INTERP_SLOT_HOST].value = save;
424 - strlcpy(save, val, vallen);
425 - port = strrchr(save, ':');
424 + /* Split <host>:<port> at colon. */
425 + char *host = val;
426 + char *port = strrchr(host, ':');
427 if (port) {
428 *port = 0;
429 port++;
429 - interp_table[INTERP_SLOT_PORT].value = port;
430 + interp_set_entry(table, INTERP_SLOT_PORT, port);
431 }
432 + interp_set_entry(table, INTERP_SLOT_HOST, host);
433 }
434 +
435 /* On to the next one */
436 extra_args = val + vallen;
437 }
@@ -438,8 +441,6 @@ static void parse_extra_args(char *extra_args, int buflen)
441 void fill_in_extra_table_entries(struct interp *itable)
442 {
443 char *hp;
441 - char *canon_host = NULL;
442 - char *ipaddr = NULL;
444
445 /*
446 * Replace literal host with lowercase-ized hostname.
@@ -466,10 +467,12 @@ void fill_in_extra_table_entries(struct interp *itable)
467 for (ai = ai0; ai; ai = ai->ai_next) {
468 struct sockaddr_in *sin_addr = (void *)ai->ai_addr;
469
469 - canon_host = xstrdup(ai->ai_canonname);
470 inet_ntop(AF_INET, &sin_addr->sin_addr,
471 addrbuf, sizeof(addrbuf));
472 - ipaddr = addrbuf;
472 + interp_set_entry(interp_table,
473 + INTERP_SLOT_CANON_HOST, ai->ai_canonname);
474 + interp_set_entry(interp_table,
475 + INTERP_SLOT_IP, addrbuf);
476 break;
477 }
478 freeaddrinfo(ai0);
@@ -483,7 +486,6 @@ void fill_in_extra_table_entries(struct interp *itable)
486 static char addrbuf[HOST_NAME_MAX + 1];
487
488 hent = gethostbyname(interp_table[INTERP_SLOT_HOST].value);
486 - canon_host = xstrdup(hent->h_name);
489
490 ap = hent->h_addr_list;
491 memset(&sa, 0, sizeof sa);
@@ -493,12 +495,11 @@ void fill_in_extra_table_entries(struct interp *itable)
495
496 inet_ntop(hent->h_addrtype, &sa.sin_addr,
497 addrbuf, sizeof(addrbuf));
496 - ipaddr = addrbuf;
498 +
499 + interp_set_entry(interp_table, INTERP_SLOT_CANON_HOST, hent->h_name);
500 + interp_set_entry(interp_table, INTERP_SLOT_IP, addrbuf);
501 }
502 #endif
499 -
500 - interp_table[INTERP_SLOT_CANON_HOST].value = canon_host; /* FIXME: Leak */
501 - interp_table[INTERP_SLOT_IP].value = xstrdup(ipaddr); /* FIXME: Leak */
503 }
504
505
@@ -542,8 +543,14 @@ static int execute(struct sockaddr *addr)
543 if (len && line[len-1] == '\n')
544 line[--len] = 0;
545
546 + /*
547 + * Initialize the path interpolation table for this connection.
548 + */
549 + interp_clear_table(interp_table, ARRAY_SIZE(interp_table));
550 + interp_set_entry(interp_table, INTERP_SLOT_PERCENT, "%");
551 +
552 if (len != pktlen) {
546 - parse_extra_args(line + len + 1, pktlen - len - 1);
553 + parse_extra_args(interp_table, line + len + 1, pktlen - len - 1);
554 fill_in_extra_table_entries(interp_table);
555 }
556
@@ -553,7 +560,12 @@ static int execute(struct sockaddr *addr)
560 if (!strncmp("git-", line, 4) &&
561 !strncmp(s->name, line + 4, namelen) &&
562 line[namelen + 4] == ' ') {
556 - interp_table[INTERP_SLOT_DIR].value = line+namelen+5;
563 + /*
564 + * Note: The directory here is probably context sensitive,
565 + * and might depend on the actual service being performed.
566 + */
567 + interp_set_entry(interp_table,
568 + INTERP_SLOT_DIR, line + namelen + 5);
569 return run_service(interp_table, s);
570 }
571 }
interpolate.c
+26
@@ -4,9 +4,35 @@
4
5 #include <string.h>
6
7 +#include "git-compat-util.h"
8 #include "interpolate.h"
9
10
11 +void interp_set_entry(struct interp *table, int slot, char *value)
12 +{
13 + char *oldval = table[slot].value;
14 + char *newval = value;
15 +
16 + if (oldval)
17 + free(oldval);
18 +
19 + if (value)
20 + newval = xstrdup(value);
21 +
22 + table[slot].value = newval;
23 +}
24 +
25 +
26 +void interp_clear_table(struct interp *table, int ninterps)
27 +{
28 + int i;
29 +
30 + for (i = 0; i < ninterps; i++) {
31 + interp_set_entry(table, i, NULL);
32 + }
33 +}
34 +
35 +
36 /*
37 * Convert a NUL-terminated string in buffer orig
38 * into the supplied buffer, result, whose length is reslen,
interpolate.h
+3
@@ -16,6 +16,9 @@ struct interp {
16 char *value;
17 };
18
19 +extern void interp_set_entry(struct interp *table, int slot, char *value);
20 +extern void interp_clear_table(struct interp *table, int ninterps);
21 +
22 extern int interpolate(char *result, int reslen,
23 const char *orig,
24 const struct interp *interps, int ninterps);