aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [automerger skipped] Fix heap buffer overflow in ↵Fraunhofer IIS FDK2020-09-090-0/+0
|\ | | | | | | | | | | | | | | | | | | sbrDecoder_AssignQmfChannels2SbrChannels(). am: bb8f983bf3 am: 33ea26a8d9 -s ours am: 87f3b1561f -s ours am: ad07d8d7a7 -s ours am skip reason: Change-Id I0150ac6d5a47ffce883010f531928656eebc619e with SHA-1 bb8f983bf3 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12087395 Change-Id: I85861e378c63aa4ae7a4e00927699bdb599b9fc1
| * [automerger skipped] Fix heap buffer overflow in ↵Fraunhofer IIS FDK2020-09-090-0/+0
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | sbrDecoder_AssignQmfChannels2SbrChannels(). am: bb8f983bf3 am: 33ea26a8d9 -s ours am: 87f3b1561f -s ours am skip reason: Change-Id I0150ac6d5a47ffce883010f531928656eebc619e with SHA-1 bb8f983bf3 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12087395 Change-Id: I2492f6df370ca3c624ed826bfa7966cfe640b824
| | * [automerger skipped] Fix heap buffer overflow in ↵Fraunhofer IIS FDK2020-09-090-0/+0
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sbrDecoder_AssignQmfChannels2SbrChannels(). am: bb8f983bf3 am: 33ea26a8d9 -s ours am skip reason: Change-Id I0150ac6d5a47ffce883010f531928656eebc619e with SHA-1 bb8f983bf3 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12087395 Change-Id: I9493bb636397e8d30f8eb7f71ff67b7578df0da6
| | | * Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels(). am: ↵Fraunhofer IIS FDK2020-09-091-6/+6
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bb8f983bf3 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12087395 Change-Id: Iddc8a0642d6a5bf1f84edb74f943b5dddd1fb7fd
* | | | | [automerger skipped] Fix heap buffer overflow in ↵Fraunhofer IIS FDK2020-09-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sbrDecoder_AssignQmfChannels2SbrChannels(). am: bb8f983bf3 am: f007f6a4bc am: a5a3ef611c am: 11b611293f -s ours am skip reason: Change-Id I0150ac6d5a47ffce883010f531928656eebc619e with SHA-1 b5dfe8f92d is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12087395 Change-Id: I57c6bc9112310950a995e2b460d7973c7b58d055
| * | | | Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels(). am: ↵Fraunhofer IIS FDK2020-09-091-6/+6
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bb8f983bf3 am: f007f6a4bc am: a5a3ef611c Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12087395 Change-Id: I19cbfb6b908a878ce59e8c6869ba9c5957d10075
| | * | | Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels(). am: ↵Fraunhofer IIS FDK2020-09-091-6/+6
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bb8f983bf3 am: f007f6a4bc Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12087395 Change-Id: I28c773eab019d0e518d34a26a9493811c8c1afea
| | | * \ \ Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels(). am: ↵Fraunhofer IIS FDK2020-09-091-6/+6
| | | |\ \ \ | | | | | |/ | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bb8f983bf3 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12087395 Change-Id: I85ffb1d0e64c206a805e36169e6d6b664924cc48
| | | | * | Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels().Fraunhofer IIS FDK2020-09-091-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the bug the SBR decoder has already set up 9 channels and tries to allocate one more channel. The assignment of the QMF channels to SBR channels fails since the QMF domain manages only 8+1 channels instead of 10 channels as reqeusted by SBR. Here we have added a check in sbrDecoder_InitElement() which will return with a parse error in case additional SBR channels would exceed the maximum number of SBR channels. This solves the potential heap buffer overflow. Bug: 158762825 Test: atest DecoderTestAacDrc DecoderTestAacFormat DecoderTestXheAac Change-Id: I0150ac6d5a47ffce883010f531928656eebc619e Merged-In: I0150ac6d5a47ffce883010f531928656eebc619e
* | | | | | [automerger skipped] Merge Android R ↵Xin Li2020-09-020-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (rvc-dev-plus-aosp-without-vendor@6692709) am: 7a0dde5d5d -s ours am: 389ba21eed -s ours am: 016718d3fd -s ours am: 3f82e7e794 -s ours am skip reason: Change-Id I9bd31724ae68b9a0b3eb4bb5be3782359824aa1f with SHA-1 e0624f4c05 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12470067 Change-Id: I4b098981a68a33cdb6a20a08481cea8d8d8f09fa
| * | | | | [automerger skipped] Merge Android R ↵Xin Li2020-09-010-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (rvc-dev-plus-aosp-without-vendor@6692709) am: 7a0dde5d5d -s ours am: 389ba21eed -s ours am: 016718d3fd -s ours am skip reason: Change-Id I9bd31724ae68b9a0b3eb4bb5be3782359824aa1f with SHA-1 e0624f4c05 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12470067 Change-Id: If53b20173eefcedbe2a0eb7af822536437a97895
| | * | | | [automerger skipped] Merge Android R ↵Xin Li2020-09-010-0/+0
| | |\ \ \ \ | | | | |_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (rvc-dev-plus-aosp-without-vendor@6692709) am: 7a0dde5d5d -s ours am: 389ba21eed -s ours am skip reason: Change-Id I9bd31724ae68b9a0b3eb4bb5be3782359824aa1f with SHA-1 e0624f4c05 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12470067 Change-Id: I793eca95e3242a6c71ea4ae8e3592a906363c515
| | | * | | [automerger skipped] Merge Android R ↵Xin Li2020-09-010-0/+0
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (rvc-dev-plus-aosp-without-vendor@6692709) am: 7a0dde5d5d -s ours am skip reason: Change-Id I9bd31724ae68b9a0b3eb4bb5be3782359824aa1f with SHA-1 e0624f4c05 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12470067 Change-Id: I96f0085bd119bdb9733ac647ffb40ee40893e931
| | | | * \ \ Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)Xin Li2020-08-2798-2107/+2228
| | | | |\ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | Bug: 166295507 Merged-In: I9bd31724ae68b9a0b3eb4bb5be3782359824aa1f Change-Id: Idcdb13a8c37b0b4b5446169c3e80dfe55586bc77
* | | | | | | Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels().Fraunhofer IIS FDK2020-08-101-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the bug the SBR decoder has already set up 9 channels and tries to allocate one more channel. The assignment of the QMF channels to SBR channels fails since the QMF domain manages only 8+1 channels instead of 10 channels as reqeusted by SBR. Here we have added a check in sbrDecoder_InitElement() which will return with a parse error in case additional SBR channels would exceed the maximum number of SBR channels. This solves the potential heap buffer overflow. Bug: 158762825 Test: atest DecoderTestAacDrc DecoderTestAacFormat DecoderTestXheAac Change-Id: I0150ac6d5a47ffce883010f531928656eebc619e
* | | | | | | Merge "Improve code coverage for aac_dec_fuzzer" am: 760e8921c2 am: ↵Jean-Michel Trivi2020-07-101-5/+61
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 946a672b0f am: e0624f4c05 am: 73da86e336 am: ef38dee702 Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1324135 Change-Id: Iccefe7e42136aeb8d2882666cdfc3337c2db2043
| * | | | | | Merge "Improve code coverage for aac_dec_fuzzer" am: 760e8921c2 am: ↵Jean-Michel Trivi2020-07-101-5/+61
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 946a672b0f am: e0624f4c05 am: 73da86e336 Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1324135 Change-Id: I68267add047f0ea432e5f83e1fbd5d673ba21715
| | * | | | | Merge "Improve code coverage for aac_dec_fuzzer" am: 760e8921c2 am: ↵Jean-Michel Trivi2020-07-101-5/+61
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 946a672b0f am: e0624f4c05 Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1324135 Change-Id: Icfe1613791fb53502d99e3030dd9e9baa3fa5c33
| | | * | | | Merge "Improve code coverage for aac_dec_fuzzer" am: 760e8921c2 am: 946a672b0fJean-Michel Trivi2020-07-101-5/+61
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1324135 Change-Id: I9bd31724ae68b9a0b3eb4bb5be3782359824aa1f
| | | | * | | Merge "Improve code coverage for aac_dec_fuzzer" am: 760e8921c2Jean-Michel Trivi2020-07-101-5/+61
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1324135 Change-Id: I49925ff2d6e55f0def55bf012f7ff3f33cacea4e
| | | | | * | | Merge "Improve code coverage for aac_dec_fuzzer"Jean-Michel Trivi2020-07-101-5/+61
| | | | |/| | |
| | | | | * | | Improve code coverage for aac_dec_fuzzerS Vasudev Prasad2020-06-191-5/+61
| | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: ./aac_dec_fuzzer Bug: 158206619 Change-Id: I42d57ec832dbd273f66ce149ce81bfcb1c514add
* | | | | | | point to new repo hooks for mainline uploads am: ebc1030f65 am: 251785c993 ↵Ray Essick2020-05-300-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: c2d9dc1ab3 am: e445fffa0c Change-Id: Ib427f17ee4811e85097fc8ae3f68d7f0fab5f1d4
| * | | | | | point to new repo hooks for mainline uploads am: ebc1030f65 am: 251785c993 ↵Ray Essick2020-05-300-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: c2d9dc1ab3 Change-Id: I69a934cab36df4088a1a53f9a9e5d171b4bbb7e9
| | * | | | | point to new repo hooks for mainline uploads am: ebc1030f65 am: 251785c993Ray Essick2020-05-300-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I61510ab3a0a69acb70875ea8e3163fa7debcb18c
| | | * | | | point to new repo hooks for mainline uploads am: ebc1030f65Ray Essick2020-05-291-0/+2
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| | | | | | | | | Change-Id: Ibaae6c3cebad3d20b19447824bc5433601081968
* | | | | | | Merge "point to new repo hooks for mainline uploads am: ebc1030f65 am: ↵Automerger Merge Worker2020-05-300-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ecae3c24b3 am: da694cd595" into rvc-qpr-dev-plus-aosp am: 03f1989345 Change-Id: I3822acb22064ecf6a0b3efdb63e7b4fea6ddbf7a
| * | | | | | Merge "point to new repo hooks for mainline uploads am: ebc1030f65 am: ↵Automerger Merge Worker2020-05-300-0/+0
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | ecae3c24b3 am: da694cd595" into rvc-qpr-dev-plus-aosp
| | * \ \ \ \ \ point to new repo hooks for mainline uploads am: ebc1030f65 am: ecae3c24b3 ↵Ray Essick2020-05-301-0/+2
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: da694cd595 Change-Id: If139bccabcd71a6c529e234d23ad454b061ae36c
| | | * \ \ \ \ \ point to new repo hooks for mainline uploads am: ebc1030f65 am: ecae3c24b3Ray Essick2020-05-301-0/+2
| | | |\ \ \ \ \ \ | | | | | |_|_|_|/ | | | | |/| | | | | | | | | | | | | Change-Id: I04a039fe95ed1bdb9957a562cdfdb125c59ad090
* | | | | | | | | point to new repo hooks for mainline uploads am: ebc1030f65 am: ecae3c24b3 ↵Ray Essick2020-05-301-0/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: eeb1d2d3cf am: c329ddd2d9 Change-Id: I3f6c5f1f3066d366af0ee925a31edff92edb3e8b
| * | | | | | | | point to new repo hooks for mainline uploads am: ebc1030f65 am: ecae3c24b3 ↵Ray Essick2020-05-301-0/+2
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | / / / / | | | |_|/ / / / | | |/| | | | | | | | | | | | | am: eeb1d2d3cf Change-Id: I1c4df033663d308ae24bc42d723ddf09f05b9de9
| | * | | | | | point to new repo hooks for mainline uploads am: ebc1030f65 am: ecae3c24b3Ray Essick2020-05-301-0/+2
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | | | | | | | | | Change-Id: I4af7365b2f0e59ecd52df4022faf4f7798932d7a
| | | * | | | | point to new repo hooks for mainline uploads am: ebc1030f65Ray Essick2020-05-291-0/+2
| | | |\ \ \ \ \ | | | | | |_|/ / | | | | |/| | | | | | | | | | | Change-Id: I2f08b01ee76f7524fb041d8541847eb9b4832f14
| | | | * | | | point to new repo hooks for mainline uploadsRay Essick2020-05-261-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 157501573 Test: upload Change-Id: I0e4764db6516d17a81dc5a31bf9d9427b2c570d6
* | | | | | | | Merge "Fix license type s/b BY_EXCEPTION_ONLY" am: 86bd192796 am: e76ca4d9ac ↵Treehugger Robot2020-05-211-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 6d5490018a am: 6313f8703e am: f4248aadbf Change-Id: Id629dd1319314e4964768b1dfa344273d6bde4eb
| * | | | | | | Merge "Fix license type s/b BY_EXCEPTION_ONLY" am: 86bd192796 am: e76ca4d9ac ↵Treehugger Robot2020-05-211-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 6d5490018a am: 6313f8703e Change-Id: I0471f66a21267ba4059976e491d0489a74ba34a7
| | * | | | | | Merge "Fix license type s/b BY_EXCEPTION_ONLY" am: 86bd192796 am: e76ca4d9ac ↵Treehugger Robot2020-05-211-1/+1
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 6d5490018a Change-Id: I7b5c175a03532581aac39584dcd308eca401642a
| | | * | | | | Merge "Fix license type s/b BY_EXCEPTION_ONLY" am: 86bd192796 am: e76ca4d9acTreehugger Robot2020-05-211-1/+1
| | | |\ \ \ \ \ | | | | | |_|_|/ | | | | |/| | | | | | | | | | | Change-Id: Ia1d49e25596031c732021bccb2a86a03f3ad874c
| | | | * | | | Merge "Fix license type s/b BY_EXCEPTION_ONLY" am: 86bd192796Treehugger Robot2020-05-211-1/+1
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If0646e3c2b9b9927a58811606fff28e432e6d303
| | | | | * \ \ \ Merge "Fix license type s/b BY_EXCEPTION_ONLY"Treehugger Robot2020-05-211-1/+1
| | | | | |\ \ \ \
| | | | | | * | | | Fix license type s/b BY_EXCEPTION_ONLYBob Badour2020-05-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Fraunhofer license has special requirements. Test: no code change Change-Id: I439354498c0a28d6ff078cea9a4f8e9bfc02145f
* | | | | | | | | | Merge "Added fuzz_config field in aac_dec_fuzzer" am: 43fb529e06 am: ↵Kris Alder2020-05-211-0/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f96c6f3a30 am: f60530f491 am: 194e249990 am: 248c3a9e0a Change-Id: I2d7833e7fc8964baa35792f57cec6d0137dc3f20
| * | | | | | | | | Merge "Added fuzz_config field in aac_dec_fuzzer" am: 43fb529e06 am: ↵Kris Alder2020-05-211-0/+7
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f96c6f3a30 am: f60530f491 am: 194e249990 Change-Id: Ib567b1aeb584a8f820a455222322ece0686a5903
| | * | | | | | | | Merge "Added fuzz_config field in aac_dec_fuzzer" am: 43fb529e06 am: ↵Kris Alder2020-05-211-0/+7
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f96c6f3a30 am: f60530f491 Change-Id: I20727c08423682ca8c6d3fcfa680423375c02156
| | | * | | | | | | Merge "Added fuzz_config field in aac_dec_fuzzer" am: 43fb529e06 am: f96c6f3a30Kris Alder2020-05-211-0/+7
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4104bd7b4964dbd270cb614a164d426ecd24e0bf
| | | | * | | | | | Merge "Added fuzz_config field in aac_dec_fuzzer" am: 43fb529e06Kris Alder2020-05-211-0/+7
| | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9cc973e862cfa58047cd1056488f64de4bf07abb
| | | | | * | | | | Merge "Added fuzz_config field in aac_dec_fuzzer"Kris Alder2020-05-211-0/+7
| | | | | |\ \ \ \ \ | | | | | | |/ / / / | | | | | |/| | | |
| | | | | | * | | | Added fuzz_config field in aac_dec_fuzzerAyushi Khopkar2020-05-191-0/+7
| | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: ./aac_dec_fuzzer Bug: 156871294 Change-Id: Idfc93a6f6c71a78c2b7759443161d8e75dfc4670
* | | | | | | | | [automerger skipped] Set min_sdk_version to be part of mainline modules am: ↵Jooyung Han2020-05-110-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 71c477bae4 am: b6b6120ac8 am: c658b5ab4b -s ours am: 3566a11cc1 -s ours am skip reason: Change-Id I662ad951a3221f967b53e7af65cb203a4b4a5e5d with SHA-1 71c477bae4 is in history Change-Id: I295cfe08db63b7ae2a405aa1ed1746bfe54baa71
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-24 02:05:23 +0000