Author: sagamusix
Date: Sun Jun 2 16:49:22 2024
New Revision: 20907
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20907
Log:
Merged revision(s) 20901, 20903-20904 from trunk/OpenMPT:
[Fix] PSM: File header probing was stricter than actual file loader.
........
[Fix] Fuzzer: Don't return from the AFL loop if we weren't able to load a file.
........
[Fix] PSM: Header probing was still too strict.
........
Modified:
branches/OpenMPT-1.29/ (props changed)
branches/OpenMPT-1.29/contrib/fuzzing/fuzz.cpp
branches/OpenMPT-1.29/soundlib/Load_psm.cpp
Modified: branches/OpenMPT-1.29/contrib/fuzzing/fuzz.cpp
==============================================================================
--- branches/OpenMPT-1.29/contrib/fuzzing/fuzz.cpp Sun Jun 2 16:49:04 2024 (r20906)
+++ branches/OpenMPT-1.29/contrib/fuzzing/fuzz.cpp Sun Jun 2 16:49:22 2024 (r20907)
@@ -63,7 +63,7 @@
OpenMPT::mpt::reinit_global_random();
openmpt_module * mod = openmpt_module_create_from_memory2( fileBuffer, fileSize, nullptr, nullptr, ErrFunc, nullptr, nullptr, nullptr, nullptr);
if ( mod == NULL )
- return 1;
+ break;
// verify API contract: If the file can be loaded, header probing must be successful too.
if ( openmpt_probe_file_header( OPENMPT_PROBE_FILE_HEADER_FLAGS_DEFAULT, fileBuffer, fileSize, fileSize, nullptr, nullptr, ErrFunc, nullptr, nullptr, nullptr ) == OPENMPT_PROBE_FILE_HEADER_RESULT_FAILURE )
Modified: branches/OpenMPT-1.29/soundlib/Load_psm.cpp
==============================================================================
--- branches/OpenMPT-1.29/soundlib/Load_psm.cpp Sun Jun 2 16:49:04 2024 (r20906)
+++ branches/OpenMPT-1.29/soundlib/Load_psm.cpp Sun Jun 2 16:49:22 2024 (r20907)
@@ -234,19 +234,6 @@
{
return ProbeFailure;
}
- PSMChunk chunkHeader;
- if(!file.ReadStruct(chunkHeader))
- {
- return ProbeWantMoreData;
- }
- if(chunkHeader.length == 0)
- {
- return ProbeFailure;
- }
- if((chunkHeader.id & 0x7F7F7F7Fu) != chunkHeader.id) // ASCII?
- {
- return ProbeFailure;
- }
MPT_UNREFERENCED_PARAMETER(pfilesize);
return ProbeSuccess;
}
|
