mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-27 22:03:31 +01:00
Merge remote-tracking branch 'sysrqb/bug9950'
This commit is contained in:
commit
43f95e38ab
@ -392,7 +392,7 @@ config_assign_value(const config_format_t *fmt, void *options,
|
|||||||
"Interval in '%s %s' is malformed or out of bounds.",
|
"Interval in '%s %s' is malformed or out of bounds.",
|
||||||
c->key, c->value);
|
c->key, c->value);
|
||||||
SMARTLIST_FOREACH(csv_str, char *, cp, tor_free(cp));
|
SMARTLIST_FOREACH(csv_str, char *, cp, tor_free(cp));
|
||||||
smartlist_clear(csv_str);
|
smartlist_free(csv_str);
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
csv_int = tor_malloc_zero(sizeof(int));
|
csv_int = tor_malloc_zero(sizeof(int));
|
||||||
@ -401,7 +401,7 @@ config_assign_value(const config_format_t *fmt, void *options,
|
|||||||
}
|
}
|
||||||
SMARTLIST_FOREACH_END(str);
|
SMARTLIST_FOREACH_END(str);
|
||||||
SMARTLIST_FOREACH(csv_str, char *, cp, tor_free(cp));
|
SMARTLIST_FOREACH(csv_str, char *, cp, tor_free(cp));
|
||||||
smartlist_clear(csv_str);
|
smartlist_free(csv_str);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case CONFIG_TYPE_LINELIST:
|
case CONFIG_TYPE_LINELIST:
|
||||||
|
Loading…
Reference in New Issue
Block a user