summaryrefslogtreecommitdiff
path: root/security/krb5-appl/files/patch-appl::telnet::telnetd::utility.c
diff options
context:
space:
mode:
authorcvs2svn <cvs2svn@FreeBSD.org>2005-10-16 07:41:55 +0000
committercvs2svn <cvs2svn@FreeBSD.org>2005-10-16 07:41:55 +0000
commit40a3261d1a6e2617f6afde0cd6d762a7e211af7a (patch)
treed70bbf882801af3a4e58dde3ed6a1da1849479d4 /security/krb5-appl/files/patch-appl::telnet::telnetd::utility.c
parentFix the string format vulnerability desribed at (diff)
This commit was manufactured by cvs2svn to create tag 'RELEASE_6_0_0'.release/6.0.0
Diffstat (limited to 'security/krb5-appl/files/patch-appl::telnet::telnetd::utility.c')
-rw-r--r--security/krb5-appl/files/patch-appl::telnet::telnetd::utility.c38
1 files changed, 0 insertions, 38 deletions
diff --git a/security/krb5-appl/files/patch-appl::telnet::telnetd::utility.c b/security/krb5-appl/files/patch-appl::telnet::telnetd::utility.c
deleted file mode 100644
index 8bb656dc0673..000000000000
--- a/security/krb5-appl/files/patch-appl::telnet::telnetd::utility.c
+++ /dev/null
@@ -1,38 +0,0 @@
---- appl/telnet/telnetd/utility.c.orig Wed Jan 9 14:26:59 2002
-+++ appl/telnet/telnetd/utility.c Fri Jan 11 13:10:33 2002
-@@ -408,18 +408,25 @@
- int
- netwrite(const char *buf, size_t len)
- {
-- size_t remain;
-+ int remaining, copied;
-+
-+ remaining = BUFSIZ - (nfrontp - netobuf);
-+ while (len > 0) {
-+ /* Free up enough space if the room is too low*/
-+ if ((len > BUFSIZ ? BUFSIZ : len) > remaining) {
-+ netflush();
-+ remaining = BUFSIZ - (nfrontp - netobuf);
-+ }
-
-- remain = sizeof(netobuf) - (nfrontp - netobuf);
-- if (remain < len) {
-- netflush();
-- remain = sizeof(netobuf) - (nfrontp - netobuf);
-+ /* Copy out as much as will fit */
-+ copied = remaining > len ? len : remaining;
-+ memmove(nfrontp, buf, copied);
-+ nfrontp += copied;
-+ len -= copied;
-+ remaining -= copied;
-+ buf += copied;
- }
-- if (remain < len)
-- return 0;
-- memcpy(nfrontp, buf, len);
-- nfrontp += len;
-- return len;
-+ return copied;
- }
-
- /*