From 60dd668bf3575e6c00ff5fe88984816340c95aee Mon Sep 17 00:00:00 2001 From: asomers Date: Mon, 1 Oct 2018 16:11:09 +0000 Subject: [PATCH] MFC r338216: tftpd: Fix data corruption bug with netascii Transferring files in netascii format requires, among other things, translating all CR characters to a CR,NUL pair. tftpd does this correctly except when the CR occurs as the last octet of a packet. In that case, it erroneously drops the NUL which should be part of the following packet. The bug was caused by using 0 as a sentinel value in a variable that could legitimately hold 0. Fix it by switching the sentinel value to -1. PR: 178055 Reported by: Richard Reviewed by: cem Differential Revision: https://reviews.freebsd.org/D16853 git-svn-id: svn://svn.freebsd.org/base/stable/10@339062 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- libexec/tftpd/tftp-file.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libexec/tftpd/tftp-file.c b/libexec/tftpd/tftp-file.c index c39ca6173..67ff02f98 100644 --- a/libexec/tftpd/tftp-file.c +++ b/libexec/tftpd/tftp-file.c @@ -108,10 +108,10 @@ convert_to_net(char *buffer, size_t count, int init) { size_t i; static size_t n = 0, in = 0; - static int newline = 0; + static int newline = -1; if (init) { - newline = 0; + newline = -1; n = 0; in = 0; return 0 ; @@ -122,9 +122,9 @@ convert_to_net(char *buffer, size_t count, int init) */ i = 0; - if (newline) { + if (newline != -1) { buffer[i++] = newline; - newline = 0; + newline = -1; } while (i < count) { @@ -159,7 +159,7 @@ convert_to_net(char *buffer, size_t count, int init) if (i > count) { /* - * Whoops... that isn't alllowed (but it will happen + * Whoops... that isn't allowed (but it will happen * when there is a CR or LF at the end of the buffer) */ newline = buffer[i-1]; -- 2.42.0