summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* sonivox: prevent rejection of good but large MIDI filesHEADreplicant-6.0-0004-transitionreplicant-6.0-0004-rc6replicant-6.0-0004-rc5-transitionreplicant-6.0-0004-rc5replicant-6.0-0004-rc4replicant-6.0-0004-rc3replicant-6.0-0004-rc2replicant-6.0-0004cm-13.0Phil Burk2019-01-151-5/+10
| | | | | | | | | | | | | | | | | | | | | A security patch that was trying to detect infinite loops was accidentally rejecting very large MIDI files. This is because there is a scanning pass that looks at the entire file. That was generating a very high eventCount. With this change, we do not check event counts during the scanning pass. Bug: 112735915 Bug: 112575219 Bug: 68664359 Test: Generate a MIDI files with more than 50000 events. Test: There are some in b/112735915 and b/112575219 Test: mmma frameworks/av/cmds/stagefright Test: adb push out/target/product/marlin/system/bin/stagefright /system/bin/. Test: adb shell stagefright -a /sdcard/Download/verybigfile.mid Test: It should play correctly and not abort. Change-Id: Iddf2f5b178e9ca3867b14fcd78d538023d79240d Merged-In: Iddf2f5b178e9ca3867b14fcd78d538023d79240d (cherry picked from commit 123051dd0271ac0f245cb88c38878c6b21880632)
* sonivox: prevent infinite loop in OTA ringtonesPhil Burk2019-01-153-5/+36
| | | | | | | | | | | | | This detects and blocks infinite loops in corrupt files. Bug: 68664359 Bug: 110435401 Test: cts-tradefed run cts -m CtsSecurityTestCases -t android.security.cts.StagefrightTest#testStagefright_bug_68664359 Test: cts-tradefed run cts -m CtsSecurityTestCases -t android.security.cts.StagefrightTest#testStagefright_bug_110435401 Change-Id: I67652fbcc8b0812a838ae6551d0be2770a655c95 Merged-In: I67652fbcc8b0812a838ae6551d0be2770a655c95
* sonivox: fix hang caused by bad meta-eventreplicant-6.0-0004-rc1akirilov2018-06-081-0/+16
| | | | | | | | | | | | | Bug: 69804002 Bug: 68953854 Bug: 68664359 Test: cts-tradefed run cts --class android.security.cts.StagefrightTest --method testStagefright_bug_68953854 Change-Id: I29e5ffd6f5be25180d7ed65806480257d79a884d Merged-In: I19b3ca2d66866039b199d2049c6234df51797b3c (cherry picked from commit ba9ea234666052f8415194966bcd242ea6fecf0e) CVE-2018-9347, CVE-2018-9348
* Add recursion limit to XMF_ReadNodeRobert Shih2018-02-081-4/+9
| | | | | | | | Bug: 68160703 Test: stagefright poc.xmf Change-Id: I1ed8cbbfaf2f26e9d3679898a62669da87a2251d (cherry picked from commit 781ff001b9e734dd4297765b6b0d15f391cb06d9) CVE-2017-13229
* Fix memory leakMarco Nelissen2018-02-081-0/+5
| | | | | | | | Bug: 68159767 Test: build Change-Id: Iecbb69e59ccbe33989ad9d76f6826c22cda7724b (cherry picked from commit 2815be21f2f5e8f1d345f35bf9b3a008fc546efa) CVE-2017-13234
* Sonivox: sanity check headerLength in XMF_ReadNode.Wei Jia2018-02-081-0/+3
| | | | | | | | Bug: 23342881 Bug: 35472997 Change-Id: I025338c5f0b39cac89ad786afc69cf085e830568 (cherry picked from commit eefb545f69f6ae1e8b32150dd9a28b73cc751f17) CVE-2017-0644
* Fix interpolatorreplicant-6.0-0003Marco Nelissen2017-09-151-0/+9
| | | | | | | | | | | If the phase increment was larger than the loop size, the interpolator would read further and further outside the sample, eventually segfaulting. Bug: 38342499 Test: manual Change-Id: I0e70d037e61fdeffdbd49460caa692e9781cc511 (cherry picked from commit d19edc9c090d64926469463991ca7e86c73368fa) CVE-2017-0777
* Check chunk sizereplicant-6.0-0002Marco Nelissen2017-07-071-0/+5
| | | | | | | | | | | | to make sure we actually advance in the file Bug: 37093318 Test: decoded poc and other files with and without change AOSP-Change-Id: I94cf65336ce4132c17c39b651dc520264f02a704 (cherry picked from commit f01750adb0558d1885c7d5a5c8900d2187d0d38d) CVE-2017-0694 Change-Id: I3627f73dccfbb04dd744475c96e5532302b8196a
* Fix infinite recursionMarco Nelissen2017-07-071-0/+7
| | | | | | | | | | | Bug: 36725407 Test: decoded poc and other files with and without fix AOSP-Change-Id: I9e23b2dbf133321bb01ae47c39761e17e46bd846 (cherry picked from commit ede62341663cf356edb20e3d14424aec767ea66b) CVE-2017-0692 Change-Id: I72d0426fc73b390b31b152709ab2e810076827ee
* eas_mdls: fix OOB read.replicant-6.0-0001Wei Jia2017-04-051-1/+6
| | | | | | | | | | Bug: 34031018 AOSP-Change-Id: I8d373c905f64286b23ec819bdbee51368b12e85a CVE-2017-0541 Change-Id: Ifb1825e25751e98b7f1d5355c5d3d0699ec08be7 (cherry picked from commit 56d153259cc3e16a6a0014199a2317dde333c978)
* Merge tag 'android-6.0.1_r72' into HEADJessica Wagantall2016-10-060-0/+0
|\ | | | | | | | | | | | | Android 6.0.1 Release 72 (M4B30X) # gpg: Signature made Tue 04 Oct 2016 09:47:39 AM PDT using DSA key ID 9AB10E78 # gpg: Can't check signature: public key not found
| * Fix NULL pointer dereferenceMarco Nelissen2016-08-161-2/+4
| | | | | | | | | | | | Bug: 29770686 Bug: 23304983 Change-Id: I1648aab90bc281702a00744bf884ae8bb8009412
* | Merge tag 'android-6.0.1_r66' into HEADJessica Wagantall2016-09-071-2/+4
|\ \ | | | | | | | | | | | | | | | | | | Android 6.0.1 release 66 # gpg: Signature made Tue 06 Sep 2016 09:26:38 AM PDT using DSA key ID 9AB10E78 # gpg: Can't check signature: public key not found
| * | Fix NULL pointer dereferenceMarco Nelissen2016-07-211-2/+4
| |/ | | | | | | | | | | Bug: 29770686 Bug: 23304983 Change-Id: I1648aab90bc281702a00744bf884ae8bb8009412
* | Merge tag 'android-6.0.1_r30' into HEADJessica Wagantall2016-04-180-0/+0
|\| | | | | | | | | Ticket: RM-234 Android 6.0.1 release 30
| * Sonivox: add SafetyNet log.Wei Jia2016-02-262-0/+9
| | | | | | | | | | Bug: 26366256 Change-Id: Ief72e01b7cc6d87a015105af847a99d3d9b03cb0
| * Sonivox: sanity check numSamples.Wei Jia2016-02-262-0/+32
| | | | | | | | | | Bug: 26366256 Change-Id: I066888c25035ea4c60c88f316db4508dc4dab6bc
* | Merge tag 'android-6.0.1_r22' of ↵staging/cm-13.0+r22Steve Kondik2016-03-102-0/+41
|\ \ | | | | | | | | | | | | | | | https://android.googlesource.com/platform/external/sonivox into cm-13.0 Android 6.0.1 release 22
| * \ Sonivox: add SafetyNet log. am: 24d7c408c5 am: f3f1da3028Wei Jia2016-01-132-0/+9
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | am: 95a4f1d4af * commit '95a4f1d4af0118e9f7cdd8852b7445fb837aba57': Sonivox: add SafetyNet log.
| | * \ Sonivox: add SafetyNet log. am: 24d7c408c5Wei Jia2016-01-132-0/+9
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: f3f1da3028 * commit 'f3f1da3028f61b7026c80a150cc40db52885ab8e': Sonivox: add SafetyNet log.
| | | * \ Sonivox: add SafetyNet log.Wei Jia2016-01-132-0/+9
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 24d7c408c5 * commit '24d7c408c52143bce7b49de82f3913fd8d1219cf': Sonivox: add SafetyNet log.
| | | | * | Sonivox: add SafetyNet log.Wei Jia2016-01-122-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 26366256 Change-Id: Ief72e01b7cc6d87a015105af847a99d3d9b03cb0
| * | | | | Sonivox: sanity check numSamples. am: 3ac044334c am: 7ddf08ce3bWei Jia2016-01-062-0/+32
| |\| | | | | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | am: 68ea08e38a * commit '68ea08e38ae022a548cde64b6c71a8cb608c799f': Sonivox: sanity check numSamples.
| | * | | Sonivox: sanity check numSamples. am: 3ac044334cWei Jia2016-01-062-0/+32
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 7ddf08ce3b * commit '7ddf08ce3b31d4eff8a05c5001c9af084baad533': Sonivox: sanity check numSamples.
| | | * | Sonivox: sanity check numSamples.Wei Jia2016-01-062-0/+32
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 3ac044334c * commit '3ac044334c3ff6a61cb4238ff3ddaf17c7efcf49': Sonivox: sanity check numSamples.
| | | | * Sonivox: sanity check numSamples.Wei Jia2016-01-062-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 26366256 Change-Id: I066888c25035ea4c60c88f316db4508dc4dab6bc
* | | | | Merge tag 'android-6.0.1_r3' of ↵Steve Kondik2015-12-070-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://android.googlesource.com/platform/external/sonivox into HEAD Android 6.0.1 release 3
| * | | | am 23eb37d0: am 515e28dd: am a12313fe: Fix S_SMF_DATA.numStreams being ↵Wonsik Kim2015-09-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | non-zero while streams is uninitialized * commit '23eb37d08f13fe570632bd26b4f2a830f16c1983': Fix S_SMF_DATA.numStreams being non-zero while streams is uninitialized
| | * | | am 515e28dd: am a12313fe: Fix S_SMF_DATA.numStreams being non-zero while ↵Wonsik Kim2015-09-031-7/+13
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | streams is uninitialized * commit '515e28ddbaed3b24ba9a76d2ff1ba1ad48a590a6': Fix S_SMF_DATA.numStreams being non-zero while streams is uninitialized
| | | * | am a12313fe: Fix S_SMF_DATA.numStreams being non-zero while streams is ↵Wonsik Kim2015-09-031-7/+13
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | uninitialized * commit 'a12313fe89f99a51e8d166209833ac89045ebf70': Fix S_SMF_DATA.numStreams being non-zero while streams is uninitialized
| | | | * Fix S_SMF_DATA.numStreams being non-zero while streams is uninitializedWonsik Kim2015-09-021-7/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let S_SMF_DATA.numStreams set after S_SMF_DATA.streams is initialized. Bug: 23528803 Change-Id: Ie45156a03ec6700a9b0971626eb08cb5c9cdab6e
* | | | | Merge tag 'android-6.0.0_r26' into cm-13.0Ricardo Cerqueira2015-11-051-7/+13
|\| | | | | | | | | | | | | | | | | | | Android 6.0.0 release 26
| * | | | Fix S_SMF_DATA.numStreams being non-zero while streams is uninitializedWonsik Kim2015-08-311-7/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let S_SMF_DATA.numStreams set after S_SMF_DATA.streams is initialized. Bug: 23528803 Change-Id: Ie45156a03ec6700a9b0971626eb08cb5c9cdab6e
| * | | | am ca243752: am 5f9b2131: am f333a822: Sonivox: check loopStart/loopLength ↵Wei Jia2015-08-240-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | against one specific wave, not whole wave pool. * commit 'ca243752c451ef65444511efc63b302ad9ff0853': Sonivox: check loopStart/loopLength against one specific wave, not whole wave pool.
| | * | | am 5f9b2131: am f333a822: Sonivox: check loopStart/loopLength against one ↵Wei Jia2015-08-241-6/+17
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | specific wave, not whole wave pool. * commit '5f9b21319a071e3bb0a5218db675acbe9cb017ef': Sonivox: check loopStart/loopLength against one specific wave, not whole wave pool.
| | | * | am f333a822: Sonivox: check loopStart/loopLength against one specific wave, ↵Wei Jia2015-08-231-6/+17
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not whole wave pool. * commit 'f333a822c38c3d92f40e8f1686348e6a62c2912c': Sonivox: check loopStart/loopLength against one specific wave, not whole wave pool.
| | | | * Sonivox: check loopStart/loopLength against one specific wave, not whole ↵Wei Jia2015-08-221-6/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wave pool. Bug: 23307276 Change-Id: I4c2644feb42c8455be63e48a12ebfc62313cf4cf (cherry picked from commit 9cf7e8775823c4e136a9841d41dcdb5fe4f98173)
* | | | | audio: Miscellaneous fixes in external/sonivoxAmit Shekhar2015-10-062-6/+12
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support for mxmf file playback -mxmf files couldn't be played. -Added a condition check, in DLSParser(), to warn user if artCount is 0 and to use default articulations. CRs-Fixed: 465437 Change-Id: I42b1634c65e3779ee7924913cc17020bde9cc38d midi decoder lib state is not updated on midiplayer stop - On EAS_Pause() STREAM_FLAGS_PAUSE is added to streamFlags, but EAS_State() returns SUCCESS before checking for streamFlags and updating midiplayers state. - Fix is to check for streamFlags for STREAM_FLAGS_PAUSE and update midiplayers state before returning SUCCESS. CRs-Fixed: 633774 Change-Id: Ie8845633f27f05c4917045dcf7cc2b3219c13ef6
* | | | Sonivox: check loopStart/loopLength against one specific wave, not whole ↵Wei Jia2015-08-211-6/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | wave pool. Bug: 23307276 Change-Id: I4c2644feb42c8455be63e48a12ebfc62313cf4cf
* | | | am 70942a97: am 37ede8b5: am 5d2e7de3: Sonivox: fix overflow in Parse_data ↵Wei Jia2015-08-210-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | in eas_mdls.c * commit '70942a9711aa8afb0d9770ffde42c2e784cb21e3': Sonivox: fix overflow in Parse_data in eas_mdls.c
| * | | am 37ede8b5: am 5d2e7de3: Sonivox: fix overflow in Parse_data in eas_mdls.cWei Jia2015-08-211-0/+24
| |\| | | | | | | | | | | | | | | | | | * commit '37ede8b5404f89e496638be92c83fec51d2b60e9': Sonivox: fix overflow in Parse_data in eas_mdls.c
| | * | am 5d2e7de3: Sonivox: fix overflow in Parse_data in eas_mdls.cWei Jia2015-08-211-0/+24
| | |\| | | | | | | | | | | | | | | | | * commit '5d2e7de37d4a28cf25cc5d0c64b3a29c1824dc0a': Sonivox: fix overflow in Parse_data in eas_mdls.c
| | | * Sonivox: fix overflow in Parse_data in eas_mdls.cWei Jia2015-08-211-0/+24
| | | | | | | | | | | | | | | | | | | | Bug: 23307276 Change-Id: Iea56eae9a1855b41840f8d814717fe6379c5bb4d
* | | | Merge "Sonivox: fix overflow in Parse_data in eas_mdls.c" into mnc-devAbhishek Arya2015-08-211-0/+24
|\ \ \ \
| * | | | Sonivox: fix overflow in Parse_data in eas_mdls.cWei Jia2015-08-201-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 23307276 Change-Id: Iea56eae9a1855b41840f8d814717fe6379c5bb4d
* | | | | am 892c138a: am ed1104cf: am 8cbef48b: Sonivox: make sure waveIndex is valid ↵Wei Jia2015-08-210-0/+0
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | in Parse_rgn() in eas_mdls.c. * commit '892c138acd55a3080cf2c9cdd2b9aa8c51e58e54': Sonivox: make sure waveIndex is valid in Parse_rgn() in eas_mdls.c.
| * | | | am ed1104cf: am 8cbef48b: Sonivox: make sure waveIndex is valid in ↵Wei Jia2015-08-211-0/+4
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | Parse_rgn() in eas_mdls.c. * commit 'ed1104cffb20d4b88a73c4fc348dcbdb8b48a105': Sonivox: make sure waveIndex is valid in Parse_rgn() in eas_mdls.c.
| | * | | am 8cbef48b: Sonivox: make sure waveIndex is valid in Parse_rgn() in eas_mdls.c.Wei Jia2015-08-211-0/+4
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | * commit '8cbef48ba6e3d3f844b895f8ca1a1aee74414fff': Sonivox: make sure waveIndex is valid in Parse_rgn() in eas_mdls.c.
| | | * | Sonivox: make sure waveIndex is valid in Parse_rgn() in eas_mdls.c.Wei Jia2015-08-201-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 23335715 Change-Id: I4a5522c46dcda9285db1f830337aa2642ddc4fd1 (cherry picked from commit 99e0e2e2c1fd0f895b6d4bdf0a85798cf044218e)
* | | | | Merge "Sonivox: make sure waveIndex is valid in Parse_rgn() in eas_mdls.c." ↵Wei Jia2015-08-201-0/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | into mnc-dev
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-26 07:20:04 +0000