diff options
author | Roger Dingledine <arma@torproject.org> | 2006-10-29 03:36:53 +0000 |
---|---|---|
committer | Roger Dingledine <arma@torproject.org> | 2006-10-29 03:36:53 +0000 |
commit | 70f1769b079743c66d44f1492f365f9cf36e9f51 (patch) | |
tree | d6d1bc1e49079e0aabc2885065e2952db20d7c1d | |
parent | d4d4cce82724a995f98b63a8aba4273fbe50d8b9 (diff) | |
download | tor-70f1769b079743c66d44f1492f365f9cf36e9f51.tar.gz tor-70f1769b079743c66d44f1492f365f9cf36e9f51.zip |
backport 8844: avoid infinite loop on unexpected controller input.
svn:r8849
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | src/or/buffers.c | 2 |
2 files changed, 3 insertions, 2 deletions
@@ -1,4 +1,4 @@ -Changes in version 0.1.1.25 - 2006-10-?? [ongoing] +Changes in version 0.1.1.25 - 2006-11-?? [ongoing] o Major bugfixes: - When a client asks us to resolve (not connect to) an address, and we have a cached answer, give them the cached answer. @@ -24,6 +24,7 @@ Changes in version 0.1.1.25 - 2006-10-?? [ongoing] - Avoid possibility of controller-triggered crash when misusing certain commands from a v0 controller on platforms that do not handle printf("%s",NULL) gracefully. + - Avoid infinite loop on unexpected controller input. Changes in version 0.1.1.24 - 2006-09-29 diff --git a/src/or/buffers.c b/src/or/buffers.c index f5dd19135b..2098016313 100644 --- a/src/or/buffers.c +++ b/src/or/buffers.c @@ -1232,7 +1232,7 @@ find_char_on_buf(buf_t *buf, char *start, size_t len, char c) size_t len_rest; char *cp; _split_range(buf, start, &len, &len_rest); - cp = memchr(buf->cur, c, len); + cp = memchr(start, c, len); if (cp || !len_rest) return cp; return memchr(buf->mem, c, len_rest); |