joncampbell123/dosbox-x
1
0
Fork 0
mirror of https://github.com/joncampbell123/dosbox-x.git synced 2025-10-15 03:48:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

SVN r4361

Browse Source 
Some protections against an empty basedir.
This commit is contained in:
Allofich
2020-09-12 00:00:12 +09:00
parent 32ea2e1497
commit 327e0d3788
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/dos/drive_cache.cpp
View File

@@ -65,6 +65,7 @@ DOS_Drive_Cache::DOS_Drive_Cache(void) {
save_dir = 0; save_dir = 0;
srchNr = 0; srchNr = 0;
label[0] = 0; label[0] = 0;
basePath[0] = 0;
nextFreeFindFirst = 0; nextFreeFindFirst = 0;
for (Bit32u i=0; i<MAX_OPENDIRS; i++) { dirSearch[i] = 0; dirFindFirst[i] = 0; } for (Bit32u i=0; i<MAX_OPENDIRS; i++) { dirSearch[i] = 0; dirFindFirst[i] = 0; }
SetDirSort(DIRALPHABETICAL); SetDirSort(DIRALPHABETICAL);
@@ -76,6 +77,7 @@ DOS_Drive_Cache::DOS_Drive_Cache(const char* path, DOS_Drive *drive) {
save_dir = 0; save_dir = 0;
srchNr = 0; srchNr = 0;
label[0] = 0; label[0] = 0;
basePath[0] = 0;
nextFreeFindFirst = 0; nextFreeFindFirst = 0;
for (Bit32u i=0; i<MAX_OPENDIRS; i++) { dirSearch[i] = 0; dirFindFirst[i] = 0; } for (Bit32u i=0; i<MAX_OPENDIRS; i++) { dirSearch[i] = 0; dirFindFirst[i] = 0; }
SetDirSort(DIRALPHABETICAL); SetDirSort(DIRALPHABETICAL);
@@ -100,7 +102,7 @@ void DOS_Drive_Cache::EmptyCache(void) {
dirBase = new CFileInfo; dirBase = new CFileInfo;
save_dir = 0; save_dir = 0;
srchNr = 0; srchNr = 0;
SetBaseDir(basePath,drive); if (basePath[0] != 0) SetBaseDir(basePath,drive);
} }
void DOS_Drive_Cache::SetLabel(const char* vname,bool cdrom,bool allowupdate) { void DOS_Drive_Cache::SetLabel(const char* vname,bool cdrom,bool allowupdate) {
@@ -129,6 +131,8 @@ Bit16u DOS_Drive_Cache::GetFreeID(CFileInfo* dir) {
} }
void DOS_Drive_Cache::SetBaseDir(const char* baseDir, DOS_Drive *drive) { void DOS_Drive_Cache::SetBaseDir(const char* baseDir, DOS_Drive *drive) {
if (strlen(baseDir) == 0) return;
Bit16u id; Bit16u id;
strcpy(basePath,baseDir); strcpy(basePath,baseDir);
this->drive = drive; this->drive = drive;
@@ -610,7 +614,8 @@ void DOS_Drive_Cache::CreateShortName(CFileInfo* curDir, CFileInfo* info) {
// Create number // Create number
char buffer[8]; char buffer[8];
info->shortNr = CreateShortNameID(curDir,tmpName); info->shortNr = CreateShortNameID(curDir,tmpName);
sprintf(buffer,"%d",(int)info->shortNr); if (GCC_UNLIKELY(info->shortNr > 9999999)) E_Exit("~9999999 same name files overflow");
sprintf(buffer, "%d", static_cast<unsigned int>(info->shortNr));
// Copy first letters // Copy first letters
Bits tocopy = 0; Bits tocopy = 0;
size_t buflen = strlen(buffer); size_t buflen = strlen(buffer);
@@ -760,7 +765,8 @@ bool DOS_Drive_Cache::OpenDir(CFileInfo* dir, const char* expand, Bit16u& id) {
char expandcopy [CROSS_LEN]; char expandcopy [CROSS_LEN];
strcpy(expandcopy,expand); strcpy(expandcopy,expand);
// Add "/" // Add "/"
if (expandcopy[strlen(expandcopy)-1]!=CROSS_FILESPLIT) { size_t expandcopylen = strlen(expandcopy);
if (expandcopylen > 0 && expandcopy[expandcopylen - 1] != CROSS_FILESPLIT) {
char end[2]={CROSS_FILESPLIT,0}; char end[2]={CROSS_FILESPLIT,0};
strcat(expandcopy,end); strcat(expandcopy,end);
} }