diff options
author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2018-08-21 21:40:54 +0000 |
---|---|---|
committer | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2018-08-21 21:40:54 +0000 |
commit | 2ba5fc650c7676cfa3006d5792377a6cb47df804 (patch) | |
tree | 90a317645ebeef266028962f0f9222292cbc2841 | |
parent | d4b2d8ee49afdcd73172a49b042c93c4acc92a62 (diff) | |
parent | aaf28257f1ca04e10a1f66181abee96b699a8d6a (diff) | |
download | sonivox-2ba5fc650c7676cfa3006d5792377a6cb47df804.tar.gz |
[automerger] sonivox: prevent rejection of good but large MIDI files am: 123051dd02 am: cd77ee58e5 am: b1d2719524 am: aaf28257f1
Change-Id: I24d539e858a9fce473a8ecd06010e1eff405366e
-rw-r--r-- | arm-wt-22k/lib_src/eas_public.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/arm-wt-22k/lib_src/eas_public.c b/arm-wt-22k/lib_src/eas_public.c index d5316c5..1f2fe8a 100644 --- a/arm-wt-22k/lib_src/eas_public.c +++ b/arm-wt-22k/lib_src/eas_public.c @@ -1248,12 +1248,13 @@ static EAS_RESULT EAS_ParseEvents (S_EAS_DATA *pEASData, EAS_HANDLE pStream, EAS EAS_BOOL done; EAS_INT yieldCount = YIELD_EVENT_COUNT; EAS_U32 time = 0; + // This constant is the maximum number of events that can be processed in a single time slice. // A typical ringtone will contain a few events per time slice. // Extremely dense ringtones might go up to 50 events. // If we see this many events then the file is probably stuck in an infinite loop - // and should be aborted. In our testing, it took less than 100 msec to hit this limit. - static const EAS_INT MAX_EVENT_COUNT = 50000; + // and should be aborted. + static const EAS_INT MAX_EVENT_COUNT = 100000; EAS_INT eventCount = 0; /* does this parser have a time function? */ @@ -1309,10 +1310,14 @@ static EAS_RESULT EAS_ParseEvents (S_EAS_DATA *pEASData, EAS_HANDLE pStream, EAS return result; } } - // An infinite loop within a single frame of a ringtone file can cause this function + + // An infinite loop within a ringtone file can cause this function // to loop forever. Try to detect that and return an error. - if (++eventCount >= MAX_EVENT_COUNT) { - ALOGE("%s() aborting, %d events without advancing to next frame", + // Only check when playing. Otherwise a very large file could be rejected + // when scanning the entire file in a single call to this function. + // OTA files will only do infinite loops when in eParserModePlay. + if (++eventCount >= MAX_EVENT_COUNT && parseMode == eParserModePlay) { + ALOGE("%s() aborting, %d events. Infinite loop in song file?!", __func__, eventCount); android_errorWriteLog(0x534e4554, "68664359"); return EAS_ERROR_FILE_POS; |