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 48782682c77cf88c1f6a1211f7578b6feaa913dd..75f7af99a4823cebb37e833f6b4b02523853842d 100644 (file)
--- 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;
   }