From: Nick Mathewson <nickm@torproject.org>
Date: Sat, 19 Apr 2014 17:16:56 +0000 (-0400)
Subject: scan-build: memarea_strndup() undefined behavior
X-Git-Tag: tor-0.2.5.4-alpha~14^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3b1f7f75a7efa51ae5549a6413e90066cfe307a8;p=thirdparty%2Ftor.git

scan-build: memarea_strndup() undefined behavior

The memarea_strndup() function would have hit undefined behavior by
creating an 'end' pointer off the end of a string if it had ever been
given an 'n' argument bigger than the length of the memory ares that
it's scanning.  Fortunately, we never did that except in the unit
tests.  But it's not a safe behavior to leave lying around.
---

diff --git a/src/common/memarea.c b/src/common/memarea.c
index e2d07fca9e..bcaea0949e 100644
--- a/src/common/memarea.c
+++ b/src/common/memarea.c
@@ -291,14 +291,11 @@ memarea_strdup(memarea_t *area, const char *s)
 char *
 memarea_strndup(memarea_t *area, const char *s, size_t n)
 {
-  size_t ln;
+  size_t ln = 0;
   char *result;
-  const char *cp, *end = s+n;
   tor_assert(n < SIZE_T_CEILING);
-  for (cp = s; cp < end && *cp; ++cp)
+  for (ln = 0; ln < n && s[ln]; ++ln)
     ;
-  /* cp now points to s+n, or to the 0 in the string. */
-  ln = cp-s;
   result = memarea_alloc(area, ln+1);
   memcpy(result, s, ln);
   result[ln]='\0';