oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

handle string trunctions

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@14951 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2005-04-25 13:09:26 +00:00
parent ba2e5afedd
commit 819578daa1
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
appl/ftp/ftp/domacro.c
View File

@@ -65,9 +65,12 @@ TOP:
}
cp2 = line;
while (*cp1 != '\0') {
size_t len;
switch(*cp1) {
case '\\':
*cp2++ = *++cp1;
if (line + sizeof(line) - 2 < cp2)
goto out;
*cp2++ = *++cp1;
break;
case '$':
if (isdigit((unsigned char)*(cp1+1))) {
@@ -77,7 +80,9 @@ TOP:
}
cp1--;
if (argc - 2 >= j) {
strcpy(cp2, argv[j+1]);
len = sizeof(line) - (cp2 - line) - 1;
if (strlcpy(cp2, argv[j+1], len) >= len)
goto out;
cp2 += strlen(argv[j+1]);
}
break;
@@ -86,13 +91,17 @@ TOP:
loopflg = 1;
cp1++;
if (count < argc) {
strcpy(cp2, argv[count]);
len = sizeof(line) - (cp2 - line) - 1;
if (strlcpy(cp2, argv[count], len) >= len)
goto out;
cp2 += strlen(argv[count]);
}
break;
}
/* intentional drop through */
default:
if (line + sizeof(line) - 2 < cp2)
goto out;
*cp2++ = *cp1;
break;
}
@@ -100,6 +109,7 @@ TOP:
cp1++;
}
}
out:
*cp2 = '\0';
makeargv();
c = getcmd(margv[0]);