Skip to content

FileOpen + InitInterProcessComm: bound user-input string parsing #192

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nurdymuny wants to merge 2 commits into
base: master
Choose a base branch
from
Open

FileOpen + InitInterProcessComm: bound user-input string parsing #192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e4c65a9
FileOpen + InitInterProcessComm: bound user-input string parsing
nurdymuny Jun 9, 2026
618e061
World/{Mercator,DEM,Albedo}ToCube: same OpenFile fix as iokit.c::File…
nurdymuny Jun 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions Kit/Source/iokit.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,19 @@ FILE *FileOpen(const char *Path, const char *File, const char *CtrlCode)
{
FILE *FilePtr;
char FileName[1024];

strcpy(FileName,Path);
strcat(FileName,File);
int Written;

/* Use snprintf instead of strcpy+strcat — the previous version
could overflow FileName[1024] when Path and File combined to
more than 1024 bytes (e.g. a long working directory plus a
long config-file name). Truncation is preferred over the
silent stack smash that strcpy+strcat caused. */
Written = snprintf(FileName,sizeof(FileName),"%s%s",Path,File);
if(Written < 0 || (size_t)Written >= sizeof(FileName)) {
printf("Error: combined path length exceeds %zu bytes: %s%s\n",
sizeof(FileName)-1, Path, File);
exit(1);
}
FilePtr=fopen(FileName,CtrlCode);
if(FilePtr == NULL) {
printf("Error opening %s: %s\n",FileName, strerror(errno));
Expand Down
14 changes: 7 additions & 7 deletions Source/42ipc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,20 +52,20 @@ void InitInterProcessComm(void)
for(Iipc=0;Iipc<Nipc;Iipc++) {
I = &IPC[Iipc];
fscanf(infile,"%[^\n] %[\n]",junk,&newline);
fscanf(infile,"%s %[^\n] %[\n]",response,junk,&newline);
fscanf(infile,"%119s %119[^\n] %1[\n]",response,junk,&newline);
I->Mode = DecodeString(response);
fscanf(infile,"\"%[^\"]\" %[^\n] %[\n]",FileName,junk,&newline);
fscanf(infile,"%s %[^\n] %[\n]",response,junk,&newline);
fscanf(infile,"\"%79[^\"]\" %119[^\n] %1[\n]",FileName,junk,&newline);
fscanf(infile,"%119s %119[^\n] %1[\n]",response,junk,&newline);
I->SocketRole = DecodeString(response);
fscanf(infile,"%s %ld %[^\n] %[\n]",I->HostName,&I->Port,junk,&newline);
fscanf(infile,"%s %[^\n] %[\n]",response,junk,&newline);
fscanf(infile,"%39s %ld %119[^\n] %1[\n]",I->HostName,&I->Port,junk,&newline);
fscanf(infile,"%119s %119[^\n] %1[\n]",response,junk,&newline);
I->AllowBlocking = DecodeString(response);
fscanf(infile,"%s %[^\n] %[\n]",response,junk,&newline);
fscanf(infile,"%119s %119[^\n] %1[\n]",response,junk,&newline);
I->EchoEnabled = DecodeString(response);
fscanf(infile,"%ld %[^\n] %[\n]",&I->Nprefix,junk,&newline);
I->Prefix = (char **) calloc(I->Nprefix,sizeof(char *));
for(Ipx=0;Ipx<I->Nprefix;Ipx++) {
fscanf(infile,"\"%[^\"]\" %[^\n] %[\n]",Prefix,junk,&newline);
fscanf(infile,"\"%79[^\"]\" %119[^\n] %1[\n]",Prefix,junk,&newline);
I->Prefix[Ipx] = (char *) calloc(strlen(Prefix)+1,sizeof(char));
strcpy(I->Prefix[Ipx],Prefix);
}
Expand Down
10 changes: 8 additions & 2 deletions World/AlbedoToCube.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,15 @@ FILE *OpenFile(char *Path, char *File, char *CtrlCode)
{
FILE *FilePtr;
char FileName[80];
int Written;

strcpy(FileName,Path);
strcat(FileName,File);
/* snprintf instead of strcpy+strcat — see iokit.c::FileOpen */
Written = snprintf(FileName,sizeof(FileName),"%s%s",Path,File);
if(Written < 0 || (size_t)Written >= sizeof(FileName)) {
printf("Error: combined path length exceeds %zu bytes: %s%s\n",
sizeof(FileName)-1, Path, File);
exit(1);
}
FilePtr=fopen(FileName,CtrlCode);
if(FilePtr == NULL) {
printf("Error opening %s\n",FileName);
Expand Down
10 changes: 8 additions & 2 deletions World/DEMToBumpCube.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,15 @@ FILE *OpenFile(char *Path, char *File, char *CtrlCode)
{
FILE *FilePtr;
char FileName[80];
int Written;

strcpy(FileName,Path);
strcat(FileName,File);
/* snprintf instead of strcpy+strcat — see iokit.c::FileOpen */
Written = snprintf(FileName,sizeof(FileName),"%s%s",Path,File);
if(Written < 0 || (size_t)Written >= sizeof(FileName)) {
printf("Error: combined path length exceeds %zu bytes: %s%s\n",
sizeof(FileName)-1, Path, File);
exit(1);
}
FilePtr=fopen(FileName,CtrlCode);
if(FilePtr == NULL) {
printf("Error opening %s\n",FileName);
Expand Down
12 changes: 10 additions & 2 deletions World/MercatorToCube.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,17 @@ FILE *OpenFile(char *Path, char *File, char *CtrlCode)
{
FILE *FilePtr;
char FileName[80];
int Written;

strcpy(FileName,Path);
strcat(FileName,File);
/* snprintf instead of strcpy+strcat — see iokit.c::FileOpen for
the equivalent fix on the main entry path. Same bug shape:
attacker-controlled Path + File would overflow FileName[80]. */
Written = snprintf(FileName,sizeof(FileName),"%s%s",Path,File);
if(Written < 0 || (size_t)Written >= sizeof(FileName)) {
printf("Error: combined path length exceeds %zu bytes: %s%s\n",
sizeof(FileName)-1, Path, File);
exit(1);
}
FilePtr=fopen(FileName,CtrlCode);
if(FilePtr == NULL) {
printf("Error opening %s\n",FileName);
Expand Down