tor

commit 583ed7c6ecde0c95184586d581f2cb1ac78e8c39
parent 9014add25fd7bf4fa83e4409ab5d7b4416c872cc
Author: teor <teor@torproject.org>
Date:   Tue,  2 Apr 2019 11:46:42 +1000

Merge remote-tracking branch 'tor-github/pr/864'

Diffstat:
A
changes/bug29939
 | 
4
++++
M
src/test/test_routerkeys.c
 | 
8
++++----

2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/changes/bug29939 b/changes/bug29939
@@ -0,0 +1,4 @@
+  o Minor bugfixes (unit tests):
+    - In the "routerkeys/*" tests, check the return values of mkdir() for
+      possible failures. Fixes bug 29939; bugfix on 0.2.7.2-alpha. Found by
+      Coverity as CID 1444254.
diff --git a/src/test/test_routerkeys.c b/src/test/test_routerkeys.c
@@ -455,11 +455,11 @@ test_routerkeys_ed_keys_init_all(void *arg)
   options->TestingLinkKeySlop = 2*3600;
 
 #ifdef _WIN32
-  mkdir(dir);
-  mkdir(keydir);
+  tt_int_op(0, OP_EQ, mkdir(dir));
+  tt_int_op(0, OP_EQ, mkdir(keydir));
 #else
-  mkdir(dir, 0700);
-  mkdir(keydir, 0700);
+  tt_int_op(0, OP_EQ, mkdir(dir, 0700));
+  tt_int_op(0, OP_EQ, mkdir(keydir, 0700));
 #endif /* defined(_WIN32) */
 
   options->DataDirectory = dir;