mirrors
/
flac
mirror of https://github.com/xiph/flac
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix initialization of decoder fuzzer 

The decoder fuzzer initialized before setting up. This is now swapped
without upsetting the way the datasource is queried
This commit is contained in:
Martijn van Beurden 2022-05-18 11:04:45 +02:00
parent e5e99dcdc2
commit 9e8d7389dc
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
oss-fuzz/fuzzer_decoder.cc
View File

@ -171,22 +171,12 @@ namespace FLAC {
extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
fuzzing::datasource::Datasource ds(data, size);
FLAC::Decoder::FuzzerStream decoder(ds);
bool use_ogg = true;
try {
{
::FLAC__StreamDecoderInitStatus ret;
if ( ds.Get<bool>() ) {
ret = decoder.init();
} else {
ret = decoder.init_ogg();
}
if ( ret != FLAC__STREAM_DECODER_INIT_STATUS_OK ) {
goto end;
}
if ( ds.Get<bool>() ) {
use_ogg = false;
}
if ( ds.Get<bool>() ) {
#ifdef FUZZER_DEBUG
printf("set_ogg_serial_number\n");
@ -245,6 +235,18 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
#endif
decoder.set_metadata_ignore_all();
}
{
::FLAC__StreamDecoderInitStatus ret;
if ( !use_ogg ) {
ret = decoder.init();
} else {
ret = decoder.init_ogg();
}
if ( ret != FLAC__STREAM_DECODER_INIT_STATUS_OK ) {
goto end;
}
}
while ( ds.Get<bool>() ) {
switch ( ds.Get<uint8_t>() ) {