fenix/fdk-aac
1
0
Fork 0
mirror of https://github.com/mstorsjo/fdk-aac.git synced 2025-02-08 15:48:43 +01:00
Code Issues Projects Releases Wiki Activity
207 Commits 10 Branches 11 Tags
Commit Graph

207 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Michel Trivi
6f71724cd7 DO NOT MERGE Prevent out of bound memory access in GetInvInt am: 070e7b81c0 am: 6fac7101c6 am: 96fbbc31db -s ours am: 272ae57aa8 am: a8eba4b634 am: c7048181c0 am: 849c9b161a 
am: e8c8539070  -s ours

Change-Id: Idafc9e6351b9590bda06fca836540efb4fb45246
 2017-11-03 19:35:36 +00:00
Jean-Michel Trivi
e8c8539070 DO NOT MERGE Prevent out of bound memory access in GetInvInt am: 070e7b81c0 am: 6fac7101c6 am: 96fbbc31db -s ours am: 272ae57aa8 am: a8eba4b634 am: c7048181c0 
am: 849c9b161a

Change-Id: I2b195f437bad5f77e48f6f8dce56542633f7d30b
 2017-11-03 19:32:37 +00:00
Jean-Michel Trivi
849c9b161a DO NOT MERGE Prevent out of bound memory access in GetInvInt am: 070e7b81c0 am: 6fac7101c6 am: 96fbbc31db -s ours am: 272ae57aa8 am: a8eba4b634 
am: c7048181c0

Change-Id: I7d1de9b9cf9e03a03d27b5f5fd89eb08ff12f280
 2017-11-03 19:28:08 +00:00
Jean-Michel Trivi
c7048181c0 DO NOT MERGE Prevent out of bound memory access in GetInvInt am: 070e7b81c0 am: 6fac7101c6 am: 96fbbc31db -s ours am: 272ae57aa8 
am: a8eba4b634

Change-Id: I7c719af7670774f2db0f01d8a97199d4b3889be4
 2017-11-03 19:25:05 +00:00
Jean-Michel Trivi
b9d122614f DO NOT MERGE Prevent out of bound memory access in GetInvInt am: 51f38b3a6d am: 5285345743 am: 3e28ad2039 am: d948041971 
am: 73d49a121c  -s ours

Change-Id: I06a83a28b5a843bcd7865edc8f148b6fb1b0f649
 2017-11-03 19:21:19 +00:00
Jean-Michel Trivi
a8eba4b634 DO NOT MERGE Prevent out of bound memory access in GetInvInt am: 070e7b81c0 am: 6fac7101c6 am: 96fbbc31db -s ours 
am: 272ae57aa8

Change-Id: Id7da9dba87a2951901e0732e666cd84b1e6d573e
 2017-11-03 19:21:05 +00:00
Jean-Michel Trivi
7f986a4b77 DO NOT MERGE Prevent out of bound memory access in GetInvInt am: 3b6a14a1e0 am: a1deac7b1a 
am: bceba8dd97  -s ours

Change-Id: I1c7b0d98c7dc985852863c3466ad98df394c750e
 2017-11-03 19:21:04 +00:00
Jean-Michel Trivi
73d49a121c DO NOT MERGE Prevent out of bound memory access in GetInvInt am: 51f38b3a6d am: 5285345743 am: 3e28ad2039 
am: d948041971

Change-Id: I078057af435ad081e8f55574c03706b8e73405e4
 2017-11-03 19:17:58 +00:00
Jean-Michel Trivi
bceba8dd97 DO NOT MERGE Prevent out of bound memory access in GetInvInt am: 3b6a14a1e0 
am: a1deac7b1a

Change-Id: Icdb0255365260129f6c1ce8cb8a323d87015cf87
 2017-11-03 19:17:35 +00:00
Jean-Michel Trivi
d948041971 DO NOT MERGE Prevent out of bound memory access in GetInvInt am: 51f38b3a6d am: 5285345743 
am: 3e28ad2039

Change-Id: I410dc4905aaa0cceeb40d4a6d7ef5072c93ee6ae
 2017-11-03 19:16:06 +00:00
Jean-Michel Trivi
272ae57aa8 DO NOT MERGE Prevent out of bound memory access in GetInvInt am: 070e7b81c0 am: 6fac7101c6 
am: 96fbbc31db  -s ours

Change-Id: Icab41a4c796ad9f31128dd8289ea4839d5823605
 2017-11-03 19:16:05 +00:00
Jean-Michel Trivi
3e28ad2039 DO NOT MERGE Prevent out of bound memory access in GetInvInt am: 51f38b3a6d 
am: 5285345743

Change-Id: Ia99bbf37644c24b32d967e6736b913da605f2d12
 2017-11-03 19:14:05 +00:00
Jean-Michel Trivi
139ba15904 DO NOT MERGE Prevent out of bound memory access in GetInvInt 
am: 0d54662fe8  -s ours

Change-Id: I192e79af896606e8d5d17f63e0883f2069be1a12
 2017-11-03 19:14:04 +00:00
Jean-Michel Trivi
a1deac7b1a DO NOT MERGE Prevent out of bound memory access in GetInvInt 
am: 3b6a14a1e0

Change-Id: Id527e5320a362042ef0c65329082a369687e9db7
 2017-11-03 19:13:34 +00:00
Jean-Michel Trivi
96fbbc31db DO NOT MERGE Prevent out of bound memory access in GetInvInt am: 070e7b81c0 
am: 6fac7101c6

Change-Id: If3c68bd6341d7c9eff5257ec41ca6c1a2161077c
 2017-11-03 19:13:34 +00:00
Jean-Michel Trivi
5285345743 DO NOT MERGE Prevent out of bound memory access in GetInvInt 
am: 51f38b3a6d

Change-Id: I01d4479fd2194e85b77b11d678facb7f581ff517
 2017-11-03 19:10:33 +00:00
Jean-Michel Trivi
6fac7101c6 DO NOT MERGE Prevent out of bound memory access in GetInvInt 
am: 070e7b81c0

Change-Id: Ibcddd5c0e53aaae0d26e1c33c6e42bc7268cf6a1
 2017-11-03 19:10:04 +00:00
Jean-Michel Trivi
5ce724f1dd DO NOT MERGE Prevent out of bound memory access in GetInvInt 
In GetInvInt(int) function, malicious content can access memory
 outside of the invCount array. Always bound access to valid
 indices.

Test: see bug for malicious content, decoded with "stagefright -s -a"
Bug: 65025048
Change-Id: I92d4a14519f45d5a329d7f69f21f2aef0a8c6daa
 2017-11-02 18:55:37 +00:00
Jean-Michel Trivi
0d54662fe8 DO NOT MERGE Prevent out of bound memory access in GetInvInt 
In GetInvInt(int) function, malicious content can access memory
 outside of the invCount array. Always bound access to valid
 indices.

Test: see bug for malicious content, decoded with "stagefright -s -a"
Bug: 65025048
Change-Id: I92d4a14519f45d5a329d7f69f21f2aef0a8c6daa
 2017-11-02 18:54:15 +00:00
Jean-Michel Trivi
3b6a14a1e0 DO NOT MERGE Prevent out of bound memory access in GetInvInt 
In GetInvInt(int) function, malicious content can access memory
 outside of the invCount array. Always bound access to valid
 indices.

Test: see bug for malicious content, decoded with "stagefright -s -a"
Bug: 65025048
Change-Id: I92d4a14519f45d5a329d7f69f21f2aef0a8c6daa
 2017-11-02 18:52:41 +00:00
Jean-Michel Trivi
51f38b3a6d DO NOT MERGE Prevent out of bound memory access in GetInvInt 
In GetInvInt(int) function, malicious content can access memory
 outside of the invCount array. Always bound access to valid
 indices.

Test: see bug for malicious content, decoded with "stagefright -s -a"
Bug: 65025048
Change-Id: I92d4a14519f45d5a329d7f69f21f2aef0a8c6daa
 2017-11-02 16:25:34 +00:00
Jean-Michel Trivi
070e7b81c0 DO NOT MERGE Prevent out of bound memory access in GetInvInt 
In GetInvInt(int) function, malicious content can access memory
 outside of the invCount array. Always bound access to valid
 indices.

Test: see bug for malicious content, decoded with "stagefright -s -a"
Bug: 65025048
Change-Id: Iff889601828f95b82d9291075f3909922ef533ef
 2017-10-30 22:46:18 +00:00
liuchao
47dd0b4589 Merge "Fix not properly handled NULL-pointer access before check in aac lib" am: b0af861f5a am: b0f6b2906e 
am: ef9be61680

Change-Id: Ibfe81134a2089946800580538775faaa1bbe00ef
 2017-02-23 21:50:11 +00:00
liuchao
ef9be61680 Merge "Fix not properly handled NULL-pointer access before check in aac lib" am: b0af861f5a 
am: b0f6b2906e

Change-Id: I06232a0b0126349e7d4cffff0d9c1eac90eddbb2
 2017-02-23 21:48:07 +00:00
liuchao
b0f6b2906e Merge "Fix not properly handled NULL-pointer access before check in aac lib" 
am: b0af861f5a

Change-Id: Id59fd9de48f99c572fa964d7e60b57312edadece
 2017-02-23 21:45:43 +00:00
Treehugger Robot
b0af861f5a Merge "Fix not properly handled NULL-pointer access before check in aac lib" 2017-02-23 21:25:44 +00:00
liuchao
64bd48e21b Fix not properly handled NULL-pointer access before check in aac lib 
1) Fixes some potential NULL-pointer access in case input pointer is
passed NULL
2) Modified some for lazy init

Test: mm -j 8
Change-Id: I7fca97e1d9f70d8e8c1533b519181af35a5468f7
 2017-02-23 14:22:01 +08:00
Jakub Pawlowski
30fa0b87e9 Merge "Linux compilation fix" am: b82c85d0b1 am: 7c8dd3bb93 
am: f4bd5f6bd4

Change-Id: I4f054be1c1342296c69748c2e616b07c7bd9401c
 2017-02-21 20:58:55 +00:00
Jakub Pawlowski
f4bd5f6bd4 Merge "Linux compilation fix" am: b82c85d0b1 
am: 7c8dd3bb93

Change-Id: Ifba0bf717a42c3889ea686d1f46cd0758e61851e
 2017-02-21 20:56:55 +00:00
Jakub Pawlowski
7c8dd3bb93 Merge "Linux compilation fix" 
am: b82c85d0b1

Change-Id: I934d6c1b7011453b71c28c9ec64da3f3af865782
 2017-02-21 20:53:55 +00:00
Treehugger Robot
b82c85d0b1 Merge "Linux compilation fix" 2017-02-21 20:48:23 +00:00
Jakub Pawlowski
2cd9fe3964 Linux compilation fix 
Test: manual
Change-Id: Ie374e47b93e8fa3a44c731cb73f7e151d265c74c
 2017-02-21 10:43:02 -08:00
Pavlin Radoslavov
dfc9132496 Merge "Change build config of aac from Android.mk to Android.bp" am: 8334e4b410 am: 2eba55c5a8 am: 1679274c9c 
am: 4910e5a352

Change-Id: I06e73ca6768323110b658548a189a1f69695cc08
 2017-01-20 02:35:09 +00:00
Pavlin Radoslavov
4910e5a352 Merge "Change build config of aac from Android.mk to Android.bp" am: 8334e4b410 am: 2eba55c5a8 
am: 1679274c9c

Change-Id: I17c2d7f5c558e17fc4b579d879160f4d6a6ce587
 2017-01-20 02:19:38 +00:00
Pavlin Radoslavov
1679274c9c Merge "Change build config of aac from Android.mk to Android.bp" am: 8334e4b410 
am: 2eba55c5a8

Change-Id: I16c8e041daad6f21dd80ec50db52ae488f1b91c5
 2017-01-20 02:11:06 +00:00
Pavlin Radoslavov
2eba55c5a8 Merge "Change build config of aac from Android.mk to Android.bp" 
am: 8334e4b410

Change-Id: I770984561bf97b52e50c83844f4037fccabfdedc
 2017-01-20 02:02:27 +00:00
Treehugger Robot
8334e4b410 Merge "Change build config of aac from Android.mk to Android.bp" 2017-01-20 01:50:48 +00:00
Pavlin Radoslavov
6cc0003b74 Change build config of aac from Android.mk to Android.bp 
* In an effort to modernize build configurations to the new Soong
  system, we need to upgrade existing Android.mk files to Android.bp
* This file is done by using the following steps:
  1. Manually removing all *_sources from Android.mk, because
     of the unusual make logic they use
  2. Running the auto-conversion tool:
     androidmk Android.mk > Android.bp
  3. Editing the result Android.bp:
     3.1. Writing the "srcs" list
     3.2. Removing the escaping around -Wno-#warnings in cflags,
          because those are not needed anymore
     3.3. Renamed local_include_dirs to export_include_dirs to
          facilititate the inclusion of header files.
          It appears users of libFraunhoferAAC are using header
          files from all include directories, hence the renaming.

Test: Code compilation ("mm" in external/aac, and "make" in top-directory)
Bug: b/32958753 b/34454142
Change-Id: Ie89f73722908e8734f4b88f1407952311ec064af
 2017-01-19 13:10:11 -08:00
Martin Storsjo
889731b62d Merge "Remove redundant register storage class specifiers" am: ed91226cec am: 664e5f2794 am: bfba552d9e 
am: de03facdb2

Change-Id: Iaeb5b599896e4c640b8902c26cc6e3f7405a1256
 2016-10-28 01:27:58 +00:00
Martin Storsjo
de03facdb2 Merge "Remove redundant register storage class specifiers" am: ed91226cec am: 664e5f2794 
am: bfba552d9e

Change-Id: I02d87c067cdcea95ce7ee207da15bf85d5a21e89
 2016-10-28 01:23:28 +00:00
Martin Storsjo
bfba552d9e Merge "Remove redundant register storage class specifiers" am: ed91226cec 
am: 664e5f2794

Change-Id: I9d17d79e37bac378e853d6102b26a8c354790957
 2016-10-28 01:18:57 +00:00
Martin Storsjo
664e5f2794 Merge "Remove redundant register storage class specifiers" 
am: ed91226cec

Change-Id: Ieb0f6090190d7cd2d21599f9b1e6ce950608313d
 2016-10-28 01:14:27 +00:00
Treehugger Robot
ed91226cec Merge "Remove redundant register storage class specifiers" 2016-10-28 01:08:50 +00:00
Martin Storsjo
6ec082c6c3 Remove redundant register storage class specifiers 
Clang warns about this being deprecated, when building without specifying
-std=c++98.

This doesn't give any measurable encoding speed impact on ARM or AArch64,
on neither GCC nor Clang.

Change-Id: I63a0bbd1dccb97547522da188ee585d4d8127c29
 2016-10-18 09:22:55 +03:00
Martin Storsjo
6085e575ca Merge "Add casts to avoid errors due to narrowing" am: 4556cb9cb8 am: 515fb25ef7 
am: 8124c22bb7

Change-Id: I49295c5d3cba3a7f97c9d9494df59f460c2c195a
 2016-10-18 03:25:40 +00:00
Martin Storsjo
8124c22bb7 Merge "Add casts to avoid errors due to narrowing" am: 4556cb9cb8 
am: 515fb25ef7

Change-Id: Ic97d0e64efee960f87b2cb7581666b2af05873cd
 2016-10-18 03:18:40 +00:00
Martin Storsjo
515fb25ef7 Merge "Add casts to avoid errors due to narrowing" 
am: 4556cb9cb8

Change-Id: I4cb4a7dace03c7c09403588da05ea8df0f35077e
 2016-10-18 03:12:10 +00:00
Treehugger Robot
4556cb9cb8 Merge "Add casts to avoid errors due to narrowing" 2016-10-18 03:05:51 +00:00
Martin Storsjo
6d7d5013ea Add casts to avoid errors due to narrowing 
This fixes building in C++11 mode, which normally errors out
on narrowing hex literals to signed long.

This is similar to what was done in git commit ef30836651
(change id I64d19a8a8059c5a96386b1eaac297fd2469515f8), completing
the fix for that category of issues.

Change-Id: I1907bc947d43bf44910fb2b34bf2b31c0e53aa53
 2016-10-17 10:32:24 +03:00
Jean-Michel Trivi
43585d3f18 Merge "Avoid a warning about extra parentheses" am: f935254cc9 am: 899335d310 am: 79c3cd8b1a 
am: ca6ae4ffe4

Change-Id: Ia6bbf7532c0058ae716f6243fadf66b032fd7e7b
 2016-09-09 22:22:40 +00:00