Jean-Michel Trivi
fb4d8cc62f
Merge "DO NOT MERGE Prevent out of bound memory access in GetInvInt" into lmp-mr1-dev am: 5565e7791f -s ours am: e1d517a909 am: c0719825a2 am: 022a305d55 am: 75fe8cb95e -s ours am: 41363eb993
...
am: ad2e179de6
Change-Id: I29f8bb0bb8accc369636d8d8726f7b505ce081d2
2017-11-03 19:25:38 +00:00
Jean-Michel Trivi
902decfc99
Fix out of bound memory access in lppTransposer am: 6d3dd40e20 am: 2a7b438754 am: fca1027937 am: d8e897ae9e am: 6e15baff97 am: 06c27a9feb
...
am: e6b649a380
Change-Id: I54610df83d3e84021bd71e81c2f910545908c986
2017-11-03 19:25:27 +00:00
Jean-Michel Trivi
0c25940e1c
DO NOT MERGE Prevent out of bound memory access in GetInvInt am: d0e8397b7b am: 7462464e43 am: 2bebb8fb65 am: d157498711 -s ours am: 724b40ccce
...
am: 67a321cd17
Change-Id: I07c673dbbdab32f515bbefb52bd4495c83664ccf
2017-11-03 19:25:17 +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
ad2e179de6
Merge "DO NOT MERGE Prevent out of bound memory access in GetInvInt" into lmp-mr1-dev am: 5565e7791f -s ours am: e1d517a909 am: c0719825a2 am: 022a305d55 am: 75fe8cb95e -s ours
...
am: 41363eb993
Change-Id: Ia506184ac99982b5602daccfa0ef2471965ef99a
2017-11-03 19:21:42 +00:00
Jean-Michel Trivi
e6b649a380
Fix out of bound memory access in lppTransposer am: 6d3dd40e20 am: 2a7b438754 am: fca1027937 am: d8e897ae9e am: 6e15baff97
...
am: 06c27a9feb
Change-Id: Id5bfc33a815aec69a302b5ba1460ad2d556c9179
2017-11-03 19:21:31 +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
67a321cd17
DO NOT MERGE Prevent out of bound memory access in GetInvInt am: d0e8397b7b am: 7462464e43 am: 2bebb8fb65 am: d157498711 -s ours
...
am: 724b40ccce
Change-Id: Ia566e7de7c215e77bd6d6f0f1f069a855b9edc02
2017-11-03 19:21:18 +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
41363eb993
Merge "DO NOT MERGE Prevent out of bound memory access in GetInvInt" into lmp-mr1-dev am: 5565e7791f -s ours am: e1d517a909 am: c0719825a2 am: 022a305d55
...
am: 75fe8cb95e -s ours
Change-Id: I0c790baf5af9e6d15efbbf7cd175770696aa7391
2017-11-03 19:19:32 +00:00
Jean-Michel Trivi
06c27a9feb
Fix out of bound memory access in lppTransposer am: 6d3dd40e20 am: 2a7b438754 am: fca1027937 am: d8e897ae9e
...
am: 6e15baff97
Change-Id: Ic11d63d594dabfb8359d19eb36f9bdcc56abd2ac
2017-11-03 19:19:22 +00:00
Jean-Michel Trivi
724b40ccce
DO NOT MERGE Prevent out of bound memory access in GetInvInt am: d0e8397b7b am: 7462464e43 am: 2bebb8fb65
...
am: d157498711 -s ours
Change-Id: Ica332afb180137b27845c06d35108928102826f6
2017-11-03 19:19: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
75fe8cb95e
Merge "DO NOT MERGE Prevent out of bound memory access in GetInvInt" into lmp-mr1-dev am: 5565e7791f -s ours am: e1d517a909 am: c0719825a2
...
am: 022a305d55
Change-Id: I15f8ada5cbf90deefb7e9d2221a58a3b8f8dd038
2017-11-03 19:17:35 +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
6e15baff97
Fix out of bound memory access in lppTransposer am: 6d3dd40e20 am: 2a7b438754 am: fca1027937
...
am: d8e897ae9e
Change-Id: Id2b60900e4abe08d2f1c1612e7c729c75f2e61c0
2017-11-03 19:16:22 +00:00
Jean-Michel Trivi
022a305d55
Merge "DO NOT MERGE Prevent out of bound memory access in GetInvInt" into lmp-mr1-dev am: 5565e7791f -s ours am: e1d517a909
...
am: c0719825a2
Change-Id: I526341d43af40089117110cfff2f41586121e5ff
2017-11-03 19:16:06 +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
d157498711
DO NOT MERGE Prevent out of bound memory access in GetInvInt am: d0e8397b7b am: 7462464e43
...
am: 2bebb8fb65
Change-Id: I4645d168431438e8bfbfc28514f21aad015633ac
2017-11-03 19:16:05 +00:00
Jean-Michel Trivi
c0719825a2
Merge "DO NOT MERGE Prevent out of bound memory access in GetInvInt" into lmp-mr1-dev am: 5565e7791f -s ours
...
am: e1d517a909
Change-Id: Id97f3b0f0b59445fe85ab7c957e84d6be65f565b
2017-11-03 19:14: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
d8e897ae9e
Fix out of bound memory access in lppTransposer am: 6d3dd40e20 am: 2a7b438754
...
am: fca1027937
Change-Id: I8803d858a432aea8fba8b7ec29ba28458e7418d8
2017-11-03 19:13:45 +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
2bebb8fb65
DO NOT MERGE Prevent out of bound memory access in GetInvInt am: d0e8397b7b
...
am: 7462464e43
Change-Id: I064298bc197e53e6f5a6ce1872cb77c9444d8dee
2017-11-03 19:13:34 +00:00
Jean-Michel Trivi
e1d517a909
Merge "DO NOT MERGE Prevent out of bound memory access in GetInvInt" into lmp-mr1-dev
...
am: 5565e7791f -s ours
Change-Id: I30f8ee01f8a715cabf8edb10edf15bad032f5001
2017-11-03 19:10:33 +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
fca1027937
Fix out of bound memory access in lppTransposer am: 6d3dd40e20
...
am: 2a7b438754
Change-Id: If16bd906722b4a639be890fcc98bd21db253f404
2017-11-03 19:10:25 +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
7462464e43
DO NOT MERGE Prevent out of bound memory access in GetInvInt
...
am: d0e8397b7b
Change-Id: If35860a327395c578e6f02b3706db0fd041e719e
2017-11-03 19:10:04 +00:00
Jean-Michel Trivi
2a7b438754
Fix out of bound memory access in lppTransposer
...
am: 6d3dd40e20
Change-Id: I4a2b70c82e6bc42b3a0ec00efeb100fe6971a62c
2017-11-03 19:07:04 +00:00
TreeHugger Robot
5565e7791f
Merge "DO NOT MERGE Prevent out of bound memory access in GetInvInt" into lmp-mr1-dev
2017-11-03 19:05:37 +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
6d3dd40e20
Fix out of bound memory access in lppTransposer
...
In TRANSPOSER_SETTINGS, initialize the whole bwBorders array to a
reasonable value to guarantee correct termination in while loop
in lppTransposer function. This fixes the reported bug.
For completeness:
- clear the whole bwIndex array instead of noOfPatches entries only.
- abort criterion in while loop to prevent potential
infinite loop, and limit bwIndex[patch] to a valid range.
Test: see bug for malicious content, decoded with "stagefright -s -a"
Bug: 65280786
Change-Id: I16ed2e1c0f1601926239a652ca20a91284151843
2017-10-31 21:40:14 +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
Jean-Michel Trivi
76c4625fe3
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: Id1f1582bc5afc76e3e90128d92034a5899a9b51e
2017-10-30 22:45:05 +00:00
Jean-Michel Trivi
d0e8397b7b
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 15:20:44 -07: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