fenix
/
fdk-aac
mirror of https://github.com/mstorsjo/fdk-aac.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
1,302 Commits 10 Branches 11 Tags 11 MiB
Commit Graph

1302 Commits

Author SHA1 Message Date
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 0468e02e5b [DO NOT MERGE] Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels(). am: 50aa5be388 
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12088847

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

Change-Id: I503c23a0a9313ee7303927781211c23690c239bd
 2020-09-09 21:10:24 +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 7f7e67fe02 Merge Android R 
Bug: 168057903
Merged-In: Idcdb13a8c37b0b4b5446169c3e80dfe55586bc77
Change-Id: I29b7ae1003fb72aeb5fbf1fdfdceea849c1c12b8
 2020-09-08 16:53:57 -07: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
Fraunhofer IIS FDK 50aa5be388 [DO NOT MERGE] 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 DecoderTestXheAac
Change-Id: I741f49ab3b675fa3d3217ee72e1db66b0114f7ee
 2020-07-06 21:42:07 +00: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
android-build-team Robot 63d6409af1 Snap for 6544675 from ebc1030f65 to rvc-release 
Change-Id: Icd0e65b905da537b43498b94b7e4d0424837c9d1
 2020-05-30 23:08:39 +00:00
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 3f829aa0e1 point to new repo hooks for mainline uploads am: ebc1030f65 
Change-Id: I4a628b1146f9e9cc4cbbfeb3a5b1b4aba0fd8ce3
 2020-05-29 23:49:48 +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
Treehugger Robot f4248aadbf Merge "Fix license type s/b BY_EXCEPTION_ONLY" am: 86bd192796 am: e76ca4d9ac am: 6d5490018a am: 6313f8703e 
Change-Id: I0471f66a21267ba4059976e491d0489a74ba34a7
 2020-05-21 23:16:09 +00:00
Treehugger Robot 6313f8703e Merge "Fix license type s/b BY_EXCEPTION_ONLY" am: 86bd192796 am: e76ca4d9ac am: 6d5490018a 
Change-Id: I7b5c175a03532581aac39584dcd308eca401642a
 2020-05-21 22:55:18 +00:00
Treehugger Robot 6d5490018a Merge "Fix license type s/b BY_EXCEPTION_ONLY" am: 86bd192796 am: e76ca4d9ac 
Change-Id: Ia1d49e25596031c732021bccb2a86a03f3ad874c
 2020-05-21 22:41:14 +00:00
Treehugger Robot e76ca4d9ac Merge "Fix license type s/b BY_EXCEPTION_ONLY" am: 86bd192796 
Change-Id: If0646e3c2b9b9927a58811606fff28e432e6d303
 2020-05-21 22:28:36 +00:00
Treehugger Robot 86bd192796 Merge "Fix license type s/b BY_EXCEPTION_ONLY" 2020-05-21 22:16:18 +00:00
Kris Alder 7a5f7b83ce Merge "Added fuzz_config field in aac_dec_fuzzer" am: 43fb529e06 am: f96c6f3a30 am: f60530f491 am: 194e249990 am: 248c3a9e0a 
Change-Id: I2d7833e7fc8964baa35792f57cec6d0137dc3f20
 2020-05-21 21:36:12 +00:00
Kris Alder 248c3a9e0a Merge "Added fuzz_config field in aac_dec_fuzzer" am: 43fb529e06 am: f96c6f3a30 am: f60530f491 am: 194e249990 
Change-Id: Ib567b1aeb584a8f820a455222322ece0686a5903
 2020-05-21 20:55:53 +00:00
Kris Alder 194e249990 Merge "Added fuzz_config field in aac_dec_fuzzer" am: 43fb529e06 am: f96c6f3a30 am: f60530f491 
Change-Id: I20727c08423682ca8c6d3fcfa680423375c02156
 2020-05-21 20:35:45 +00:00
Kris Alder f60530f491 Merge "Added fuzz_config field in aac_dec_fuzzer" am: 43fb529e06 am: f96c6f3a30 
Change-Id: I4104bd7b4964dbd270cb614a164d426ecd24e0bf
 2020-05-21 20:10:40 +00:00
Kris Alder f96c6f3a30 Merge "Added fuzz_config field in aac_dec_fuzzer" am: 43fb529e06 
Change-Id: I9cc973e862cfa58047cd1056488f64de4bf07abb
 2020-05-21 19:54:30 +00:00