ed: Don't use strlcpy()

All the buffers related to files have FILENAME_MAX size, so it is impossible
to have any buffer overrun.
This commit is contained in:
Roberto E. Vargas Caballero 2017-01-10 08:46:48 +01:00
parent 78bfd8978e
commit b95c8ed79e

5
ed.c
View File

@ -611,7 +611,7 @@ dowrite(const char *fname, int trunc)
curln = line2; curln = line2;
if (fclose(fp)) if (fclose(fp))
error("input/output error"); error("input/output error");
if (strlcpy(savfname, fname, sizeof(savfname)) >= sizeof(savfname)) if (strcpy(savfname, fname, sizeof(savfname)) >= sizeof(savfname))
error("file name too long"); error("file name too long");
modflag = 0; modflag = 0;
curln = line; curln = line;
@ -743,8 +743,7 @@ getfname(char comm)
} else { } else {
*bp = '\0'; *bp = '\0';
if (savfname[0] == '\0' || comm == 'e' || comm == 'f') if (savfname[0] == '\0' || comm == 'e' || comm == 'f')
if (strlcpy(savfname, fname, sizeof(savfname)) >= sizeof(savfname)) strcpy(savfname, fname);
error("file name too long");
return fname; return fname;
} }