diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-09-01 10:45:34 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-09-01 10:45:34 -0400 |
| commit | 9f144144e383169ba6a0de78fde50c0d1f662116 (patch) | |
| tree | e22254bad935cf6d829627c54fc6441f31c0e4b5 | |
| parent | cfa9ee5fe708539965f46a31b5d2abe4950179af (diff) | |
| parent | ab9874dba46b3eae8e201a45926ddeb133903ebc (diff) | |
| download | tor-9f144144e383169ba6a0de78fde50c0d1f662116.tar.gz tor-9f144144e383169ba6a0de78fde50c0d1f662116.zip | |
Merge branch 'bug3888'
| -rw-r--r-- | changes/bug3888 | 4 | ||||
| -rw-r--r-- | src/or/connection.c | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/changes/bug3888 b/changes/bug3888 new file mode 100644 index 0000000000..d3a5e27116 --- /dev/null +++ b/changes/bug3888 @@ -0,0 +1,4 @@ + o Minor bugfixes (bufferevents, fix on 0.2.3.1-alpha): + - Fix a use-after-free error with per-connection rate-limiting + buckets. Fixes bug 3888. + diff --git a/src/or/connection.c b/src/or/connection.c index 7615952386..1b227d7e74 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -524,6 +524,7 @@ _connection_free(connection_t *conn) #ifdef USE_BUFFEREVENTS if (conn->type == CONN_TYPE_OR && TO_OR_CONN(conn)->bucket_cfg) { ev_token_bucket_cfg_free(TO_OR_CONN(conn)->bucket_cfg); + TO_OR_CONN(conn)->bucket_cfg = NULL; } #endif |