From 5c8e56f615804abfd086c68959537a044f32c66d Mon Sep 17 00:00:00 2001 From: Baptiste Daroussin Date: Wed, 22 Mar 2017 21:52:22 +0000 Subject: Use strndup(3) instead of malloc + memcpy --- usr.bin/diff/diff.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'usr.bin/diff/diff.c') diff --git a/usr.bin/diff/diff.c b/usr.bin/diff/diff.c index c5f0632568dc..fd0e76ca3b67 100644 --- a/usr.bin/diff/diff.c +++ b/usr.bin/diff/diff.c @@ -351,9 +351,8 @@ read_excludes_file(char *file) while ((buf = fgetln(fp, &len)) != NULL) { if (buf[len - 1] == '\n') len--; - pattern = xmalloc(len + 1); - memcpy(pattern, buf, len); - pattern[len] = '\0'; + if ((pattern = strndup(buf, len)) == NULL) + err(2, "xstrndup"); push_excludes(pattern); } if (strcmp(file, "-") != 0) -- cgit v1.2.3