diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-06-02 14:51:13 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-06-02 14:51:13 -0400 |
| commit | 34edf17d88a5eaf7bd10aaa557ac5af5c85fa71f (patch) | |
| tree | 1b098728504f33a11d0159aed69b4fc684422591 /changes | |
| parent | e8386cce1ce41b667095cd9590567204d2ab0ba0 (diff) | |
| parent | 6d8a2ff24f18cc008d3c180a191f5040c7b2e2ba (diff) | |
| download | tor-34edf17d88a5eaf7bd10aaa557ac5af5c85fa71f.tar.gz tor-34edf17d88a5eaf7bd10aaa557ac5af5c85fa71f.zip | |
Merge remote-tracking branch 'teor/bug16115-minor-fixes'
Diffstat (limited to 'changes')
| -rw-r--r-- | changes/bug16115-NULL-getinfo-onions | 4 | ||||
| -rw-r--r-- | changes/bug16115-init-var | 4 | ||||
| -rw-r--r-- | changes/bug16115-signing-key-NULL-check | 6 | ||||
| -rw-r--r-- | changes/bug16115-spawn-comment | 6 | ||||
| -rw-r--r-- | changes/bug16115-undef-directive-in-macro | 6 | ||||
| -rw-r--r-- | changes/bug16115-unused-find-cipher | 7 |
6 files changed, 33 insertions, 0 deletions
diff --git a/changes/bug16115-NULL-getinfo-onions b/changes/bug16115-NULL-getinfo-onions new file mode 100644 index 0000000000..ec1661e18d --- /dev/null +++ b/changes/bug16115-NULL-getinfo-onions @@ -0,0 +1,4 @@ + o Minor fixes (threads, comments): + - Check for NULL values in getinfo_helper_onions + Patch by "teor". + Fix on 915c7438a77e in Tor 0.2.7.1-alpha. diff --git a/changes/bug16115-init-var b/changes/bug16115-init-var new file mode 100644 index 0000000000..e3e924a3e3 --- /dev/null +++ b/changes/bug16115-init-var @@ -0,0 +1,4 @@ + o Minor fixes (threads, comments): + - Always initialise return value in compute_desc_id in rendcommon.c + Patch by "teor". + Fix on e6a581f126ba, released in 0.2.7.1-alpha. diff --git a/changes/bug16115-signing-key-NULL-check b/changes/bug16115-signing-key-NULL-check new file mode 100644 index 0000000000..3d4f05bc28 --- /dev/null +++ b/changes/bug16115-signing-key-NULL-check @@ -0,0 +1,6 @@ + o Minor fixes (threads, comments): + - Ensure signing_key is non-NULL before accessing one of its members + signing_key can be NULL in ed_key_init_from_file in routerkeys.c. + Discovered by clang 3.7 address sanitizer. + Patch by "teor". + Fix on c03694938ed0, not in any released version of Tor. diff --git a/changes/bug16115-spawn-comment b/changes/bug16115-spawn-comment new file mode 100644 index 0000000000..7792564688 --- /dev/null +++ b/changes/bug16115-spawn-comment @@ -0,0 +1,6 @@ + o Minor fixes (threads, comments): + - Fix an incorrect comment on spawn_func in compat_pthreads.c. + spawn_func calls pthread_create on unix, not fork + Patch by "teor". + Bugfix on unknown tor version (existing code split out of + compat.c into compat_pthreads.c in c2f0d52b7fb9 on 22 Sep 2013). diff --git a/changes/bug16115-undef-directive-in-macro b/changes/bug16115-undef-directive-in-macro new file mode 100644 index 0000000000..8031267cdf --- /dev/null +++ b/changes/bug16115-undef-directive-in-macro @@ -0,0 +1,6 @@ + o Minor fixes (threads, comments): + - Remove undefined directive-in-macro in test_util_writepid + clang 3.7 complains that using a preprocessor directive inside + a macro invocation in test_util_writepid in test_util.c is undefined. + Patch by "teor". + Fix on 79e85313aa61 on 0.2.7.1-alpha. diff --git a/changes/bug16115-unused-find-cipher b/changes/bug16115-unused-find-cipher new file mode 100644 index 0000000000..0f04d6795b --- /dev/null +++ b/changes/bug16115-unused-find-cipher @@ -0,0 +1,7 @@ + o Minor fixes (threads, comments): + - Silence unused variable warnings in find_cipher_by_id + Unused variable warnings were still generated under some versions + of OpenSSL. Instead, make sure all variables are used under all + versions of OpenSSL. + Patch by "teor". + Fix on 496df21c89d1, not in any released version of tor. |