- tor-commits - lists.torproject.org

[tor/maint-0.4.0] Merge branch 'maint-0.3.4' into maint-0.3.5
by teor＠torproject.org 02 Apr '19

02 Apr '19

commit 0418d4081acd2708a16dd757af4aac4777658da9 Merge: 3280e9a11 74775b2df Author: teor <teor(a)torproject.org> Date: Tue Apr 2 11:45:22 2019 +1000 Merge branch 'maint-0.3.4' into maint-0.3.5 changes/bug29703 | 4 ++++ 1 file changed, 4 insertions(+)

1 0

[tor/master] bug_occurred: a place where we assumed that "buf" was still a buffer
by teor＠torproject.org 02 Apr '19

02 Apr '19

commit 809a3a748d5f0cbaa0357ec63388ed291fb7b0bd Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Mar 30 21:07:15 2019 -0400 bug_occurred: a place where we assumed that "buf" was still a buffer In 9c132a5f9e87a2cd0f we replaced "buf" with a pointer and replaced one instance of snprintf with asprintf -- but there was still one snprintf left over, being crashy. Fixes bug 29967; bug not in any released Tor. This is CID 1444262. --- src/lib/log/util_bug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/log/util_bug.c b/src/lib/log/util_bug.c index b9dc296fc..65ab7bc9c 100644 --- a/src/lib/log/util_bug.c +++ b/src/lib/log/util_bug.c @@ -117,7 +117,7 @@ tor_bug_occurred_(const char *fname, unsigned int line, } log_warn(LD_BUG, "%s:%u: %s: This line should not have been reached.%s", fname, line, func, once_str); - tor_snprintf(buf, sizeof(buf), + tor_asprintf(&buf, "Line unexpectedly reached at %s at %s:%u", func, fname, line); } else {

1 0

[tor/master] test_routerkeys.c: Always check mkdir() return value
by teor＠torproject.org 02 Apr '19

02 Apr '19

commit a7bc47532b1e3d7db89fe9fe4521306fd6170617 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 28 09:29:00 2019 -0400 test_routerkeys.c: Always check mkdir() return value After this fix, we have no more unchecked mkdir() calls. Bug 29939; CID 144254. Bugfix on 0.2.7.2-alpha. --- changes/bug29939 | 4 ++++ src/test/test_routerkeys.c | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/changes/bug29939 b/changes/bug29939 new file mode 100644 index 000000000..0e9b46c07 --- /dev/null +++ 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 index 727fa5660..102d9334a 100644 --- 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;

1 0

[tor/maint-0.4.0] Merge branch 'maint-0.3.5' into maint-0.4.0
by teor＠torproject.org 02 Apr '19

02 Apr '19

commit 9242f32883e2eff53ddc8217255168e91c6e3e7f Merge: 6d188fb4c 0418d4081 Author: teor <teor(a)torproject.org> Date: Tue Apr 2 11:45:31 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/bug29703 | 4 ++++ 1 file changed, 4 insertions(+)

1 0

[tor/master] Merge branch 'maint-0.2.9' into maint-0.3.4
by teor＠torproject.org 02 Apr '19

02 Apr '19

commit 74775b2dfd1a30abf75f2989195ec6c1bbe95fc0 Merge: 6d057c56f f7688cb17 Author: teor <teor(a)torproject.org> Date: Tue Apr 2 11:45:13 2019 +1000 Merge branch 'maint-0.2.9' into maint-0.3.4 changes/bug29703 | 4 ++++ 1 file changed, 4 insertions(+)

1 0

[tor/master] Merge branch 'maint-0.3.4' into maint-0.3.5
by teor＠torproject.org 02 Apr '19

02 Apr '19

commit 0418d4081acd2708a16dd757af4aac4777658da9 Merge: 3280e9a11 74775b2df Author: teor <teor(a)torproject.org> Date: Tue Apr 2 11:45:22 2019 +1000 Merge branch 'maint-0.3.4' into maint-0.3.5 changes/bug29703 | 4 ++++ 1 file changed, 4 insertions(+)

1 0

[tor/release-0.3.4] Merge branch 'maint-0.3.4' into release-0.3.4
by teor＠torproject.org 02 Apr '19

02 Apr '19

commit 6c273d86edd57b2b7203a2a4301123486394d1d0 Merge: 5600373e8 74775b2df Author: teor <teor(a)torproject.org> Date: Tue Apr 2 11:45:18 2019 +1000 Merge branch 'maint-0.3.4' into release-0.3.4 changes/bug29703 | 4 ++++ 1 file changed, 4 insertions(+)

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/875'
by teor＠torproject.org 02 Apr '19

02 Apr '19

commit 965f0d891232f3ece13f8310c9c01f71ec55f25d Merge: 583ed7c6e 809a3a748 Author: teor <teor(a)torproject.org> Date: Tue Apr 2 11:47:05 2019 +1000 Merge remote-tracking branch 'tor-github/pr/875' src/lib/log/util_bug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'maint-0.4.0'
by teor＠torproject.org 02 Apr '19

02 Apr '19

commit 9014add25fd7bf4fa83e4409ab5d7b4416c872cc Merge: f0e39df5c 9242f3288 Author: teor <teor(a)torproject.org> Date: Tue Apr 2 11:45:39 2019 +1000 Merge branch 'maint-0.4.0' changes/bug29703 | 4 ++++ 1 file changed, 4 insertions(+)

1 0

[tor/master] Merge branch 'maint-0.3.5' into maint-0.4.0
by teor＠torproject.org 02 Apr '19

02 Apr '19

commit 9242f32883e2eff53ddc8217255168e91c6e3e7f Merge: 6d188fb4c 0418d4081 Author: teor <teor(a)torproject.org> Date: Tue Apr 2 11:45:31 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/bug29703 | 4 ++++ 1 file changed, 4 insertions(+)

1 0