r17621@catbus: nickm | 2008-01-14 14:03:29 -0500
Backport the parts of r13129 through r13133 that represent actual potential for bugs. svn:r13134
This commit is contained in:
parent
6d9816d9e9
commit
b7494ce8e9
|
@ -44,6 +44,7 @@ Changes in version 0.1.2.19 - 2008-01-??
|
||||||
- Run correctly on platforms (like some versions of OS X 10.5) where
|
- Run correctly on platforms (like some versions of OS X 10.5) where
|
||||||
the real limit for number of open files is OPEN_FILES, not
|
the real limit for number of open files is OPEN_FILES, not
|
||||||
rlim_max from getrlimit(RLIMIT_NOFILES).
|
rlim_max from getrlimit(RLIMIT_NOFILES).
|
||||||
|
- Avoid a spurious free on base64 failure.
|
||||||
|
|
||||||
|
|
||||||
Changes in version 0.1.2.18 - 2007-10-28
|
Changes in version 0.1.2.18 - 2007-10-28
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
!include "FileFunc.nsh"
|
!include "FileFunc.nsh"
|
||||||
!insertmacro GetParameters
|
!insertmacro GetParameters
|
||||||
|
|
||||||
!define VERSION "@VERSION@"
|
!define VERSION "0.1.2.18-dev"
|
||||||
!define INSTALLER "tor-${VERSION}-win32.exe"
|
!define INSTALLER "tor-${VERSION}-win32.exe"
|
||||||
!define WEBSITE "https://www.torproject.org/"
|
!define WEBSITE "https://www.torproject.org/"
|
||||||
!define LICENSE "LICENSE"
|
!define LICENSE "LICENSE"
|
||||||
|
|
|
@ -240,7 +240,6 @@ router_append_dirobj_signature(char *buf, size_t buf_len, const char *digest,
|
||||||
i = strlen(buf);
|
i = strlen(buf);
|
||||||
if (base64_encode(buf+i, buf_len-i, signature, 128) < 0) {
|
if (base64_encode(buf+i, buf_len-i, signature, 128) < 0) {
|
||||||
log_warn(LD_BUG,"couldn't base64-encode signature");
|
log_warn(LD_BUG,"couldn't base64-encode signature");
|
||||||
tor_free(buf);
|
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1282,6 +1281,7 @@ networkstatus_parse_from_string(const char *s)
|
||||||
if (!(tok = find_first_by_keyword(tokens, K_CLIENT_VERSIONS)) ||
|
if (!(tok = find_first_by_keyword(tokens, K_CLIENT_VERSIONS)) ||
|
||||||
tok->n_args<1) {
|
tok->n_args<1) {
|
||||||
log_warn(LD_DIR, "Missing client-versions");
|
log_warn(LD_DIR, "Missing client-versions");
|
||||||
|
goto err;
|
||||||
}
|
}
|
||||||
ns->client_versions = tok->args[0];
|
ns->client_versions = tok->args[0];
|
||||||
tok->args[0] = NULL;
|
tok->args[0] = NULL;
|
||||||
|
|
Loading…
Reference in New Issue