summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-10-06 12:59:25 -0400
committerNick Mathewson <nickm@torproject.org>2011-10-06 14:13:09 -0400
commit2412e0e4024325608b551f74140e449d2016916f (patch)
tree0d0e79f3cb282aec7b0d5b95ea8fea84a27a745d
parent103c861dfead6640a4bef6e85f740f7c635c7343 (diff)
downloadtor-2412e0e4024325608b551f74140e449d2016916f.tar.gz
tor-2412e0e4024325608b551f74140e449d2016916f.zip
Check return of init_keys() ip_address_changed: fix Coverity CID 484
-rw-r--r--changes/cov4844
-rw-r--r--src/or/main.c3
2 files changed, 6 insertions, 1 deletions
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) {