From: Arlo Breault <arlolra@gmail.com>
Date: Mon, 13 May 2013 19:32:01 +0000 (-0700)
Subject: Check the return value of memchr().
X-Git-Tag: tor-0.2.5.1-alpha~192
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=88a780d8990622bfc0faa3b5299d0c21012f2c41;p=thirdparty%2Ftor.git

Check the return value of memchr().

For quality-of-implementation in munge_extrainfo_into_routerinfo().
See #8791
---

diff --git a/src/or/control.c b/src/or/control.c
index 48782682c7..75f7af99a4 100644
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -1572,7 +1572,8 @@ munge_extrainfo_into_routerinfo(const char *ri_body,
     if (!(cp = tor_memstr(ei_body, ei_len, kwd)))
       continue;
     ++cp;
-    eol = memchr(cp, '\n', ei_len - (cp-ei_body));
+    if (!(eol = memchr(cp, '\n', ei_len - (cp-ei_body))))
+      continue;
     memcpy(outp, cp, eol-cp+1);
     outp += eol-cp+1;
   }