github.com/Interlisp.maiko
1
0
Fork 0
mirror of https://github.com/Interlisp/maiko.git synced 2026-05-02 14:40:45 +00:00
Code Issues Projects Releases Wiki Activity

Use MAXPATHLEN for length of arrays containing path.

Browse Source 
Use strncpy() to replace unsafe use of strcpy().
Use getcwd() to replace unsafe use of getwd().

	modified:   main.c
This commit is contained in:
Nick Briggs
2020-12-05 17:44:07 -08:00
parent be5e981941
commit 064027e841
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main.c
View File

@@ -288,7 +288,7 @@ char keystring[128] = {""};
char *getenv(); char *getenv();
int Lisp_Xinitialized = FALSE; int Lisp_Xinitialized = FALSE;
char sysout_name[1024]; /* Set by read_Xoption, in the X version. */ char sysout_name[MAXPATHLEN]; /* Set by read_Xoption, in the X version. */
int sysout_size = 0; /* ditto */ int sysout_size = 0; /* ditto */
int flushing = FALSE; /* see dbprint.h if set, all debug/trace printing will call fflush(stdout) after each printf */ int flushing = FALSE; /* see dbprint.h if set, all debug/trace printing will call fflush(stdout) after each printf */
@@ -403,12 +403,12 @@ int main(int argc, char *argv[])
} }
if (argc > 1 && argv[1][0] != '-') { if (argc > 1 && argv[1][0] != '-') {
strcpy(sysout_name, argv[1]); strncpy(sysout_name, argv[1], MAXPATHLEN);
i++; i++;
} else if ((envname = getenv("LDESRCESYSOUT")) != NULL) { } else if ((envname = getenv("LDESRCESYSOUT")) != NULL) {
strcpy(sysout_name, envname); strncpy(sysout_name, envname, MAXPATHLEN);
} else if ((envname = getenv("LDESOURCESYSOUT")) != NULL) } else if ((envname = getenv("LDESOURCESYSOUT")) != NULL)
strcpy(sysout_name, envname); strncpy(sysout_name, envname, MAXPATHLEN);
#ifdef DOS #ifdef DOS
else if (!makepathname("lisp.vm", sysout_name) else if (!makepathname("lisp.vm", sysout_name)
#else #else
@@ -708,11 +708,7 @@ int makepathname(char *src, char *dst)
base = src; base = src;
switch (*base) { switch (*base) {
case '.': case '.':
#ifdef DOS
if (getcwd(dst, MAXPATHLEN) == 0) if (getcwd(dst, MAXPATHLEN) == 0)
#else
if (getwd(dst) == 0)
#endif /* DOS */
{ /* set working directory */ { /* set working directory */
#ifdef FSERROR #ifdef FSERROR
*Lisp_errno = errno; *Lisp_errno = errno;