q3aql/Serious-Engine
q3aql/Serious-Engine
1
0
Fork 0
mirror of https://github.com/ptitSeb/Serious-Engine synced 2024-11-25 19:55:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removed the exception handling code from CTStream.

Browse Source 
I think this is a leftover from the mmap()-like code that used to be
in the engine, but now it's a lot of complexity to basically test this:

- Was this a memory access violation?
- If no, crash.
- If yes:
  - Was it part of a CTStream?
  - If no, crash.
  - If yes, crash.

Instead, let's just crash.   :)

(If I'm misunderstanding this, just roll back from revision control.)
This commit is contained in:
Ryan C. Gordon 2016-03-31 12:22:55 -04:00
parent 105bc12d64
commit 75b824ddf8
2 changed files with 6 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
Sources/Engine/Base/Stream.cpp
View File

@ -276,53 +276,6 @@ void CTStream::DisableStreamHandling(void)
_plhOpenedStreams = NULL;
}
#ifdef PLATFORM_WIN32
int CTStream::ExceptionFilter(DWORD dwCode, _EXCEPTION_POINTERS *pExceptionInfoPtrs)
{
// If the exception is not a page fault, exit.
if( dwCode != EXCEPTION_ACCESS_VIOLATION)
{
return EXCEPTION_CONTINUE_SEARCH;
}
// obtain access violation virtual address
UBYTE *pIllegalAdress = (UBYTE *)pExceptionInfoPtrs->ExceptionRecord->ExceptionInformation[1];
CTStream *pstrmAccessed = NULL;
// search for stream that was accessed
FOREACHINLIST( CTStream, strm_lnListNode, (*_plhOpenedStreams), itStream)
{
// if access violation happened inside curently testing stream
if(itStream.Current().PointerInStream(pIllegalAdress))
{
// remember accesed stream ptr
pstrmAccessed = &itStream.Current();
// stream found, stop searching
break;
}
}
// if none of our streams was accessed, real access violation occured
if( pstrmAccessed == NULL)
{
// so continue default exception handling
return EXCEPTION_CONTINUE_SEARCH;
}
// Continue execution where the page fault occurred
return EXCEPTION_CONTINUE_EXECUTION;
}
/*
* Static function to report fatal exception error.
*/
void CTStream::ExceptionFatalError(void)
{
FatalError( GetWindowsError( GetLastError()) );
}
#endif
/*
* Throw an exception of formatted string.
*/
@ -925,8 +878,8 @@ void CTFileStream::Open_t(const CTFileName &fnFileName, CTStream::OpenMode om/*=
fstrm_iZipHandle = UNZIPOpen_t(fnmFullFileName);
fstrm_slZipSize = UNZIPGetSize(fstrm_iZipHandle);
// load the file from the zip in the buffer
fstrm_pubZipBuffer = (UBYTE*)VirtualAlloc(NULL, fstrm_slZipSize, MEM_COMMIT, PAGE_READWRITE);
UNZIPReadBlock_t(fstrm_iZipHandle, (UBYTE*)fstrm_pubZipBuffer, 0, fstrm_slZipSize);
fstrm_pubZipBuffer = new UBYTE[fstrm_slZipSize];
UNZIPReadBlock_t(fstrm_iZipHandle, fstrm_pubZipBuffer, 0, fstrm_slZipSize);
// if it is a physical file
} else if (iFile==EFP_FILE) {
// open file in read only mode
@ -1029,9 +982,7 @@ void CTFileStream::Close(void)
// close zip entry
UNZIPClose(fstrm_iZipHandle);
fstrm_iZipHandle = -1;
VirtualFree(fstrm_pubZipBuffer, 0, MEM_RELEASE);
delete[] fstrm_pubZipBuffer;
_ulVirtuallyAllocatedSpace -= fstrm_slZipSize;
//CPrintF("Freed virtual memory with size ^c00ff00%d KB^C (now %d KB)\n", (fstrm_slZipSize / 1000), (_ulVirtuallyAllocatedSpace / 1000));
}
@ -1166,7 +1117,7 @@ CTMemoryStream::CTMemoryStream(void)
// add this newly created memory stream into opened stream list
_plhOpenedStreams->AddTail( strm_lnListNode);
// allocate amount of memory needed to hold maximum allowed file length (when saving)
mstrm_pubBuffer = (UBYTE*)VirtualAlloc(NULL, _ulMaxLenghtOfSavingFile, MEM_COMMIT, PAGE_READWRITE);
mstrm_pubBuffer = new UBYTE[_ulMaxLenghtOfSavingFile];
mstrm_pubBufferEnd = mstrm_pubBuffer + _ulMaxLenghtOfSavingFile;
mstrm_pubBufferMax = mstrm_pubBuffer;
}
@ -1184,7 +1135,7 @@ CTMemoryStream::CTMemoryStream(void *pvBuffer, SLONG slSize,
}
// allocate amount of memory needed to hold maximum allowed file length (when saving)
mstrm_pubBuffer = (UBYTE*)VirtualAlloc(NULL, _ulMaxLenghtOfSavingFile, MEM_COMMIT, PAGE_READWRITE);
mstrm_pubBuffer = new UBYTE[_ulMaxLenghtOfSavingFile];
mstrm_pubBufferEnd = mstrm_pubBuffer + _ulMaxLenghtOfSavingFile;
mstrm_pubBufferMax = mstrm_pubBuffer + slSize;
// copy given block of memory into memory file
@ -1213,7 +1164,7 @@ CTMemoryStream::CTMemoryStream(void *pvBuffer, SLONG slSize,
CTMemoryStream::~CTMemoryStream(void)
{
ASSERT(mstrm_ctLocked==0);
VirtualFree(mstrm_pubBuffer, 0, MEM_RELEASE);
delete[] mstrm_pubBuffer;
// remove memory stream from list of curently opened streams
strm_lnListNode.Remove();
}

19
Sources/Engine/Base/Stream.h
View File

@ -17,20 +17,9 @@
// maximum length of file that can be saved (default: 8Mb)
ENGINE_API extern ULONG _ulMaxLengthOfSavingFile;
#ifdef _MSC_VER // no __try/__except elsewhere.
#define CTSTREAM_BEGIN CTStream::EnableStreamHandling(); __try
#define CTSTREAM_END __except( CTStream::ExceptionFilter( GetExceptionCode(),\
GetExceptionInformation()) )\
{\
CTStream::ExceptionFatalError();\
}; CTStream::DisableStreamHandling();
#else
#define CTSTREAM_BEGIN CTStream::EnableStreamHandling();
#define CTSTREAM_END CTStream::DisableStreamHandling();
#endif
/*
* Chunk ID class
*/
@ -113,14 +102,6 @@ public:
/* Static function disable stream handling. */
static void DisableStreamHandling(void);
#ifdef PLATFORM_WIN32 /* rcg10042001 !!! FIXME */
/* Static function to filter exceptions and intercept access violation */
static int ExceptionFilter(DWORD dwCode, _EXCEPTION_POINTERS *pExceptionInfoPtrs);
#endif
/* Static function to report fatal exception error. */
static void ExceptionFatalError(void);
/* Default constructor. */
CTStream(void);
/* Destruction. */