mirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2024-12-22 17:35:29 +00:00
Code Issues Projects Releases Wiki Activity

Fix MP3 finding stack crash

Browse source
This commit is contained in:
erorcun 2021-06-28 17:11:12 +03:00
parent cb3b3855b8
commit 22e8e0eff8
2 changed files with 48 additions and 99 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

125
src/audio/sampman_oal.cpp
View file

@ -446,19 +446,33 @@ _FindMP3s(void)
bool8 bInitFirstEntry;
HANDLE hFind;
char path[MAX_PATH];
char filepath[MAX_PATH*2];
int total_ms;
WIN32_FIND_DATA fd;
char filepath[MAX_PATH + sizeof(fd.cFileName)];
if (getcwd(_mp3DirectoryPath, MAX_PATH) == NULL) {
perror("getcwd: ");
return;
}
if (strlen(_mp3DirectoryPath) + 1 > MAX_PATH - 10) {
// This is not gonna end well
printf("MP3 folder path is too long, no place left for file names. MP3 finding aborted.\n");
return;
}
OutputDebugString("Finding MP3s...");
strcpy(path, _mp3DirectoryPath);
strcat(path, "\\MP3\\");
#if !defined(_WIN32)
char *actualPath = casepath(path);
if (actualPath) {
strcpy(path, actualPath);
free(actualPath);
}
#endif
strcpy(_mp3DirectoryPath, path);
OutputDebugString(_mp3DirectoryPath);
@ -471,94 +485,31 @@ _FindMP3s(void)
return;
}
strcpy(filepath, _mp3DirectoryPath);
strcat(filepath, fd.cFileName);
bShortcut = FALSE;
bInitFirstEntry = TRUE;
size_t filepathlen = strlen(filepath);
if ( filepathlen <= 0)
do
{
FindClose(hFind);
return;
}
strcpy(filepath, _mp3DirectoryPath);
strcat(filepath, fd.cFileName);
if ( _ResolveLink(filepath, filepath) )
{
OutputDebugString("Resolving Link");
OutputDebugString(filepath);
bShortcut = TRUE;
} else
bShortcut = FALSE;
if (!strcmp(fd.cFileName, ".") || !strcmp(fd.cFileName, ".."))
continue;
aStream[0] = new CStream(filepath, ALStreamSources[0], ALStreamBuffers[0]);
if (aStream[0] && aStream[0]->IsOpened())
{
total_ms = aStream[0]->GetLengthMS();
delete aStream[0];
aStream[0] = NULL;
OutputDebugString(fd.cFileName);
_pMP3List = new tMP3Entry;
if ( _pMP3List == NULL )
{
FindClose(hFind);
return;
}
nNumMP3s = 1;
strcpy(_pMP3List->aFilename, fd.cFileName);
_pMP3List->nTrackLength = total_ms;
_pMP3List->pNext = NULL;
pList = _pMP3List;
if ( bShortcut )
{
_pMP3List->pLinkPath = new char[MAX_PATH*2];
strcpy(_pMP3List->pLinkPath, filepath);
}
else
{
_pMP3List->pLinkPath = NULL;
}
bInitFirstEntry = FALSE;
}
else
{
strcat(filepath, " - NOT A VALID MP3");
OutputDebugString(filepath);
bInitFirstEntry = TRUE;
}
while ( TRUE )
{
if ( !FindNextFile(hFind, &fd) )
break;
size_t filepathlen = strlen(filepath);
if ( bInitFirstEntry )
{
strcpy(filepath, _mp3DirectoryPath);
strcat(filepath, fd.cFileName);
size_t filepathlen = strlen(filepath);
if ( filepathlen > 0 )
if (filepathlen > 0)
{
if ( _ResolveLink(filepath, filepath) )
if (_ResolveLink(filepath, filepath))
{
OutputDebugString("Resolving Link");
OutputDebugString(filepath);
bShortcut = TRUE;
} else {
}
else
{
bShortcut = FALSE;
if (filepathlen > MAX_PATH) {
continue;
@ -576,7 +527,7 @@ _FindMP3s(void)
_pMP3List = new tMP3Entry;
if ( _pMP3List == NULL)
if (_pMP3List == NULL)
break;
nNumMP3s = 1;
@ -586,9 +537,9 @@ _FindMP3s(void)
_pMP3List->nTrackLength = total_ms;
_pMP3List->pNext = NULL;
if ( bShortcut )
if (bShortcut)
{
_pMP3List->pLinkPath = new char [MAX_PATH*2];
_pMP3List->pLinkPath = new char[MAX_PATH + sizeof(fd.cFileName)];
strcpy(_pMP3List->pLinkPath, filepath);
}
else
@ -606,14 +557,11 @@ _FindMP3s(void)
OutputDebugString(filepath);
}
}
else
break;
}
else
{
strcpy(filepath, _mp3DirectoryPath);
strcat(filepath, fd.cFileName);
size_t filepathlen = strlen(filepath);
if ( filepathlen > 0 )
{
if ( _ResolveLink(filepath, filepath) )
@ -621,7 +569,8 @@ _FindMP3s(void)
OutputDebugString("Resolving Link");
OutputDebugString(filepath);
bShortcut = TRUE;
} else
}
else
bShortcut = FALSE;
aStream[0] = new CStream(filepath, ALStreamSources[0], ALStreamBuffers[0]);
@ -647,7 +596,7 @@ _FindMP3s(void)
if ( bShortcut )
{
e->pLinkPath = new char [MAX_PATH*2];
e->pLinkPath = new char [MAX_PATH + sizeof(fd.cFileName)];
strcpy(e->pLinkPath, filepath);
}
else
@ -666,7 +615,7 @@ _FindMP3s(void)
}
}
}
}
} while (FindNextFile(hFind, &fd));
FindClose(hFind);
}

2
src/skel/crossplatform.h
View file

@ -143,7 +143,7 @@ typedef void* HANDLE;
struct WIN32_FIND_DATA {
char extension[32]; // for searching
char folder[32]; // for searching
char folder[MAX_PATH]; // for searching
char cFileName[256]; // because tSkinInfo has it 256
time_t ftLastWriteTime;
};