]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Use strlcpy when copying node IDs into measured_bw_line_t
authorNick Mathewson <nickm@torproject.org>
Fri, 1 Jul 2011 16:14:44 +0000 (12:14 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 1 Jul 2011 16:56:07 +0000 (12:56 -0400)
We were using strncpy before, which isn't our style for stuff like
this.

This isn't a bug, though: before calling strncpy, we were checking
that strlen(src) was indeed == HEX_DIGEST_LEN, which is less than
sizeof(dst), so there was no way we could fail to NUL-terminate.
Still, strncpy(a,b,sizeof(a)) is an idiom that we ought to squash
everyplace.

Fixes CID #427.

src/or/dirserv.c

index d114d8654efddfe2f1609f19bcdf3f5f9cfe179f..7df9a2fcaacde6870f263765ed7f95d712a36f6f 100644 (file)
@@ -2415,7 +2415,7 @@ measured_bw_line_parse(measured_bw_line_t *out, const char *orig_line)
         tor_free(line);
         return -1;
       }
-      strncpy(out->node_hex, cp, sizeof(out->node_hex));
+      strlcpy(out->node_hex, cp, sizeof(out->node_hex));
       got_node_id=1;
     }
   } while ((cp = tor_strtok_r(NULL, " \t", &strtok_state)));