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

1021 Commits

Author SHA1 Message Date
Martin Storsjo 4e944af756 Avoid undefined shifts in SBR calcCRC 
Fixes: 25404/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_LIBFDK_AAC_fuzzer-5397024709804032

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
 2020-11-17 12:26:19 +02:00
Martin Storsjo 3a831a5fbc Avoid undefined shifts in SATURATE_SHIFT 
Make sure that the shift amount is less than the size of the shifted
value, otherwise return the saturation max values (for left shift, if
the source values was nonzero) or zero (for right shift, or zero
shifted left).

Fixes: 24376/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_LIBFDK_AAC_fuzzer-6529411206348800

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
 2020-09-02 12:56:41 +03:00
Martin Storsjo 8439b745f6 Don't use an enum for a value read directly from the bitstream 
The enum doesn't cover all possible values read from the bitstream.

This fixes undefined behaviour sanitizer errors.

Fixes: 23719/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_LIBFDK_AAC_fuzzer-5111020367642624

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
 2020-07-17 22:51:34 +03:00
Martin Storsjo ec58a940e2 Avoid undefined shifts 
Fixes: 23522/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_LIBFDK_AAC_fuzzer-5468272958111744

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
 2020-06-22 13:28:10 +03:00
Martin Storsjo 845febbb4a Don't store a value read directly from the bitstream in an enum 
In this case, the enum only has one single allowed value, while the
bitstream can contain a number of different values.

Don't load the unchecked value into an enum variable, because
storing the disallowed values in the enum variable is undefined
behaviour. Instead store it in an int, until the value has been
verified to be the allowed one.

This fixes undefined behaviour sanitizer errors.

Fixes: 23192/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_LIBFDK_AAC_fuzzer-5205702892322816

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
 2020-06-12 10:29:11 +03:00
Martin Storsjo 5aa57d3633 Don't use an enum for a value read directly from the bitstream 
The enum doesn't cover all possible values read from the bitstream.

This fixes undefined behaviour sanitizer errors.

Fixes: 22486/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_LIBFDK_AAC_fuzzer-5735284884111360

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
 2020-06-04 09:50:16 +03:00
Martin Storsjo e7d8591ff2 Don't use an enum for a value read directly from the bitstream 
The enum doesn't cover all possible values read from the bitstream.

This fixes undefined behaviour sanitizer errors.

Fixes: 20376/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_LIBFDK_AAC_fuzzer-4785514974806016.dms

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
 2020-02-01 22:13:18 +02:00
Martin Storsjo d47c2c6259 Merge remote-tracking branch 'aosp/master' 2020-01-09 10:30:12 +02:00
Martin Storsjo 28fcbe9fae Don't use an enum for a value read directly from the bitstream 
The enum only defined values 1-7, while the variable can be set
to any value between 0 and 15 that is read from the bitstream
by FDKreadBits(hBs, 4).

This fixes undefined behaviour sanitizer errors.

Fixes: 19500/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_LIBFDK_AAC_fuzzer-5730449188192256

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
 2020-01-09 10:26:25 +02:00
Xin Li 7ea2e46dc1 DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master 
Bug: 142003500
Change-Id: I809fba949d51f01395793ccb36118e4f5c42e5be
 2019-10-30 11:47:28 -07:00
Martin Storsjo 10fcf89a3e Revert "Reapply: Avoid reading out of bounds due to negative aaIccIndexMapped" 
This reverts commit e6bb256130.

It seems like this isn't needed any longer on the latest upstream
version.
 2019-10-08 15:10:34 +03:00
Martin Storsjo 3e6e1b2097 Revert "Reapply: Avoid reading out of bounds due to too large aaIidIndexMapped" 
This reverts commit 28fdc28ec4.

It seems like this isn't needed any longer on the latest upstream
version.
 2019-10-08 15:10:32 +03:00
Martin Storsjo 18aa41a0e7 Revert "Avoid index-out-of-bounds in prepareDrcGain" 
This reverts commit cc5c85dd70.

It seems like this isn't needed any longer on the latest upstream
version.
 2019-10-08 15:10:29 +03:00
Martin Storsjo 0eb8139145 Revert "Avoid index-out-of-bounds in prepareDrcGain" 
This reverts commit 5ab5496af9.

It seems like this isn't needed any longer on the latest upstream
version.
 2019-10-08 15:10:27 +03:00
Martin Storsjo 9ab69f0c61 Revert "Avoid index-out-of-bounds in processDrcTime" 
This reverts commit 3b9dd6b614.

It seems like this isn't needed any longer on the latest upstream
version.
 2019-10-08 15:10:09 +03:00
Martin Storsjo d3e9ff8fe4 Update the version numbers in the public installed headers 2019-10-08 15:08:35 +03:00
Martin Storsjo e365f4f278 Merge remote-tracking branch 'aosp/master' 2019-10-08 14:53:07 +03:00
Martin Storsjo d387d3b6ed Bump the versions and add a changelog entry for v2.0.1 2019-10-08 14:30:16 +03:00
Martin Storsjo 3b9dd6b614 Avoid index-out-of-bounds in processDrcTime 
Fixes: 17638/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_LIBFDK_AAC_fuzzer-5699860921057280

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
 2019-10-02 13:32:57 +03:00
Xin Li 99e78ac95f [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 09dc9b073f -s ours 
am: 7fc6e3f8ff -s ours
am skip reason: change_id I7e02014b30f1ae5d19dbb7126ebb2a69c411fe5c with SHA1 a209adb315 is in history

Change-Id: I67e58e13c18499f1fdcd5b6b72b8afce257a22f7
 2019-09-08 15:49:32 -07:00
Xin Li 7fc6e3f8ff [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master 
am: 09dc9b073f -s ours
am skip reason: change_id I7e02014b30f1ae5d19dbb7126ebb2a69c411fe5c with SHA1 a209adb315 is in history

Change-Id: I921ce87ed814fc4b8ff3977e3b5fefa796e872f2
 2019-09-08 15:06:57 -07:00
Xin Li 09dc9b073f Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master 
No content change.

Bug: 135460123
Change-Id: I058d0d709bb7752aa276e0047d2e0b81403ee5fc
Merged-In: I7e02014b30f1ae5d19dbb7126ebb2a69c411fe5c
 2019-09-08 12:43:24 -07:00
Martin Storsjo 5ab5496af9 Avoid index-out-of-bounds in prepareDrcGain 
Fixes: 16962/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_LIBFDK_AAC_fuzzer-5708503842291712

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
 2019-09-06 22:42:07 +03:00
Xin Li c7d03309f9 [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: d929f68a05 -s ours am: 5d3d55e2c7 
am: 35b1ada3b4

Change-Id: I735bbaf8236207a00fb745c8e57a04c77b76b432
 2019-09-05 12:09:13 -07:00
Xin Li 35b1ada3b4 [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: d929f68a05 -s ours 
am: 5d3d55e2c7

Change-Id: I0ada3904a4004089fdfdb43966288c019cf58d8c
 2019-09-05 11:50:22 -07:00
Xin Li 5d3d55e2c7 [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" 
am: d929f68a05 -s ours
am skip reason: subject contains skip directive

Change-Id: Iabc2e26ef91b10d03f213fa1a694cb921ca4c1bb
 2019-09-05 11:26:33 -07:00
Xin Li d929f68a05 Merge "DO NOT MERGE - Merge Android 10 into master" 2019-09-05 16:53:26 +00:00
Xin Li a209adb315 DO NOT MERGE - Merge Android 10 into master 
Bug: 139893257
Change-Id: I7e02014b30f1ae5d19dbb7126ebb2a69c411fe5c
 2019-09-04 13:33:32 -07:00
Martin Storsjo cc5c85dd70 Avoid index-out-of-bounds in prepareDrcGain 
Fixes: 15998/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_LIBFDK_AAC_fuzzer-5756080707076096

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
 2019-08-29 22:02:33 +03:00
Martin Storsjo 9b0f848911 Avoid a failed assert on invalid channel indices 
Fixes: 14914/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_LIBFDK_AAC_fuzzer-6288430994030592

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
 2019-08-15 13:14:40 +03:00
Xin Li a3f72d9e44 [automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master" am: c2eb64586d -s ours am: 6266103519 -s ours 
am: bf68b4972f

Change-Id: I05880e6e76d61b683b55364726e841097f130a16
 2019-07-09 17:20:13 -07:00
Xin Li 2480568f89 [automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master am: 569027011c -s ours am: 506ae97bee -s ours 
am: 50d8447d97

Change-Id: Ifb01dd1cbab4f450563f31f93c19dad5bf079404
 2019-07-09 16:48:26 -07:00
Xin Li bf68b4972f [automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master" am: c2eb64586d -s ours 
am: 6266103519 -s ours
am skip reason: subject contains skip directive

Change-Id: I69945c03e154530e7d917f1de7f0669480715686
 2019-07-09 16:14:17 -07:00
Xin Li 50d8447d97 [automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master am: 569027011c -s ours 
am: 506ae97bee -s ours
am skip reason: subject contains skip directive

Change-Id: I715b40974bbd1381f7b72c0ee399fe4214444a0d
 2019-07-09 15:53:24 -07:00
Xin Li 6266103519 [automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master" 
am: c2eb64586d -s ours
am skip reason: subject contains skip directive

Change-Id: I637c44703fdee4aff09ea97fe2dce5c8395a2c63
 2019-07-09 15:47:27 -07:00
Xin Li 506ae97bee [automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master 
am: 569027011c -s ours
am skip reason: subject contains skip directive

Change-Id: I5aecc5cecde457bbfa6a076c68bd0b14bfa5da3f
 2019-07-09 15:08:22 -07:00
Xin Li c2eb64586d Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master" 2019-07-09 21:38:48 +00:00
Xin Li 569027011c DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master 
Bug: 136196576
Change-Id: Ibab15539f2fd0081ef9f8e1a607461d5238c9a88
 2019-07-09 11:23:51 -07:00
android-build-team Robot 617c38c8cf Snap for 5622519 from 81b3f63562 to pi-platform-release 
Change-Id: I2fa7ee95d121ad53fd5e3cc445b83fbeb7bb2d66
 2019-07-08 23:21:02 +00:00
Xin Li 0942f837c5 DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master 
am: 4d56b880e2

Change-Id: Ida7e07f2d981f3df794171aba9385dcc691f43c8
 2019-07-02 12:40:22 -07:00
Xin Li 4d56b880e2 DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master 
Bug: 134405016
Change-Id: I30ab93ed5c2fa3c47306058d1a0f749b8101b01e
 2019-07-01 20:59:18 +00:00
Xin Li a55b37a564 [automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190605.003) into master" am: b018de371d -s ours am: c10b5daa8d -s ours 
am: 058d1295f4

Change-Id: Icf8cfab1834934bd73b2d7cefdfcffc3ac225dc6
 2019-06-10 13:38:20 -07:00
The Android Open Source Project 4e18d84cae [automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190605.003) into master am: c3dcb81334 -s ours am: e52d79c58e -s ours 
am: f8d9637d81

Change-Id: Iba3e60f6fb4670f7f97159c42fc3ff366817a3b1
 2019-06-10 13:29:39 -07:00
Xin Li 058d1295f4 [automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190605.003) into master" am: b018de371d -s ours 
am: c10b5daa8d -s ours
am skip reason: subject contains skip directive

Change-Id: Ia1d6cf99beb6ee823b4e188c59025139db431f02
 2019-06-10 13:27:49 -07:00
The Android Open Source Project f8d9637d81 [automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190605.003) into master am: c3dcb81334 -s ours 
am: e52d79c58e -s ours
am skip reason: subject contains skip directive

Change-Id: I68fb72ac2812bd9499eca63c16ddd4e02f483506
 2019-06-10 13:17:27 -07:00
Xin Li c10b5daa8d [automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190605.003) into master" 
am: b018de371d -s ours
am skip reason: subject contains skip directive

Change-Id: Iacff6609b76e136716228b61a989a4a81b051c4f
 2019-06-10 13:16:42 -07:00
The Android Open Source Project e52d79c58e [automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190605.003) into master 
am: c3dcb81334 -s ours
am skip reason: subject contains skip directive

Change-Id: I92a43f949f1ca6b2d060c3bd8b5edf097b7db637
 2019-06-10 13:05:55 -07:00
Xin Li b018de371d Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190605.003) into master" 2019-06-10 19:54:59 +00:00
The Android Open Source Project c3dcb81334 DO NOT MERGE - Merge pie-platform-release (PPRL.190605.003) into master 
Bug: 134605042
Change-Id: Ife6e13bfe9017388e48143e2f6475111d5bebca3
 2019-06-10 09:32:24 -07:00
Xin Li e8095d4d8e [automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190605.003) into stage-aosp-master am: 0ef4321d83 -s ours 
am: 68078adb95

Change-Id: If38052df38ec81ce9e488ab9a58bc61724f2e664
 2019-06-05 17:34:37 -07:00