[or-cvs] r13134: Backport the parts of r13129 through r13133 that represent a (in tor/branches/tor-0_1_2-patches: . contrib src/or)

[nickm at seul.org]

Author: nickm
Date: 2008-01-14 14:03:33 -0500 (Mon, 14 Jan 2008)
New Revision: 13134

Modified:
   tor/branches/tor-0_1_2-patches/
   tor/branches/tor-0_1_2-patches/ChangeLog
   tor/branches/tor-0_1_2-patches/contrib/tor-mingw.nsi.in
   tor/branches/tor-0_1_2-patches/src/or/routerparse.c
Log:
 r17621 at catbus:  nickm | 2008-01-14 14:03:29 -0500
 Backport the parts of r13129 through r13133 that represent actual potential for bugs.



Property changes on: tor/branches/tor-0_1_2-patches
___________________________________________________________________
 svk:merge ticket from /tor/012 [r17621] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/branches/tor-0_1_2-patches/ChangeLog
===================================================================
--- tor/branches/tor-0_1_2-patches/ChangeLog	2008-01-14 19:00:33 UTC (rev 13133)
+++ tor/branches/tor-0_1_2-patches/ChangeLog	2008-01-14 19:03:33 UTC (rev 13134)
@@ -44,6 +44,7 @@
     - 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
       rlim_max from getrlimit(RLIMIT_NOFILES).
+    - Avoid a spurious free on base64 failure.
 
 
 Changes in version 0.1.2.18 - 2007-10-28

Modified: tor/branches/tor-0_1_2-patches/contrib/tor-mingw.nsi.in
===================================================================
--- tor/branches/tor-0_1_2-patches/contrib/tor-mingw.nsi.in	2008-01-14 19:00:33 UTC (rev 13133)
+++ tor/branches/tor-0_1_2-patches/contrib/tor-mingw.nsi.in	2008-01-14 19:03:33 UTC (rev 13134)
@@ -9,7 +9,7 @@
 !include "FileFunc.nsh"
 !insertmacro GetParameters
   
-!define VERSION "@VERSION@"
+!define VERSION "0.1.2.18-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/"
 !define LICENSE "LICENSE"

Modified: tor/branches/tor-0_1_2-patches/src/or/routerparse.c
===================================================================
--- tor/branches/tor-0_1_2-patches/src/or/routerparse.c	2008-01-14 19:00:33 UTC (rev 13133)
+++ tor/branches/tor-0_1_2-patches/src/or/routerparse.c	2008-01-14 19:03:33 UTC (rev 13134)
@@ -240,7 +240,6 @@
   i = strlen(buf);
   if (base64_encode(buf+i, buf_len-i, signature, 128) < 0) {
     log_warn(LD_BUG,"couldn't base64-encode signature");
-    tor_free(buf);
     return -1;
   }
 
@@ -1282,6 +1281,7 @@
     if (!(tok = find_first_by_keyword(tokens, K_CLIENT_VERSIONS)) ||
         tok->n_args<1) {
       log_warn(LD_DIR, "Missing client-versions");
+      goto err;
     }
     ns->client_versions = tok->args[0];
     tok->args[0] = NULL;