summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am dedaca6f: Limit allocations to avoid out-of-memoryMarco Nelissen2015-08-231-4/+12
|\ | | | | | | | | * commit 'dedaca6f04ac9f95fabe3b64d44cd1a2050f079e': Limit allocations to avoid out-of-memory
| * Limit allocations to avoid out-of-memoryMarco Nelissen2015-08-211-4/+12
| | | | | | | | | | | | | | | | Corrupt files could cause very large allocations, limit them to something more reasonable. Bug: 17769851 Change-Id: Ib0f722fd6fddff873bd7a547aac456e608c34c84
* | am 3b42241a: Merge "Prevent integer issues in ID3::Iterator::findFrame" into ↵Robert Shih2015-08-221-2/+21
|\ \ | |/ | | | | | | | | | | klp-dev * commit '3b42241aab5855964d1bd60268ae21c2d9cc6065': Prevent integer issues in ID3::Iterator::findFrame
| * Merge "Prevent integer issues in ID3::Iterator::findFrame" into klp-devRobert Shih2015-08-221-2/+21
| |\
| | * Prevent integer issues in ID3::Iterator::findFrameJoshua J. Drake2015-08-211-2/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | Integer overflows could occur a few places within findFrame. These can lead to out-of-bounds reads and potentially infinite loops. Ensure that arithmetic does not wrap around to prevent these behaviors. Bug: 23285192 Change-Id: I72a61df7d5719d1d3f2bd0b37fba86f0f4bbedee
* | | am d8816a13: DO NOT MERGE libstagefright: Fix crash in convertMetaDataToMessageWei Jia2015-08-211-15/+51
|\ \ \ | |/ / | | | | | | | | | * commit 'd8816a13dbcafd5d61d26a8a6b2e892452bca1a7': DO NOT MERGE libstagefright: Fix crash in convertMetaDataToMessage
| * | DO NOT MERGE libstagefright: Fix crash in convertMetaDataToMessageWei Jia2015-08-211-15/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - The ABuffer used for the Message has a preset value of 1024, if flattening the meta data exceeds this value, a check fails hence the crash. - This change creates a new ABuffer if the buffer size would exceed the buffer capacity. Bug: 22771132 CRs-Fixed: 857850 (cherry picked from commit 4bce636865bdf0e2a79fc9a5d9a69107649c850d) Change-Id: Ia0a963e9872f646791e75b710ff9e227a66af4f9
* | | am 8de6d690: Fix build break DO NOT MERGEJeff Tinker2015-08-211-1/+1
|\ \ \ | |/ / | | | | | | | | | * commit '8de6d690ae5843bd8e005deedea571596f79bbd3': Fix build break DO NOT MERGE
| * | Fix build break DO NOT MERGEJeff Tinker2015-08-211-1/+1
| | | | | | | | | | | | | | | | | | related-to-bug: 23223325 Change-Id: I7b09712b5f18912abddd50b75f6edaf860e894c1
* | | am c2153d0d: DO NOT MERGE Part of fix for libmedia OOB write anywhereJeff Tinker2015-08-211-3/+3
|\ \ \ | |/ / | | | | | | | | | * commit 'c2153d0dc800d0718788dccd0f2a2d29f4647c03': DO NOT MERGE Part of fix for libmedia OOB write anywhere
| * | DO NOT MERGE Part of fix for libmedia OOB write anywhereJeff Tinker2015-08-201-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarify that decrypt destination is not a pointer for secure case. b/23223325 Change-Id: I642dcf790a9eb9e32175f3e0d8f040c82228e3ac (cherry picked from commit ed555d70d80964f40563d89a4e6d6a80f83f4b89)
* | | am 5aa887ef: am 59bfb7aa: (-s ours) am 18a8124f: am da0a48d2: (-s ours) am ↵Marco Nelissen2015-08-200-0/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | 6020f066: am b294a97a: am 6cba5819: am 51bfaf6c: am 1afea551: am ce73af07: DO NOT MERGE Fail more gracefully on allocation failure * commit '5aa887ef44238e9a727564fe9051933f8b42e399': DO NOT MERGE Fail more gracefully on allocation failure
| * | am 59bfb7aa: (-s ours) am 18a8124f: am da0a48d2: (-s ours) am 6020f066: am ↵Marco Nelissen2015-08-200-0/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | b294a97a: am 6cba5819: am 51bfaf6c: am 1afea551: am ce73af07: DO NOT MERGE Fail more gracefully on allocation failure * commit '59bfb7aa42ce2404da2547e7852e1a1215c6af22': DO NOT MERGE Fail more gracefully on allocation failure
| | * \ am 18a8124f: am da0a48d2: (-s ours) am 6020f066: am b294a97a: am 6cba5819: ↵Marco Nelissen2015-08-200-0/+0
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 51bfaf6c: am 1afea551: am ce73af07: DO NOT MERGE Fail more gracefully on allocation failure * commit '18a8124f582e9d763670e3bcc6ef6b2b00c4d394': DO NOT MERGE Fail more gracefully on allocation failure
| | | * \ am da0a48d2: (-s ours) am 6020f066: am b294a97a: am 6cba5819: am 51bfaf6c: ↵Marco Nelissen2015-08-200-0/+0
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 1afea551: am ce73af07: DO NOT MERGE Fail more gracefully on allocation failure * commit 'da0a48d2704b231f13dbdb28cc4c4d12b08e3faf': DO NOT MERGE Fail more gracefully on allocation failure
| | | | * \ am 6020f066: am b294a97a: am 6cba5819: am 51bfaf6c: am 1afea551: am ↵Marco Nelissen2015-08-201-6/+16
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ce73af07: DO NOT MERGE Fail more gracefully on allocation failure * commit '6020f06633f8cac09f47e561cc389c5b9b152464': DO NOT MERGE Fail more gracefully on allocation failure
| | | | | * \ am b294a97a: am 6cba5819: am 51bfaf6c: am 1afea551: am ce73af07: DO NOT ↵Marco Nelissen2015-08-201-6/+16
| | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE Fail more gracefully on allocation failure * commit 'b294a97a6fed15d379ce11084166780e7d9dd883': DO NOT MERGE Fail more gracefully on allocation failure
| | | | | | * \ am 6cba5819: am 51bfaf6c: am 1afea551: am ce73af07: DO NOT MERGE Fail more ↵Marco Nelissen2015-08-201-6/+16
| | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gracefully on allocation failure * commit '6cba5819ab84cc58a8273428dcf9ae98c0c9bc42': DO NOT MERGE Fail more gracefully on allocation failure
| | | | | | | * \ am 51bfaf6c: am 1afea551: am ce73af07: DO NOT MERGE Fail more gracefully on ↵Marco Nelissen2015-08-201-6/+16
| | | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | allocation failure * commit '51bfaf6cf74498f92cd400e4d5b3d55b04fc7a06': DO NOT MERGE Fail more gracefully on allocation failure
| | | | | | | | * \ am 1afea551: am ce73af07: DO NOT MERGE Fail more gracefully on allocation ↵Marco Nelissen2015-08-201-6/+16
| | | | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | failure * commit '1afea5517477554f452396c29db375e34d108f89': DO NOT MERGE Fail more gracefully on allocation failure
| | | | | | | | | * \ am ce73af07: DO NOT MERGE Fail more gracefully on allocation failureMarco Nelissen2015-08-201-6/+16
| | | | | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ce73af077199122e0e5a80b019f949d0f181410f': DO NOT MERGE Fail more gracefully on allocation failure
| | | | | | | | | | * | DO NOT MERGE Fail more gracefully on allocation failureMarco Nelissen2015-08-201-6/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check allocations when the size is read from a file and might therefore be invalid. b/14388161 Change-Id: Ia08cc0a6107f275a70e793ef3b50c0ce16ceeee0
* | | | | | | | | | | | resolved conflicts for merge of 8a064aa8 to klp-modular-devMarco Nelissen2015-08-201-7/+19
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If031955c9edca657401831fbfa5a128f0b4c6d86
| * | | | | | | | | | | Merge "Fail more gracefully on allocation failure" into klp-devMarco Nelissen2015-08-201-7/+20
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Fail more gracefully on allocation failureMarco Nelissen2015-08-191-7/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check allocations when the size is read from a file and might therefore be invalid. b/14388161 Change-Id: Ia08cc0a6107f275a70e793ef3b50c0ce16ceeee0
* | | | | | | | | | | | | am 522019f1: Merge "libstagefright: fix handling of mSampleTimeEntries and ↵Wei Jia2015-08-201-1/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mNumSampleSizes in SampleTable." into klp-dev * commit '522019f15b3c191b73d1a0ddb56aeb3dd6b7ce31': libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable.
| * | | | | | | | | | | | Merge "libstagefright: fix handling of mSampleTimeEntries and ↵Wei Jia2015-08-201-1/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mNumSampleSizes in SampleTable." into klp-dev
| | * | | | | | | | | | | | libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in ↵Wei Jia2015-08-191-1/+13
| | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SampleTable. Bug: 23247055 Change-Id: I29ef59c7ff09248063714e5013f7c33f66c5eebd (cherry picked from commit 3564c4562f46bede6ef1ea716c4fd4f77e470ae8)
* | | | | | | | | | | | | am 635d38a8: Merge "Check RTSP payload length" into klp-devAbhishek Arya2015-08-201-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '635d38a84414e26aaf6c4b5df7859fde196adeaf': Check RTSP payload length
| * | | | | | | | | | | | Merge "Check RTSP payload length" into klp-devAbhishek Arya2015-08-201-2/+3
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Check RTSP payload lengthMarco Nelissen2015-08-191-2/+3
| | | |/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 23346388 Change-Id: Ifd918cefc90527c2f52177c3ce0da7a13259ad08
* | | | | | | | | | | | | am 2c880dde: Merge "Sanity check padding/delay values for gapless playback" ↵Abhishek Arya2015-08-201-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into klp-dev * commit '2c880dde90e4303f9201f46124ee879325c57ba0': Sanity check padding/delay values for gapless playback
| * | | | | | | | | | | | Merge "Sanity check padding/delay values for gapless playback" into klp-devAbhishek Arya2015-08-201-0/+7
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Sanity check padding/delay values for gapless playbackMarco Nelissen2015-08-181-0/+7
| | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 23306638 Change-Id: I2b5160e0f58f90d3f67c3964f41f5734ec0da053
* | | | | | | | | | | | | Merge commit '6ae815e0' into HEADWei Jia2015-08-201-1/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libstagefright: fix overflow in MPEG4Source::parseSampleAuxiliaryInformationOffsets. Bug: 23270724 (cherry picked from commit c51ab7dd82bf4e24666fc72a55e03e2f530204d5) Change-Id: I44c642548ee6ba3745fb1f46d8645bece231035a
| * | | | | | | | | | | | Merge "libstagefright: fix overflow in ↵Wei Jia2015-08-201-1/+19
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MPEG4Source::parseSampleAuxiliaryInformationOffsets." into klp-dev
| | * | | | | | | | | | | | libstagefright: fix overflow in ↵Wei Jia2015-08-201-1/+19
| | | |/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MPEG4Source::parseSampleAuxiliaryInformationOffsets. Bug: 23270724 Change-Id: Id7ba55c7bf6860fbfc892bbb6378aac644c82da4 (cherry picked from commit c51ab7dd82bf4e24666fc72a55e03e2f530204d5)
* | | | | | | | | | | | | am b2ae4351: libstagefright: fix overflow in pvdec_api.cpp.Wei Jia2015-08-201-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b2ae4351539de9aa4667fcb3e02ba40d9c6bd094': libstagefright: fix overflow in pvdec_api.cpp.
| * | | | | | | | | | | | libstagefright: fix overflow in pvdec_api.cpp.Wei Jia2015-08-201-2/+2
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 20674086 Change-Id: Ie2c711865c3b92f3fa2f3c7a436fa0e3687eb8b3 (cherry picked from commit d7bb1cd786e5ea4ac61119cc1a08082474f7787b)
* | | | | | | | | | | | am 916a9684: Merge "DO NOT MERGE - audio flinger: fix fuzz test crash" into ↵Eric Laurent2015-08-183-6/+21
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-dev * commit '916a9684295fb578f4b3c6c16b621ef201a49964': DO NOT MERGE - audio flinger: fix fuzz test crash
| * | | | | | | | | | | Merge "DO NOT MERGE - audio flinger: fix fuzz test crash" into klp-devEric Laurent2015-08-183-6/+21
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | DO NOT MERGE - audio flinger: fix fuzz test crashEric Laurent2015-08-173-6/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clear output stream pointer in duplicating thread when the main output to which it is attached is closed. Also do not forward master mute and volume commands to duplicating threads as this is not applicable. Also fix logic in AudioFlinger::primaryPlaybackThread_l() that could accidentally return a duplicating thread. This never happens because the primary thread is always first in the list. Bug: 20731946. Change-Id: Ic8869699836920351b23d09544c50a258d3fb585
* | | | | | | | | | | | | am 877c76ac: Merge "stagefright: check IMemory::pointer() before using the ↵Chong Zhang2015-08-181-2/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | allocation" into klp-dev * commit '877c76ac42701859fb8185f05c4724a06867fc07': stagefright: check IMemory::pointer() before using the allocation
| * | | | | | | | | | | | Merge "stagefright: check IMemory::pointer() before using the allocation" ↵Chong Zhang2015-08-181-2/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | into klp-dev
| | * | | | | | | | | | | stagefright: check IMemory::pointer() before using the allocationChong Zhang2015-08-171-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 19779574 Change-Id: I4ffe8c3fadc07da211f421e75ee83010b01d9cbb
* | | | | | | | | | | | | am f97b6bee: Merge "Check integer overflow to prevent memory corruption" ↵Jon Larimer2015-08-181-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into klp-dev * commit 'f97b6beeb2e2f0977d1c7fa8d2aaafe4e2f4d68a': Check integer overflow to prevent memory corruption
| * | | | | | | | | | | | Merge "Check integer overflow to prevent memory corruption" into klp-devJon Larimer2015-08-181-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Check integer overflow to prevent memory corruptionJeff Tinker2015-08-161-1/+2
| | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 23016072 Change-Id: If3c9a835408773847c0024a812bd8b4915ebd680 (cherry picked from commit fa8ebb45fd850f56ca1bf64fbed3ac11e10c7d3d)
* | | | | | | | | | | | | am 2ed42aea: Merge "do not dequeue from native window after we hit fatal ↵Jon Larimer2015-08-182-0/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | error -- DO NOT MERGE" into klp-dev * commit '2ed42aea9c6fbca4bde52d647ff082b997b5968c': do not dequeue from native window after we hit fatal error -- DO NOT MERGE
| * | | | | | | | | | | | Merge "do not dequeue from native window after we hit fatal error -- DO NOT ↵Jon Larimer2015-08-182-0/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE" into klp-dev
generated by cgit v1.1 at 2024-12-25 21:38:15 +0000