fenix/fdk-aac
1
0
Fork 0
mirror of https://github.com/mstorsjo/fdk-aac.git synced 2025-03-16 15:50:02 +01:00
Code Issues Projects Releases Wiki Activity
338 Commits 9 Branches 11 Tags
Commit Graph

338 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fraunhofer IIS FDK
d20df7ee14 [DO NOT MERGE] Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels(). am: 50aa5be388 am: 0468e02e5b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12088847

Change-Id: I0f5863139bc848401b905625fdc572793755b8cf
 2020-09-09 21:44:15 +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
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
Jean-Michel Trivi
0ff211e4fb Merge "Prevent out of bounds accesses in lppTransposer()" into oc-dev am: 5a025c4fea 
am: 1c4c4a8c97

Change-Id: I547a825e0a48ef9f3c48b29ea2443f9945da52a2
 2018-10-12 04:41:31 -07:00
Jean-Michel Trivi
1c4c4a8c97 Merge "Prevent out of bounds accesses in lppTransposer()" into oc-dev 
am: 5a025c4fea

Change-Id: I9011199b747a45a4cae8214b2e4b7b1f158ac1bc
 2018-10-12 04:33:58 -07:00
TreeHugger Robot
5a025c4fea Merge "Prevent out of bounds accesses in lppTransposer()" into oc-dev 2018-10-12 11:26:30 +00:00
Jean-Michel Trivi
14ea3dc906 [automerger] DO NOT MERGE Prevent out of bounds accesses in lppTransposer() am: 2eaadebcb6 am: 589e1e861f am: e2491a2024 am: 9c00c42d95 skipped: c7e9a56431 am: 14fd59e8c4 
am: 162f98a177

Change-Id: Ic656bdbc49436976b0edf6193bb02aa2af6b8764
 2018-10-11 19:39:58 -07:00
Jean-Michel Trivi
162f98a177 [automerger] DO NOT MERGE Prevent out of bounds accesses in lppTransposer() am: 2eaadebcb6 am: 589e1e861f am: e2491a2024 am: 9c00c42d95 skipped: c7e9a56431 
am: 14fd59e8c4

Change-Id: Ic0b562d5f0df43d9927f857600eba9ae5930b7c5
 2018-10-11 19:35:07 -07:00
Android Build Merger (Role)
14fd59e8c4 [automerger] DO NOT MERGE Prevent out of bounds accesses in lppTransposer() am: 2eaadebcb6 am: 589e1e861f am: e2491a2024 am: 9c00c42d95 skipped: c7e9a56431 
Change-Id: I53774f0e504aeb7ee31e260753542ba586f97e5d
 2018-10-11 23:10:04 +00:00
Android Build Merger (Role)
c7e9a56431 [automerger] DO NOT MERGE Prevent out of bounds accesses in lppTransposer() am: 2eaadebcb6 am: 589e1e861f am: e2491a2024 am: 9c00c42d95 
Change-Id: Ic0382abb5ad456a976bfa97ba40401593fe0e265
 2018-10-11 23:10:03 +00:00
Android Build Merger (Role)
9c00c42d95 [automerger] DO NOT MERGE Prevent out of bounds accesses in lppTransposer() am: 2eaadebcb6 am: 589e1e861f am: e2491a2024 
Change-Id: I26af673d8c8f32947bd041711a67f1e90abd4c5b
 2018-10-11 23:10:01 +00:00
Android Build Merger (Role)
e2491a2024 [automerger] DO NOT MERGE Prevent out of bounds accesses in lppTransposer() am: 2eaadebcb6 am: 589e1e861f 
Change-Id: I319554e07343c649f0ba37e719fbc144336b5e3e
 2018-10-11 23:10:00 +00:00
Android Build Merger (Role)
589e1e861f [automerger] DO NOT MERGE Prevent out of bounds accesses in lppTransposer() am: 2eaadebcb6 
Change-Id: I81009a5c6f58c225692c39e95038dd3b77290130
 2018-10-11 23:09:59 +00:00
Jean-Michel Trivi
2eaadebcb6 DO NOT MERGE Prevent out of bounds accesses in lppTransposer() 
Check validity of pSettings->noOfPatches to prevent out of bounds
  access in lppTransposer(), which can also cause memSize to be
  negative.

Bug: 112160868
Test: see poc in bug
Change-Id: I77bd1e1dfab3bac92b4522170bdc3c9eb56fdf82
 2018-10-11 23:09:57 +00:00
Jean-Michel Trivi
56ef80d7fe Prevent out of bounds accesses in lppTransposer() 
Check validity of pSettings->noOfPatches to prevent out of bounds
  access in lppTransposer(), which can also cause memSize to be
  negative.

Bug: 112160868
Test: see poc in bug
Change-Id: I789030b116da7f8ea261001b43ef6c677dd58a3d
Merged-In: I6a2161865d9cb9b51dc37c09d6e3a4a8e5d11f86
 2018-10-11 14:49:35 -07:00
Android Build Merger (Role)
31fac02b0e [automerger skipped] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info skipped: 8b0edf42a0 am: fed4ae1115 
am: 45ca1d7199

Change-Id: Ic4a9ac130a9410a7f2bc6a094aba0c0d0085b7b8
 2018-02-02 03:42:36 +00:00
Android Build Merger (Role)
fec52a666d [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: e2fb9f0ac6 am: 4b684c6690 skipped: 000fe3d02d am: dcbb54a6ec 
am: 67e9a995ce

Change-Id: I43b81c7a7f8e1fbe4143b0262eaad72d3286f8da
 2018-02-02 03:42:12 +00:00
Android Build Merger (Role)
d6b29883ff [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 31447431fe am: fce9663d6f am: 658a02f977 am: 243be669b3 skipped: c2fe4b944b am: c54946e671 
am: f1a2354a3a

Change-Id: I744d3ea898571c5d58329b495f8fc1e9e9cfb730
 2018-02-02 03:41:44 +00:00
Android Build Merger (Role)
fa62928801 [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: dc880988f0 am: 64b670e10a skipped: 43323dd03f am: e78aa83b8f am: 5944cdf5b0 am: 0a9ef8a138 am: 601d27b59d skipped: 2494f9fa12 am: bae005cba3 
am: b81d554ba6

Change-Id: I580587d87c826a2abbc8284fcb787c1f5ce57e4b
 2018-02-02 03:41:20 +00:00
Android Build Merger (Role)
27e0af2ad1 [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 08ae2e8d12 am: 99f3e5ce05 am: c48482d937 skipped: 81ea4ba91d am: 46ead43c76 am: 0bbb81398c am: bd4b66c1a9 am: 464c4336ad skipped: 233344c45c am: bb38f901b4 
am: e12ed0c4fb

Change-Id: I0b14be2ff82aa5a67bd43398f96c1bc5699ca376
 2018-02-02 03:41:01 +00:00
Jean-Michel Trivi
78b29903f9 Merge changes from topic "am-33ca3d69-2b65-4c99-8266-49b4f5c3c1c9" into oc-dev am: 378e6c244a 
am: 991036b9f8

Change-Id: I7254dbe5cb685ea86b632dcbf670dea8a0671bf9
 2018-02-02 03:40:35 +00:00
Android Build Merger (Role)
45ca1d7199 [automerger skipped] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info skipped: 8b0edf42a0 
am: fed4ae1115

Change-Id: I3bb2c6e954a5d5212c976a1f6e1549a62352423a
 2018-02-01 23:40:17 +00:00
Android Build Merger (Role)
67e9a995ce [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: e2fb9f0ac6 am: 4b684c6690 skipped: 000fe3d02d 
am: dcbb54a6ec

Change-Id: I86083377cbd5c4c982d5686e22f620ff288abed2
 2018-02-01 23:40:09 +00:00
Android Build Merger (Role)
f1a2354a3a [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 31447431fe am: fce9663d6f am: 658a02f977 am: 243be669b3 skipped: c2fe4b944b 
am: c54946e671

Change-Id: I888519abe97d8fa1cfdd754b0aa7f74d91b07c54
 2018-02-01 23:40:00 +00:00
Android Build Merger (Role)
b81d554ba6 [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: dc880988f0 am: 64b670e10a skipped: 43323dd03f am: e78aa83b8f am: 5944cdf5b0 am: 0a9ef8a138 am: 601d27b59d skipped: 2494f9fa12 
am: bae005cba3

Change-Id: Ib40b2afd08360c07103d756536b54e26adbf56d8
 2018-02-01 23:39:52 +00:00
Android Build Merger (Role)
e12ed0c4fb [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 08ae2e8d12 am: 99f3e5ce05 am: c48482d937 skipped: 81ea4ba91d am: 46ead43c76 am: 0bbb81398c am: bd4b66c1a9 am: 464c4336ad skipped: 233344c45c 
am: bb38f901b4

Change-Id: I6faf7e4a0bbb8ed6a11cd77dbe749c8e6bf59ade
 2018-02-01 23:39:44 +00:00
Jean-Michel Trivi
991036b9f8 Merge changes from topic "am-33ca3d69-2b65-4c99-8266-49b4f5c3c1c9" into oc-dev 
am: 378e6c244a

Change-Id: I0cb3e214777a0ed27cd21e9008e379a5af0b5be7
 2018-02-01 23:39:34 +00:00
Android Build Merger (Role)
fed4ae1115 [automerger skipped] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info skipped: 8b0edf42a0 
Change-Id: Iff1ecd457b2b5dd89eef3d212ba06c52e37475c5
 2018-02-01 18:07:10 +00:00
Jean-Michel Trivi
8b0edf42a0 DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info 
In CProgramConfig_ReadHeightExt prevent stack overflow
 from invalid FrontElementHeightInfo array value.

Bug: 70637599
Test: see bug
Change-Id: I145414d81d7a7be711672c12f44b537c12eea308
 2018-02-01 18:06:39 +00:00
Android Build Merger (Role)
dcbb54a6ec [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: e2fb9f0ac6 am: 4b684c6690 skipped: 000fe3d02d 
Change-Id: I053bbc39b92045c9be0c935bef8c078a41ce7fe8
 2018-02-01 18:05:36 +00:00
Android Build Merger (Role)
000fe3d02d [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: e2fb9f0ac6 am: 4b684c6690 
Change-Id: I790115ee7682dad92c72b03ef72711dd81cce45b
 2018-02-01 18:05:35 +00:00
Android Build Merger (Role)
4b684c6690 [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: e2fb9f0ac6 
Change-Id: Ib21720682d336b3250cc83699124af5895a12cc3
 2018-02-01 18:05:34 +00:00
Jean-Michel Trivi
e2fb9f0ac6 DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info 
In CProgramConfig_ReadHeightExt prevent stack overflow
 from invalid FrontElementHeightInfo array value.

Bug: 70637599
Test: see bug
Change-Id: I145414d81d7a7be711672c12f44b537c12eea308
 2018-02-01 18:05:24 +00:00
Android Build Merger (Role)
c54946e671 [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 31447431fe am: fce9663d6f am: 658a02f977 am: 243be669b3 skipped: c2fe4b944b 
Change-Id: I0a7ee9e92621704af6bdc7294ce375e8462e9065
 2018-02-01 18:00:20 +00:00
Android Build Merger (Role)
c2fe4b944b [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 31447431fe am: fce9663d6f am: 658a02f977 am: 243be669b3 
Change-Id: Ia27f928400ceed95b6704b7b602968dbc14714e4
 2018-02-01 18:00:19 +00:00
Android Build Merger (Role)
243be669b3 [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 31447431fe am: fce9663d6f am: 658a02f977 
Change-Id: Ia94aa4643972ef0d09045546b4af093153772642
 2018-02-01 18:00:18 +00:00
Android Build Merger (Role)
658a02f977 [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 31447431fe am: fce9663d6f 
Change-Id: Ice80a96b140e09ffe1ac65b36f4441e14a1b7950
 2018-02-01 18:00:17 +00:00
Android Build Merger (Role)
fce9663d6f [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 31447431fe 
Change-Id: I6fe14a13927084b6c3e7386936b17e52dc308755
 2018-02-01 18:00:16 +00:00
Jean-Michel Trivi
31447431fe DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info 
In CProgramConfig_ReadHeightExt prevent stack overflow
 from invalid FrontElementHeightInfo array value.

Bug: 70637599
Test: see bug
Change-Id: I145414d81d7a7be711672c12f44b537c12eea308
 2018-02-01 18:00:13 +00:00
Android Build Merger (Role)
bae005cba3 [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: dc880988f0 am: 64b670e10a skipped: 43323dd03f am: e78aa83b8f am: 5944cdf5b0 am: 0a9ef8a138 am: 601d27b59d skipped: 2494f9fa12 
Change-Id: I2f20d89b7ef44751a99876ee0d6fb6fbb57df848
 2018-02-01 17:58:56 +00:00
Android Build Merger (Role)
2494f9fa12 [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: dc880988f0 am: 64b670e10a skipped: 43323dd03f am: e78aa83b8f am: 5944cdf5b0 am: 0a9ef8a138 am: 601d27b59d 
Change-Id: I5997bd762037c34a710a8f208551f25ea792972c
 2018-02-01 17:58:55 +00:00
Android Build Merger (Role)
601d27b59d [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: dc880988f0 am: 64b670e10a skipped: 43323dd03f am: e78aa83b8f am: 5944cdf5b0 am: 0a9ef8a138 
Change-Id: I2d04b1aaeb91d3e5d63659d30b07bf5831072da1
 2018-02-01 17:58:54 +00:00
Android Build Merger (Role)
0a9ef8a138 [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: dc880988f0 am: 64b670e10a skipped: 43323dd03f am: e78aa83b8f am: 5944cdf5b0 
Change-Id: Ia8958d29392426f83d946cb3050f738f5182db96
 2018-02-01 17:58:53 +00:00
Android Build Merger (Role)
5944cdf5b0 [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: dc880988f0 am: 64b670e10a skipped: 43323dd03f am: e78aa83b8f 
Change-Id: I8aa7bbac0c2910746f7de8f0949358ae56a4d7dc
 2018-02-01 17:58:51 +00:00
Android Build Merger (Role)
e78aa83b8f [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: dc880988f0 am: 64b670e10a skipped: 43323dd03f 
Change-Id: I982f6f797485143c0a8379f1a904498fa3564e8c
 2018-02-01 17:58:50 +00:00
Android Build Merger (Role)
43323dd03f [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: dc880988f0 am: 64b670e10a 
Change-Id: If3b0d271ec214b0ec04f33639f9276d591665e36
 2018-02-01 17:58:49 +00:00
Android Build Merger (Role)
64b670e10a [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: dc880988f0 
Change-Id: Id25465c6c5697a53b41ab5ceeb5a4ad68b6ddcb9
 2018-02-01 17:58:48 +00:00
Jean-Michel Trivi
dc880988f0 DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info 
In CProgramConfig_ReadHeightExt prevent stack overflow
 from invalid FrontElementHeightInfo array value.

Bug: 70637599
Test: see bug
Change-Id: I145414d81d7a7be711672c12f44b537c12eea308
 2018-02-01 17:58:42 +00:00
Android Build Merger (Role)
bb38f901b4 [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 08ae2e8d12 am: 99f3e5ce05 am: c48482d937 skipped: 81ea4ba91d am: 46ead43c76 am: 0bbb81398c am: bd4b66c1a9 am: 464c4336ad skipped: 233344c45c 
Change-Id: I436c96743da8a703d0828ff33e955ea0e0ff3766
 2018-02-01 17:30:10 +00:00
Android Build Merger (Role)
233344c45c [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 08ae2e8d12 am: 99f3e5ce05 am: c48482d937 skipped: 81ea4ba91d am: 46ead43c76 am: 0bbb81398c am: bd4b66c1a9 am: 464c4336ad 
Change-Id: I07f7c08f0864cb673c9c8ebc98a58d3a5414ee62
 2018-02-01 17:30:09 +00:00