From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 6 Oct 2011 16:59:25 +0000 (-0400)
Subject: Check return of init_keys() ip_address_changed: fix Coverity CID 484
X-Git-Tag: tor-0.2.2.34~8^2^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2412e0e4024325608b551f74140e449d2016916f;p=thirdparty%2Ftor.git

Check return of init_keys() ip_address_changed: fix Coverity CID 484
---

diff --git a/changes/cov484 b/changes/cov484
new file mode 100644
index 0000000000..33adbda18c
--- /dev/null
+++ b/changes/cov484
@@ -0,0 +1,4 @@
+  o Minor bugfixes:
+    - Report any failure in init_keys() calls done because our IP address
+      has changed. Spotted by Coverity Scan. Bugfix on 0.1.1.4-alpha;
+      fixes CID 484.
diff --git a/src/or/main.c b/src/or/main.c
index 289d805503..c011c9b46e 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -1378,7 +1378,8 @@ ip_address_changed(int at_interface)
   if (at_interface) {
     if (! server) {
       /* Okay, change our keys. */
-      init_keys();
+      if (init_keys()<0)
+        log_warn(LD_GENERAL, "Unable to rotate keys after IP change!");
     }
   } else {
     if (server) {