summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* sonivox: prevent rejection of good but large MIDI filescm-11.0Phil Burk2018-11-131-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 Burk2018-11-133-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-eventakirilov2018-06-071-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)
* Add recursion limit to XMF_ReadNodeRobert Shih2018-02-091-4/+9
| | | | | | | Bug: 68160703 Test: stagefright poc.xmf Change-Id: I1ed8cbbfaf2f26e9d3679898a62669da87a2251d (cherry picked from commit 781ff001b9e734dd4297765b6b0d15f391cb06d9)
* Fix memory leakMarco Nelissen2018-02-091-0/+5
| | | | | | | Bug: 68159767 Test: build Change-Id: Iecbb69e59ccbe33989ad9d76f6826c22cda7724b (cherry picked from commit 2815be21f2f5e8f1d345f35bf9b3a008fc546efa)
* Sonivox: sanity check headerLength in XMF_ReadNode.Wei Jia2018-01-231-0/+3
| | | | | | | | Bug: 23342881 Bug: 35472997 Change-Id: I025338c5f0b39cac89ad786afc69cf085e830568 (cherry picked from commit eefb545f69f6ae1e8b32150dd9a28b73cc751f17) CVE-2017-0644
* Fix interpolatorMarco Nelissen2017-10-011-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)
* Fix infinite recursionMarco Nelissen2017-07-151-0/+7
| | | | | | | | | Bug: 36725407 Test: decoded poc and other files with and without fix AOSP-Change-Id: I9e23b2dbf133321bb01ae47c39761e17e46bd846 (cherry picked from commit ede62341663cf356edb20e3d14424aec767ea66b) Change-Id: I5814c2aa0ff0256583fc3725b75934f883b65593
* Check chunk sizeMarco Nelissen2017-07-091-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) Change-Id: I2ef49d38d52f83e61debea4d9e16988531011819
* eas_mdls: fix OOB read.Wei Jia2017-04-081-1/+6
| | | | | | | | | | | Bug: 34031018 AOSP-Change-Id: I8d373c905f64286b23ec819bdbee51368b12e85a CVE-2017-0541 Change-Id: Ifb1825e25751e98b7f1d5355c5d3d0699ec08be7 (cherry picked from commit 56d153259cc3e16a6a0014199a2317dde333c978) (cherry picked from commit f7b1abeb6bfd9eb404be641ea347cf2b1198140e)
* Fix NULL pointer dereferenceMarco Nelissen2016-10-211-2/+4
| | | | | | | Bug: 29770686 Bug: 23304983 Change-Id: I1648aab90bc281702a00744bf884ae8bb8009412 (cherry picked from commit 6e988ba8325243acbf1a5b60d2ab2f36a9d61199)
* Sonivox: add SafetyNet log.Wei Jia2016-04-052-0/+9
| | | | | | Bug: 26366256 Change-Id: Ief72e01b7cc6d87a015105af847a99d3d9b03cb0 (cherry picked from commit 24d7c408c52143bce7b49de82f3913fd8d1219cf)
* Sonivox: sanity check numSamples.Wei Jia2016-04-052-0/+32
| | | | | Bug: 26366256 Change-Id: I066888c25035ea4c60c88f316db4508dc4dab6bc
* Check segments and libsMarco Nelissen2015-11-091-0/+6
| | | | | Bug: 23286323 Change-Id: I95ee385d0fb1503a4ce5a96e30d034ac8b81170e
* Sonivox: check loopStart/loopLength against one specific wave, not whole ↵Wei Jia2015-11-091-6/+17
| | | | | | | | wave pool. Bug: 23307276 Change-Id: I4c2644feb42c8455be63e48a12ebfc62313cf4cf (cherry picked from commit 9cf7e8775823c4e136a9841d41dcdb5fe4f98173)
* Sonivox: fix overflow in Parse_data in eas_mdls.cWei Jia2015-11-091-0/+24
| | | | | Bug: 23307276 Change-Id: Iea56eae9a1855b41840f8d814717fe6379c5bb4d
* Sonivox: make sure waveIndex is valid in Parse_rgn() in eas_mdls.c.Wei Jia2015-11-091-0/+4
| | | | | | Bug: 23335715 Change-Id: I4a5522c46dcda9285db1f830337aa2642ddc4fd1 (cherry picked from commit 99e0e2e2c1fd0f895b6d4bdf0a85798cf044218e)
* DLS parser: fix wave pool size check.Eric Laurent2015-08-121-1/+1
| | | | | | Bug: 21132860. Change-Id: I8ae872ea2cc2e8fec5fa0b7815f0b6b31ce744ff (cherry picked from commit 2d7f8e1be2241e48458f5d3cab5e90be2b07c699)
* audio: Support for mxmf file playbackcm-11.0-XNPH44S-bacon-5fa8c79c0bcm-11.0-XNPH33R-bacon-3628510d76cm-11.0-XNPH30O-bacon-4f280f505acm-11.0-XNPH25R-bacon-d22b777afacm-11.0-XNPH22R-bacon-03d77315eacm-11.0-XNPH05Q-tomato-9828f8e9cccm-11.0-XNPH05Q-bacon-5229c4ef56stable/cm-11.0-XNG2Sstable/cm-11.0-XNF9Xstable/cm-11.0-XNF8Ystable/cm-11.0shipping/cm-11.0Amit Shekhar2014-05-061-2/+8
| | | | | | | | | -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
* Merge tag 'android-4.4_r1' into cm-11.0Ricardo Cerqueira2013-11-011-2/+1
|\ | | | | | | Android 4.4 Release 1.0
| * remove include of utils/Log.hColin Cross2013-07-231-2/+1
| | | | | | | | | | | | | | Remove the include of utils/Log.h to avoid having to pull in liblog. Add pthread.h because it was getting it implicitly through utils/Log.h. Change-Id: Ib05b2934fe24cbb47eb4daf41cd392830caceeed
* | Merge tag 'android-4.3_r2.1' into cm-10.2cm-10.2.1cm-10.2.0cm-10.2-M1stable/cm-10.2cm-10.2Ricardo Cerqueira2013-07-241-2/+5
|\| | | | | | | Android 4.3 release 2.1
| * am 4a213147: am 274d0571: Merge "Added support for parsing XMF versions 1.00 ↵Jean-Baptiste Queru2012-09-061-17/+28
| |\ | |/ |/| | | | | | | | | and 1.01 headers" * commit '4a213147dbe60416aa26ebdba0f3c631b2e2b013': Added support for parsing XMF versions 1.00 and 1.01 headers
* | am 274d0571: Merge "Added support for parsing XMF versions 1.00 and 1.01 ↵cm-10.1.3-RC2cm-10.1.3-RC1cm-10.1.3cm-10.1.2cm-10.1.1cm-10.1.0-RC5cm-10.1.0-RC4cm-10.1.0-RC3cm-10.1.0-RC2cm-10.1.0-RC1cm-10.1.0cm-10.1-M3cm-10.1-M2cm-10.1-M1mr1.1-stagingcm-10.1Jean-Baptiste Queru2012-09-061-17/+28
|\ \ | | | | | | | | | | | | | | | | | | headers" * commit '274d0571979c10a8c0bfe2641ada32a310248f13': Added support for parsing XMF versions 1.00 and 1.01 headers
| * \ Merge "Added support for parsing XMF versions 1.00 and 1.01 headers"Jean-Baptiste Queru2012-09-061-17/+28
| |\ \
| | * | Added support for parsing XMF versions 1.00 and 1.01 headersAndreas Lillvik2012-09-061-17/+28
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | The parser will parse only parse file type and revision level when parsing XMF version 2.00 headers. XMF versions 1.00 and 1.01 doesn't support file type and revision level in the headers. Change-Id: I883c9e78179fac45db4ab3c4e3d0cbbb2df4899b
| | * am 0eb1fab7: am 09a0c670: Merge "There is fd leak in sonivox lib when try ↵Jean-Baptiste Queru2012-08-151-1/+12
| | |\ | |_|/ |/| | | | | | | | | | | | | | open any media file > 2GB (MIDI parser memory leak)" * commit '0eb1fab72466cd5900470d0a4a2b191722aa9ef5': There is fd leak in sonivox lib when try open any media file > 2GB (MIDI parser memory leak)
* | | am 09a0c670: Merge "There is fd leak in sonivox lib when try open any media ↵Jean-Baptiste Queru2012-08-151-1/+12
|\| | | | | | | | | | | | | | | | | | | | file > 2GB (MIDI parser memory leak)" * commit '09a0c67023c010aec72faa71f116199da4b0f39e': There is fd leak in sonivox lib when try open any media file > 2GB (MIDI parser memory leak)
| * | Merge "There is fd leak in sonivox lib when try open any media file > 2GB ↵Jean-Baptiste Queru2012-08-151-1/+12
| |\ \ | | | | | | | | | | | | (MIDI parser memory leak)"
| | * | There is fd leak in sonivox lib when try open any media filegbhakteX2012-08-141-1/+12
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | > 2GB (MIDI parser memory leak) Midi Parser support only 32 bit file operations and thus files of size less than 2 GB. When file open is called on the Midi parser, for files more than 2GB, internal seek operation fails resulting in the non-closure of the opened file. This resulted in the memory leak of the opened file descriptor. This is fixed by closing the opened file descriptor on failed cases. Change-Id: Ie9f53275206e2b4616d1cfc41c12b90544895548 Author: Muthukumar Kandasamy <muthukumar.kandasamy@intel.com> Signed-off-by: Muthukumar Kandasamy <muthukumar.kandasamy@intel.com> Signed-off-by: Gurudatta Bhakte <gurudattax.bhakte@intel.com> Singed-off-by: Shuo Gao <shuo.gao@intel.com> Signed-off-by: Bruce Beare <bruce.j.beare@intel.com> Signed-off-by: Jack Ren <jack.ren@intel.com> Author-tracking-BZ: 39292
| | * Split out LOCAL_ASFLAGSYing Wang2012-08-101-2/+5
| |/ |/| | | | | | | Bug: 6967574 Change-Id: If114d72b49e1c5aca24c1d92caded7cf8630671d
* | Remove obsolete ThirdPartyProject.prop file.Elliott Hughes2012-05-151-9/+0
|/ | | | Change-Id: I9252bc176a7ac4300d2c1b9e0394638aa773783d
* Fix crash when scanning corrupt midi file.jellybean-stablejellybeanMarco Nelissen2011-12-161-0/+5
| | | | | | b/5453816 Change-Id: Ic2104fc0b86ef0b5ec3af7a009b193f85690d291
* am d868ec62: Reconcile gingerbread-plus-aosp and honeycombThe Android Open Source Project2011-01-300-0/+0
|\ | | | | | | * commit 'd868ec62e3db6f843d5857b2294d2b695b49ed59':
| * Reconcile gingerbread-plus-aosp and honeycombThe Android Open Source Project2011-01-300-0/+0
| |\ | | | | | | | | | Change-Id: I6f6c22bca861de934a539e680a256f4374dece63
| | * Mass merge from gingerbread - do not mergeThe Android Open Source Project2011-01-300-0/+0
| | |\ | | | | | | | | | | | | Change-Id: I38bb9cc71b7b04cb3c71aa06561ed64c3b6a2ce4
| | | * am d029b237: Remove unused file.Dan Bornstein2011-01-280-0/+0
| | |/| | | | | | | | | | | | | | | | | * commit 'd029b2378170cfd7bb34d894482065a762a54578': Remove unused file.
* | | | am fbbe5ab5: am 42196fd1: am cdffe35c: merge from gingerbreadThe Android Open Source Project2011-01-240-0/+0
|\| | | | | | | | | | | | | | | * commit 'fbbe5ab5255f68cc9f0f10f36f680719b82955b6':
| * | | am 42196fd1: am cdffe35c: merge from gingerbreadThe Android Open Source Project2011-01-240-0/+0
| |\ \ \ | | | | | | | | | | | | | | | * commit '42196fd10398c7250af364c0563893d209c8cc15':
| | * \ \ am cdffe35c: merge from gingerbreadThe Android Open Source Project2011-01-210-0/+0
| | |\ \ \ | | | | | | | | | | | | | | | | | | * commit 'cdffe35cb330587b942f7771efad385261a03c83':
| | | * \ \ merge from gingerbreadThe Android Open Source Project2011-01-211-0/+0
| | | |\ \ \ | | | | | |/ | | | | |/| | | | | | | Change-Id: I99e03b97ed48d1cc6cbd4176a55b1e06fc5ca5c1
* | | | | | am 7eaac433: am d2c550cd: am d029b237: Remove unused file.Dan Bornstein2011-01-240-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7eaac4336c6feeabdb1bfdb390865571f73e9a51': Remove unused file.
| * | | | | am d2c550cd: am d029b237: Remove unused file.Dan Bornstein2011-01-240-0/+0
| |\| | | | | | |_|_|/ | |/| | | | | | | | | | | | | * commit 'd2c550cdd59acd54e5c831bcb20cc2ffad020a65': Remove unused file.
| | * | | am d029b237: Remove unused file.Dan Bornstein2011-01-211-0/+0
| | |\ \ \ | | | |/ / | | |/| / | | | |/ | | | | * commit 'd029b2378170cfd7bb34d894482065a762a54578': Remove unused file.
| | | * Remove unused file.cm-7.1.0gingerbread-releasegingerbreadgb-release-7.2Dan Bornstein2011-01-211-0/+0
| | | | | | | | | | | | | | | | Change-Id: Ib50474510f2a95e398e279f34630bdc15b43809c
* | | | am bc636d8f: (-s ours) Remove unused file. DO NOT MERGE.Dan Bornstein2011-01-210-0/+0
|\| | | | | | | | | | | | | | | | | | | * commit 'bc636d8fd6f3f9963e90af0cc5771c249f40084c': Remove unused file. DO NOT MERGE.
| * | | Remove unused file. DO NOT MERGE.Dan Bornstein2011-01-211-0/+0
|/ / / | | | | | | | | | Change-Id: I1a5ee8e70ebfce7d289d0a71ec8af101187c1f21
* | | Fix engine state reporting.Marco Nelissen2010-12-211-2/+2
| | | | | | | | | | | | | | | | | | b/3290604 Change-Id: If1d15499575b1448c6c1c735718c2269b87fae3e
* | | Add missing NOTICE files.David Deephanphongs2010-10-191-0/+14
|/ / | | | | | | | | | | | | Copy the NOTICE file from external/sonivox to external/sonivox/arm-wt-22k, where it will be picked up by the build system. Change-Id: Ieb1c6bbb510b6cc9c375c6250b70d9413aa511a7
* | am 91f74c00: add meta-files about 3rd party projectsThe Android Open Source Project2010-07-161-0/+9
|\| | | | | | | | | | | | | Merge commit '91f74c003b47a98a9af1999fe0caeff1f9678d33' into gingerbread-plus-aosp * commit '91f74c003b47a98a9af1999fe0caeff1f9678d33': add meta-files about 3rd party projects
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-26 12:06:48 +0000