Commit Graph

1079 Commits

Author SHA1 Message Date
Fraunhofer IIS FDK 5e92535feb [automerger skipped] Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels(). am: c516539a20 am: 17dd8dfad9 am: 8336b89345 -s ours am: 971b630c47 -s ours am: 4ee75655ab -s ours am: eb737fb95b -s ours am: 8e26f8d6b3 -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/+/12091300

Change-Id: Idcc12077b6919f21a6b709cff952a098c650ec43
2020-09-10 00:23:48 +00:00
Fraunhofer IIS FDK db025b5612 [automerger skipped] Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels(). am: c516539a20 am: 17dd8dfad9 am: 8336b89345 -s ours am: 971b630c47 -s ours am: 4ee75655ab -s ours am: 9474f4eb44 -s ours am: 8a856643ac -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/+/12091300

Change-Id: I5e73d47e6d8b791f7b6ec4fa34a120ed72733708
2020-09-10 00:21:39 +00:00
Fraunhofer IIS FDK 8e26f8d6b3 [automerger skipped] Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels(). am: c516539a20 am: 17dd8dfad9 am: 8336b89345 -s ours am: 971b630c47 -s ours am: 4ee75655ab -s ours am: eb737fb95b -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/+/12091300

Change-Id: I11fbcafea541a3a8cea729f0b6e76b905998ccfb
2020-09-09 23:57:01 +00:00
Fraunhofer IIS FDK 8a856643ac [automerger skipped] Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels(). am: c516539a20 am: 17dd8dfad9 am: 8336b89345 -s ours am: 971b630c47 -s ours am: 4ee75655ab -s ours am: 9474f4eb44 -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/+/12091300

Change-Id: I6089f72bd3a957d4ba782a933d9f28802d5d2978
2020-09-09 23:56:13 +00:00
Fraunhofer IIS FDK eb737fb95b [automerger skipped] Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels(). am: c516539a20 am: 17dd8dfad9 am: 8336b89345 -s ours am: 971b630c47 -s ours am: 4ee75655ab -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/+/12091300

Change-Id: I92f87237ef6f4a0b9a21801e738378d550e98465
2020-09-09 23:25:12 +00:00
Fraunhofer IIS FDK 9474f4eb44 [automerger skipped] Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels(). am: c516539a20 am: 17dd8dfad9 am: 8336b89345 -s ours am: 971b630c47 -s ours am: 4ee75655ab -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/+/12091300

Change-Id: Ie76449e6f28f51989ed628d4f996992147e72621
2020-09-09 23:25:11 +00:00
Fraunhofer IIS FDK 4ee75655ab [automerger skipped] Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels(). am: c516539a20 am: 17dd8dfad9 am: 8336b89345 -s ours am: 971b630c47 -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/+/12091300

Change-Id: I8b35930cca12c2c5e2eb2614af497119b479b51a
2020-09-09 23:16:39 +00:00
Fraunhofer IIS FDK 971b630c47 [automerger skipped] Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels(). am: c516539a20 am: 17dd8dfad9 am: 8336b89345 -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/+/12091300

Change-Id: I5c2fc3f0ac04e75766a7f7141a6900f167023088
2020-09-09 22:59:55 +00:00
Fraunhofer IIS FDK 8336b89345 Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels(). am: c516539a20 am: 17dd8dfad9
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12091300

Change-Id: I6162868554166db622bc72fb47a9cc61aaa51881
2020-09-09 22:32:05 +00:00
Fraunhofer IIS FDK 46eded2f48 [automerger skipped] Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels(). am: bb8f983bf3 am: f007f6a4bc am: 3cc9889e23 -s ours am: 008ee33f53 -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: Ie65de9d9afe39ea76dcb78dff666bc6bd9bd8a8f
2020-09-09 22:11:46 +00:00
Fraunhofer IIS FDK f7a37fe864 [automerger skipped] Fix heap buffer overflow in 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
2020-09-09 22:11:21 +00:00
Fraunhofer IIS FDK d5442e33aa [automerger skipped] Fix heap buffer overflow in 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
2020-09-09 22:10:32 +00:00
Fraunhofer IIS FDK 17dd8dfad9 Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels(). am: c516539a20
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12091300

Change-Id: I41058bf1a076509c564defa70247dcbfa91c64d0
2020-09-09 22:02:14 +00:00
Fraunhofer IIS FDK 008ee33f53 [automerger skipped] Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels(). am: bb8f983bf3 am: f007f6a4bc am: 3cc9889e23 -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: Idc492802d1f451c4ca1acd78ac83234f20183f29
2020-09-09 21:54:59 +00:00
Fraunhofer IIS FDK ad07d8d7a7 [automerger skipped] Fix heap buffer overflow in 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
2020-09-09 21:54:46 +00:00
Fraunhofer IIS FDK 11b611293f Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels(). am: bb8f983bf3 am: f007f6a4bc am: a5a3ef611c
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12087395

Change-Id: I19cbfb6b908a878ce59e8c6869ba9c5957d10075
2020-09-09 21:54:26 +00:00
Fraunhofer IIS FDK 87f3b1561f [automerger skipped] Fix heap buffer overflow in 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
2020-09-09 21:37:34 +00:00
Fraunhofer IIS FDK a5a3ef611c Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels(). am: bb8f983bf3 am: f007f6a4bc
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12087395

Change-Id: I28c773eab019d0e518d34a26a9493811c8c1afea
2020-09-09 21:37:22 +00:00
Fraunhofer IIS FDK 3cc9889e23 Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels(). am: bb8f983bf3 am: f007f6a4bc
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12087395

Change-Id: Ic8c0828dd43d16559e13acd4204bddc26d2e249d
2020-09-09 21:37:07 +00:00
Fraunhofer IIS FDK 33ea26a8d9 Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels(). am: bb8f983bf3
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12087395

Change-Id: Iddc8a0642d6a5bf1f84edb74f943b5dddd1fb7fd
2020-09-09 21:09:55 +00:00
Fraunhofer IIS FDK f007f6a4bc Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels(). am: bb8f983bf3
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12087395

Change-Id: I85ffb1d0e64c206a805e36169e6d6b664924cc48
2020-09-09 21:09:29 +00:00
Fraunhofer IIS FDK bb8f983bf3 Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels().
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
2020-09-09 19:01:09 +00:00
Xin Li 4c5e147475 [automerger skipped] Merge Android R (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
2020-09-02 01:59:37 +00:00
Xin Li 3f82e7e794 [automerger skipped] Merge Android R (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
2020-09-01 22:10:11 +00:00
Xin Li 016718d3fd [automerger skipped] Merge Android R (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
2020-09-01 21:46:55 +00:00
Xin Li 389ba21eed [automerger skipped] Merge Android R (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
2020-09-01 20:37:20 +00:00
Xin Li 7a0dde5d5d Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)
Bug: 166295507
Merged-In: I9bd31724ae68b9a0b3eb4bb5be3782359824aa1f
Change-Id: Idcdb13a8c37b0b4b5446169c3e80dfe55586bc77
2020-08-27 10:16:06 -07:00
Fraunhofer IIS FDK b5dfe8f92d Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels().
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
2020-08-10 19:57:03 +00:00
Jean-Michel Trivi 792919ffb2 Merge "Improve code coverage for aac_dec_fuzzer" am: 760e8921c2 am: 946a672b0f am: e0624f4c05 am: 73da86e336 am: ef38dee702
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1324135

Change-Id: Iccefe7e42136aeb8d2882666cdfc3337c2db2043
2020-07-10 18:46:33 +00:00
Jean-Michel Trivi ef38dee702 Merge "Improve code coverage for aac_dec_fuzzer" am: 760e8921c2 am: 946a672b0f am: e0624f4c05 am: 73da86e336
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1324135

Change-Id: I68267add047f0ea432e5f83e1fbd5d673ba21715
2020-07-10 18:32:39 +00:00
Jean-Michel Trivi 73da86e336 Merge "Improve code coverage for aac_dec_fuzzer" am: 760e8921c2 am: 946a672b0f am: e0624f4c05
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1324135

Change-Id: Icfe1613791fb53502d99e3030dd9e9baa3fa5c33
2020-07-10 18:12:12 +00:00
Jean-Michel Trivi e0624f4c05 Merge "Improve code coverage for aac_dec_fuzzer" am: 760e8921c2 am: 946a672b0f
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1324135

Change-Id: I9bd31724ae68b9a0b3eb4bb5be3782359824aa1f
2020-07-10 17:56:32 +00:00
Jean-Michel Trivi 946a672b0f Merge "Improve code coverage for aac_dec_fuzzer" am: 760e8921c2
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1324135

Change-Id: I49925ff2d6e55f0def55bf012f7ff3f33cacea4e
2020-07-10 17:45:08 +00:00
Jean-Michel Trivi 760e8921c2 Merge "Improve code coverage for aac_dec_fuzzer" 2020-07-10 17:33:20 +00:00
Fraunhofer IIS FDK c516539a20 Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels().
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
Merged-In: I0150ac6d5a47ffce883010f531928656eebc619e
Change-Id: I8569a15214707ab622e986b34b4b917251495662
2020-07-09 08:56:14 -07:00
S Vasudev Prasad c1a75279a1 Improve code coverage for aac_dec_fuzzer
Test: ./aac_dec_fuzzer
Bug: 158206619

Change-Id: I42d57ec832dbd273f66ce149ce81bfcb1c514add
2020-06-19 10:57:18 +05:30
Ray Essick 0ebbc9d336 point to new repo hooks for mainline uploads am: ebc1030f65 am: 251785c993 am: c2d9dc1ab3 am: e445fffa0c
Change-Id: Ib427f17ee4811e85097fc8ae3f68d7f0fab5f1d4
2020-05-30 00:32:01 +00:00
Automerger Merge Worker b52b41c8a0 Merge "point to new repo hooks for mainline uploads am: ebc1030f65 am: ecae3c24b3 am: da694cd595" into rvc-qpr-dev-plus-aosp am: 03f1989345
Change-Id: I3822acb22064ecf6a0b3efdb63e7b4fea6ddbf7a
2020-05-30 00:31:30 +00:00
Ray Essick 611815c6fe point to new repo hooks for mainline uploads am: ebc1030f65 am: ecae3c24b3 am: eeb1d2d3cf am: c329ddd2d9
Change-Id: I3f6c5f1f3066d366af0ee925a31edff92edb3e8b
2020-05-30 00:30:13 +00:00
Ray Essick e445fffa0c point to new repo hooks for mainline uploads am: ebc1030f65 am: 251785c993 am: c2d9dc1ab3
Change-Id: I69a934cab36df4088a1a53f9a9e5d171b4bbb7e9
2020-05-30 00:17:16 +00:00
Automerger Merge Worker 03f1989345 Merge "point to new repo hooks for mainline uploads am: ebc1030f65 am: ecae3c24b3 am: da694cd595" into rvc-qpr-dev-plus-aosp 2020-05-30 00:16:39 +00:00
Ray Essick f3944443a0 point to new repo hooks for mainline uploads am: ebc1030f65 am: ecae3c24b3 am: da694cd595
Change-Id: If139bccabcd71a6c529e234d23ad454b061ae36c
2020-05-30 00:16:25 +00:00
Ray Essick c329ddd2d9 point to new repo hooks for mainline uploads am: ebc1030f65 am: ecae3c24b3 am: eeb1d2d3cf
Change-Id: I1c4df033663d308ae24bc42d723ddf09f05b9de9
2020-05-30 00:16:12 +00:00
Ray Essick c2d9dc1ab3 point to new repo hooks for mainline uploads am: ebc1030f65 am: 251785c993
Change-Id: I61510ab3a0a69acb70875ea8e3163fa7debcb18c
2020-05-30 00:03:25 +00:00
Ray Essick eeb1d2d3cf point to new repo hooks for mainline uploads am: ebc1030f65 am: ecae3c24b3
Change-Id: I4af7365b2f0e59ecd52df4022faf4f7798932d7a
2020-05-30 00:03:07 +00:00
Ray Essick da694cd595 point to new repo hooks for mainline uploads am: ebc1030f65 am: ecae3c24b3
Change-Id: I04a039fe95ed1bdb9957a562cdfdb125c59ad090
2020-05-30 00:03:06 +00:00
Ray Essick 251785c993 point to new repo hooks for mainline uploads am: ebc1030f65
Change-Id: Ibaae6c3cebad3d20b19447824bc5433601081968
2020-05-29 23:49:26 +00:00
Ray Essick ecae3c24b3 point to new repo hooks for mainline uploads am: ebc1030f65
Change-Id: I2f08b01ee76f7524fb041d8541847eb9b4832f14
2020-05-29 23:49:24 +00:00
Ray Essick ebc1030f65 point to new repo hooks for mainline uploads
Bug: 157501573
Test: upload
Change-Id: I0e4764db6516d17a81dc5a31bf9d9427b2c570d6
2020-05-26 16:29:58 -07:00
Treehugger Robot 979a438f4b Merge "Fix license type s/b BY_EXCEPTION_ONLY" am: 86bd192796 am: e76ca4d9ac am: 6d5490018a am: 6313f8703e am: f4248aadbf
Change-Id: Id629dd1319314e4964768b1dfa344273d6bde4eb
2020-05-21 23:29:37 +00:00