Date: Wed, 10 May 2023 09:26:45 GMT From: =?utf-8?Q?Dag-Erling=20Sm=C3=B8rgrav?= <des@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: f1ceb05a469f - main - md5: Fix input error check. Message-ID: <202305100926.34A9Qj7T092798@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=f1ceb05a469ffe03f25aeea5f9f72a6d8f75bcd1 commit f1ceb05a469ffe03f25aeea5f9f72a6d8f75bcd1 Author: Dag-Erling Smørgrav <des@FreeBSD.org> AuthorDate: 2023-05-09 17:59:13 +0000 Commit: Dag-Erling Smørgrav <des@FreeBSD.org> CommitDate: 2023-05-10 09:25:21 +0000 md5: Fix input error check. Fixes: 4849767cb16a MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: tsoome, kevans, lwhsu Differential Revision: https://reviews.freebsd.org/D40017 --- sbin/md5/md5.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sbin/md5/md5.c b/sbin/md5/md5.c index 98cfb37110d5..bca6a98fc32c 100644 --- a/sbin/md5/md5.c +++ b/sbin/md5/md5.c @@ -686,7 +686,7 @@ MDInput(const Algorithm_t *alg, FILE *f, char *buf, bool tee) switch (input_mode) { case input_binary: case input_text: - if (tee && fwrite(block, 1, len, stdout) != (size_t)len) + if (tee && fwrite(block, 1, len, stdout) != len) err(1, "stdout"); alg->Update(&context, block, len); break; @@ -734,7 +734,7 @@ MDInput(const Algorithm_t *alg, FILE *f, char *buf, bool tee) break; } } - if (len < 0) { + if (ferror(f)) { alg->End(&context, buf); return (NULL); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202305100926.34A9Qj7T092798>