summaryrefslogtreecommitdiff
path: root/src/common/memarea.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2009-03-21 11:52:53 +0000
committerNick Mathewson <nickm@torproject.org>2009-03-21 11:52:53 +0000
commit0fa01654b9553598fd3263cdec9849bd8ea2a4a8 (patch)
treede6914da06ca16151e208394e737ad75f4008f49 /src/common/memarea.c
parent4962e466b2e72cdf78411e5ff426c5b5478d59f6 (diff)
downloadtor-0fa01654b9553598fd3263cdec9849bd8ea2a4a8.tar.gz
tor-0fa01654b9553598fd3263cdec9849bd8ea2a4a8.zip
fix from lark: make memarea_strndup() work even at the end of a mmap chunk. Bug was harmless for now, I think.
svn:r19094
Diffstat (limited to 'src/common/memarea.c')
-rw-r--r--src/common/memarea.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/memarea.c b/src/common/memarea.c
index 65e36e3dd9..7eb54821b9 100644
--- a/src/common/memarea.c
+++ b/src/common/memarea.c
@@ -237,7 +237,7 @@ memarea_strndup(memarea_t *area, const char *s, size_t n)
size_t ln;
char *result;
const char *cp, *end = s+n;
- for (cp = s; *cp && cp < end; ++cp)
+ for (cp = s; cp < end && *cp; ++cp)
;
/* cp now points to s+n, or to the 0 in the string. */
ln = cp-s;