summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSam Hartman <hartmans@mit.edu>2002-04-04 22:17:44 +0000
committerSam Hartman <hartmans@mit.edu>2002-04-04 22:17:44 +0000
commit2419a47a52c8554a8db00b1cbd38771b621232bb (patch)
tree60f49b604f079aabdad97f048574ea41d7fcba4b /src
parentf4dedbca36b56e4d038b7c6374d934c0ca1355b2 (diff)
Patch from Mark Eichin for bug 635
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@14347 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
-rw-r--r--src/appl/gssftp/ftp/ChangeLog5
-rw-r--r--src/appl/gssftp/ftp/radix.c12
2 files changed, 11 insertions, 6 deletions
diff --git a/src/appl/gssftp/ftp/ChangeLog b/src/appl/gssftp/ftp/ChangeLog
index 21a1d2832..0cf21a989 100644
--- a/src/appl/gssftp/ftp/ChangeLog
+++ b/src/appl/gssftp/ftp/ChangeLog
@@ -1,3 +1,8 @@
+2002-04-04 Sam Hartman <hartmans@mit.edu>
+
+ * radix.c (decode;): Patch from Mark Eichin for one char buffer overflow [635]
+
+
2002-03-05 Ken Raeburn <raeburn@mit.edu>
* cmds.c (unix): Define if BSD is defined.
diff --git a/src/appl/gssftp/ftp/radix.c b/src/appl/gssftp/ftp/radix.c
index 2d573b4be..c989962c2 100644
--- a/src/appl/gssftp/ftp/radix.c
+++ b/src/appl/gssftp/ftp/radix.c
@@ -23,18 +23,18 @@ int *len, decode;
D = p - radixN;
switch (i&3) {
case 0:
- outbuf[j] = D<<2;
+ c = D<<2;
break;
case 1:
- outbuf[j++] |= D>>4;
- outbuf[j] = (D&15)<<4;
+ outbuf[j++] = c | D>>4;
+ c = (D&15)<<4;
break;
case 2:
- outbuf[j++] |= D>>2;
- outbuf[j] = (D&3)<<6;
+ outbuf[j++] = c | D>>2;
+ c = (D&3)<<6;
break;
case 3:
- outbuf[j++] |= D;
+ outbuf[j++] = c | D;
}
}
switch (i&3) {