dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r15626) -Fix [FS#2698]: UTF8 string handling could cause buffer overruns.

Browse Source
This commit is contained in:
rubidium
2009-03-06 01:23:25 +00:00
parent 9c6d6c0d0e
commit 34bd9ee636
8 changed files with 38 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/fios.cpp
View File

@@ -247,7 +247,7 @@ bool FiosFileScanner::AddFile(const char *filename, size_t basepath_length)
t = (t == NULL) ? filename : (t + 1);
}
strecpy(fios->title, t, lastof(fios->title));
str_validate(fios->title);
str_validate(fios->title, lastof(fios->title));
return true;
}
@@ -292,7 +292,7 @@ static void FiosGetFileList(SaveLoadDialogMode mode, fios_getlist_callback_proc
fios->mtime = 0;
strecpy(fios->name, d_name, lastof(fios->name));
snprintf(fios->title, lengthof(fios->title), "%s" PATHSEP " (Directory)", d_name);
str_validate(fios->title);
str_validate(fios->title, lastof(fios->title));
}
}
closedir(dir);
@@ -344,6 +344,7 @@ static void GetFileTitle(const char *file, char *title, const char *last)
size_t read = fread(title, 1, last - title, f);
assert(title + read <= last);
title[read] = '\0';
str_validate(title, last);
FioFCloseFile(f);
}