iqbalrifai
/
Aegisub
mirror of https://github.com/odrling/Aegisub
1
0
Fork 0
Code Issues Releases Wiki Activity

Yet some more sanity/error checking, although it should never be triggered. 

Originally committed to SVN as r2235.
This commit is contained in:
Niels Martin Hansen 2008-07-04 11:59:28 +00:00
parent 0d56463aa4
commit d01b4ec3e9
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
aegisub/audio_provider_pcm.cpp
View File

@ -168,8 +168,12 @@ char * PCMAudioProvider::EnsureRangeAccessible(int64_t range_start, int64_t rang
mapping_length = 0x10000000; mapping_length = 0x10000000;
#endif #endif
// Make sure to always make a mapping at least as large as the requested range // Make sure to always make a mapping at least as large as the requested range
if (mapping_length < range_length) if (mapping_length < range_length) {
mapping_length = range_length; if (range_length > (int64_t)(~(size_t)0))
throw _T("PCM audio provider: Requested range larger than max size_t, cannot create view of file");
else
mapping_length = range_length;
}
// But also make sure we don't try to make a mapping larger than the file // But also make sure we don't try to make a mapping larger than the file
if (mapping_length > file_size) if (mapping_length > file_size)
mapping_length = (size_t)(file_size - mapping_start); mapping_length = (size_t)(file_size - mapping_start);
@ -290,14 +294,16 @@ public:
filename = _filename; filename = _filename;
// Read header // Read header
// Assume we won't get files smaller than 256 bytes // This should throw an exception if the mapping fails
void *filestart = EnsureRangeAccessible(0, sizeof(RIFFChunk)); void *filestart = EnsureRangeAccessible(0, sizeof(RIFFChunk));
assert(filestart); assert(filestart);
RIFFChunk &header = *(RIFFChunk*)filestart; RIFFChunk &header = *(RIFFChunk*)filestart;
// Check that it's good // Check magic values
if (!CheckFourcc(header.ch.type, "RIFF")) throw _T("RIFF PCM WAV audio provider: File is not a RIFF file"); if (!CheckFourcc(header.ch.type, "RIFF"))
if (!CheckFourcc(header.format, "WAVE")) throw _T("RIFF PCM WAV audio provider: File is not a RIFF WAV file"); throw _T("RIFF PCM WAV audio provider: File is not a RIFF file");
if (!CheckFourcc(header.format, "WAVE"))
throw _T("RIFF PCM WAV audio provider: File is not a RIFF WAV file");
// Count how much more data we can have in the entire file // Count how much more data we can have in the entire file
// The first 4 bytes are already eaten by the header.format field // The first 4 bytes are already eaten by the header.format field
@ -455,6 +461,10 @@ AudioProvider *CreatePCMAudioProvider(const wxString &filename)
try { try {
provider = new RiffWavPCMAudioProvider(filename); provider = new RiffWavPCMAudioProvider(filename);
} }
catch (const wxChar *msg) {
provider = 0;
wxLogDebug(_T("Creating PCM WAV reader failed with message: %s\nProceeding to try other providers."), msg);
}
catch (...) { catch (...) {
provider = 0; provider = 0;
} }