OSDN Git Service
Marco Nelissen [Mon, 23 May 2016 23:07:11 +0000 (23:07 +0000)]
Merge "DO NOT MERGE limit mediaserver memory" into klp-dev am:
f8429c0c14 am:
38ab87c3e3 am:
e816dcc0b3 -s ours am:
cbe776167a -s ours am:
61a1371ea1
am:
1094b530ad
* commit '
1094b530ad2189ab879ef0bc20bae820b3d12c86':
DO NOT MERGE limit mediaserver memory
Change-Id: I65c6ecb4787ab13560686b47b2cd970c54bd1118
Marco Nelissen [Mon, 23 May 2016 23:02:59 +0000 (23:02 +0000)]
Merge "DO NOT MERGE limit mediaserver memory" into klp-dev am:
f8429c0c14 am:
38ab87c3e3 am:
e816dcc0b3 -s ours am:
cbe776167a -s ours
am:
61a1371ea1
* commit '
61a1371ea195495c4bf2fe30812cce9275674c08':
DO NOT MERGE limit mediaserver memory
Change-Id: I8939080db97ba4a7bfc6d858ec6d6bc1e8296868
Marco Nelissen [Mon, 23 May 2016 22:58:51 +0000 (22:58 +0000)]
Merge "limit mediaserver memory" into lmp-dev am:
41e0a503e6 am:
76f9ec33f0
am:
57dc6d9dce
* commit '
57dc6d9dce0bbafa442fda41f98da858b89c5059':
limit mediaserver memory
Change-Id: Id57767343c25b32bf523ac1c5f421f2f38fb68ad
Marco Nelissen [Mon, 23 May 2016 22:58:50 +0000 (22:58 +0000)]
Merge "DO NOT MERGE limit mediaserver memory" into klp-dev am:
f8429c0c14 am:
38ab87c3e3 am:
e816dcc0b3 -s ours
am:
cbe776167a -s ours
* commit '
cbe776167a52a43f6acbafd3278e662840a256c2':
DO NOT MERGE limit mediaserver memory
Change-Id: I271600c88d36fc23ecfaea51d6fc22f39546ea9f
Marco Nelissen [Mon, 23 May 2016 22:54:45 +0000 (22:54 +0000)]
Merge "DO NOT MERGE limit mediaserver memory" into klp-dev am:
f8429c0c14 am:
38ab87c3e3
am:
e816dcc0b3 -s ours
* commit '
e816dcc0b3ea6d5cee3b0b4ff230a20ab85b5996':
DO NOT MERGE limit mediaserver memory
Change-Id: Ia2bb13dbcbe30984d86c1a625ded2db5ddbbca2d
Marco Nelissen [Mon, 23 May 2016 22:54:44 +0000 (22:54 +0000)]
Merge "limit mediaserver memory" into lmp-dev am:
41e0a503e6
am:
76f9ec33f0
* commit '
76f9ec33f0e0ac80904b1cebe50b5d2bb3ccaf07':
limit mediaserver memory
Change-Id: Ib771b5daec2ce2dd981193b1425002f8bc7db2e7
Marco Nelissen [Mon, 23 May 2016 22:50:37 +0000 (22:50 +0000)]
Merge "DO NOT MERGE limit mediaserver memory" into klp-dev am:
f8429c0c14
am:
38ab87c3e3
* commit '
38ab87c3e3cd4868958fcec4d1591ebc4a9e8d1a':
DO NOT MERGE limit mediaserver memory
Change-Id: I053031830618e20ff830ae3c097abba10ae73cfc
Marco Nelissen [Mon, 23 May 2016 22:46:25 +0000 (22:46 +0000)]
Merge "limit mediaserver memory" into lmp-dev
am:
41e0a503e6
* commit '
41e0a503e6f0c124208a7b9a8fa7321656359407':
limit mediaserver memory
Change-Id: I95f77a8d40bd8e7fcd5a0dfae71d29809a3e62cc
Marco Nelissen [Mon, 23 May 2016 22:46:23 +0000 (22:46 +0000)]
Merge "DO NOT MERGE limit mediaserver memory" into klp-dev
am:
f8429c0c14
* commit '
f8429c0c147b081ff6f06f55f8fa2f36fc60063e':
DO NOT MERGE limit mediaserver memory
Change-Id: Ia88648ff82be88a90c98ded3061a6f04db74c03b
Marco Nelissen [Mon, 23 May 2016 22:36:20 +0000 (22:36 +0000)]
Merge "limit mediaserver memory" into lmp-dev
Marco Nelissen [Mon, 23 May 2016 22:35:11 +0000 (22:35 +0000)]
Merge "DO NOT MERGE limit mediaserver memory" into klp-dev
Marco Nelissen [Fri, 13 May 2016 17:43:19 +0000 (10:43 -0700)]
DO NOT MERGE limit mediaserver memory
Limit mediaserver using rlimit, to prevent it from bringing down the system
via the low memory killer.
Default max is 65% of total RAM, but can be customized via system property.
Bug:
28471206
Bug:
28615448
Change-Id: I14fac1e12b5f3983be08a21bfbfc54feedbf3f16
Marco Nelissen [Mon, 23 May 2016 14:52:11 +0000 (14:52 +0000)]
Merge "DO NOT MERGE Check malloc result to avoid NPD" into klp-dev am:
fddbb1a791 am:
9897bd43a6 am:
8fd8bfdfbd -s ours am:
748277a992 -s ours am:
71b3486ba6
am:
f55cac801a
* commit '
f55cac801a7678b58d16196b42d8110f67684024':
DO NOT MERGE Check malloc result to avoid NPD
Change-Id: I0b79d04edda6a674bc2531a713d128485619e65b
Marco Nelissen [Mon, 23 May 2016 14:49:20 +0000 (14:49 +0000)]
Merge "Check malloc result to avoid NPD" into lmp-dev am:
e5734d88ad am:
f6e3609de2
am:
6d1da7d539
* commit '
6d1da7d53995c1a171eedc99bd9b17d8dfe3d158':
Check malloc result to avoid NPD
Change-Id: I92303d3c07ff920a4c7e2d1a94bd341102035ba1
Marco Nelissen [Mon, 23 May 2016 14:49:19 +0000 (14:49 +0000)]
Merge "DO NOT MERGE Check malloc result to avoid NPD" into klp-dev am:
fddbb1a791 am:
9897bd43a6 am:
8fd8bfdfbd -s ours am:
748277a992 -s ours
am:
71b3486ba6
* commit '
71b3486ba6744e1804294ab3a9d6e37c2d3ac0cb':
DO NOT MERGE Check malloc result to avoid NPD
Change-Id: I97abc666f4c0daba61bd4420ba45e453479b8393
Marco Nelissen [Mon, 23 May 2016 14:46:25 +0000 (14:46 +0000)]
Merge "DO NOT MERGE Check malloc result to avoid NPD" into klp-dev am:
fddbb1a791 am:
9897bd43a6 am:
8fd8bfdfbd -s ours
am:
748277a992 -s ours
* commit '
748277a99233a764273a9356704d38a91458c704':
DO NOT MERGE Check malloc result to avoid NPD
Change-Id: Ic1a8b9ca9793562e4da245ca8a6eb13702152a4d
Marco Nelissen [Mon, 23 May 2016 14:46:25 +0000 (14:46 +0000)]
Merge "Check malloc result to avoid NPD" into lmp-dev am:
e5734d88ad
am:
f6e3609de2
* commit '
f6e3609de238b63860d0892b26c76ee35d24cf06':
Check malloc result to avoid NPD
Change-Id: I72901f000c1285ae394664234e245063f87cfbf0
Marco Nelissen [Mon, 23 May 2016 14:43:28 +0000 (14:43 +0000)]
Merge "DO NOT MERGE Check malloc result to avoid NPD" into klp-dev am:
fddbb1a791 am:
9897bd43a6
am:
8fd8bfdfbd -s ours
* commit '
8fd8bfdfbd930cdc669c4fc33d7d251f12ec7e5e':
DO NOT MERGE Check malloc result to avoid NPD
Change-Id: I97bc664b28a9e96051d0bc63c4cc4501bd2f901b
Marco Nelissen [Mon, 23 May 2016 14:40:27 +0000 (14:40 +0000)]
Merge "DO NOT MERGE Check malloc result to avoid NPD" into klp-dev am:
fddbb1a791
am:
9897bd43a6
* commit '
9897bd43a614c28e6c52dcbce817d9ef6f201ccc':
DO NOT MERGE Check malloc result to avoid NPD
Change-Id: Ia9f97994af54fff11644f7d59821e8ddf6fb54f1
Marco Nelissen [Mon, 23 May 2016 14:40:27 +0000 (14:40 +0000)]
Merge "Check malloc result to avoid NPD" into lmp-dev
am:
e5734d88ad
* commit '
e5734d88ad6e4eacf110ed3f9aa4041b8b5598be':
Check malloc result to avoid NPD
Change-Id: I20f011a5a48128f41c9000818df1c2498621657b
Marco Nelissen [Mon, 23 May 2016 14:37:29 +0000 (14:37 +0000)]
Merge "DO NOT MERGE Check malloc result to avoid NPD" into klp-dev
am:
fddbb1a791
* commit '
fddbb1a791975adfa1323377b09606ad44122ff2':
DO NOT MERGE Check malloc result to avoid NPD
Change-Id: Idf65c8e5520e1c2a4571ea434f0114ae13334e7b
Marco Nelissen [Mon, 23 May 2016 14:32:55 +0000 (14:32 +0000)]
Merge "Check malloc result to avoid NPD" into lmp-dev
Marco Nelissen [Mon, 23 May 2016 14:32:45 +0000 (14:32 +0000)]
Merge "DO NOT MERGE Check malloc result to avoid NPD" into klp-dev
Marco Nelissen [Fri, 13 May 2016 17:39:23 +0000 (10:39 -0700)]
limit mediaserver memory
Limit mediaserver using rlimit, to prevent it from bringing down the system
via the low memory killer.
Default max is 65% of total RAM, but can be customized via system property.
Bug:
28471206
Bug:
28615448
Change-Id: Ic84137435d1ef0a6883e9789a4b4f399e4283f05
Jeff Tinker [Fri, 13 May 2016 21:29:11 +0000 (21:29 +0000)]
Merge "Fix security vulnerability in libstagefright" into klp-dev am:
eb37c37c59 am:
883b244f45 am:
31a3aa5628 am:
f11141924a am:
64149d756a
am:
16f7ee09b0
* commit '
16f7ee09b0ce814c7f45085b095c56ba44ba4133':
Fix security vulnerability in libstagefright
Change-Id: I014e1098165beac42fbe08744911547eec5e16fe
Jeff Tinker [Fri, 13 May 2016 21:26:13 +0000 (21:26 +0000)]
Merge "Fix security vulnerability in libstagefright" into klp-dev am:
eb37c37c59 am:
883b244f45 am:
31a3aa5628 am:
f11141924a
am:
64149d756a
* commit '
64149d756a3b32635247248419778631daf3e294':
Fix security vulnerability in libstagefright
Change-Id: I114de4c4b430e9fd44d8204dd54db4abd5f29035
Jeff Tinker [Fri, 13 May 2016 21:23:28 +0000 (21:23 +0000)]
Merge "Fix security vulnerability in libstagefright" into klp-dev am:
eb37c37c59 am:
883b244f45 am:
31a3aa5628
am:
f11141924a
* commit '
f11141924a3b4208954bedf3dbeb9b7bfaab75c5':
Fix security vulnerability in libstagefright
Change-Id: Ie56f84aae5d2d17a62932f3d2274978f82a34cd4
Jeff Tinker [Fri, 13 May 2016 21:20:29 +0000 (21:20 +0000)]
Merge "Fix security vulnerability in libstagefright" into klp-dev am:
eb37c37c59 am:
883b244f45
am:
31a3aa5628
* commit '
31a3aa56287d63aaf1ac804cc04154ed779032ff':
Fix security vulnerability in libstagefright
Change-Id: I4d666e42bfc64e384b9fd8c8fad07d645be6a19a
Jeff Tinker [Fri, 13 May 2016 21:17:31 +0000 (21:17 +0000)]
Merge "Fix security vulnerability in libstagefright" into klp-dev am:
eb37c37c59
am:
883b244f45
* commit '
883b244f4567fe0cd099f0583940e531eb0e2af4':
Fix security vulnerability in libstagefright
Change-Id: Idd0798f74590e2546c4f0d1b0940ccf7e42f5a17
Jeff Tinker [Fri, 13 May 2016 21:14:44 +0000 (21:14 +0000)]
Merge "Fix security vulnerability in libstagefright" into klp-dev
am:
eb37c37c59
* commit '
eb37c37c594604d0e6acbf14be6e04e065fab226':
Fix security vulnerability in libstagefright
Change-Id: Icaecc46c13c06e6eff0167bbc1af4c580d161f62
Jeff Tinker [Fri, 13 May 2016 21:08:15 +0000 (21:08 +0000)]
Merge "Fix security vulnerability in libstagefright" into klp-dev
Marco Nelissen [Wed, 11 May 2016 18:11:20 +0000 (11:11 -0700)]
Check malloc result to avoid NPD
Bug:
28471206
Change-Id: Id5d055d76893d6f53a2e524ff5f282d1ddca3345
Marco Nelissen [Wed, 11 May 2016 18:11:20 +0000 (11:11 -0700)]
DO NOT MERGE Check malloc result to avoid NPD
Bug:
28471206
Change-Id: Id5d055d76893d6f53a2e524ff5f282d1ddca3345
Pawin Vongmasa [Fri, 13 May 2016 19:57:04 +0000 (19:57 +0000)]
h264bsdActivateParamSets: Prevent multiplication overflow. am:
87277aac64 am:
2a68d5279d am:
5dfa5f268e am:
a0bb560e3b am:
7c22e59819
am:
548439e243
* commit '
548439e243accefdb42d318175aedd281a225da4':
h264bsdActivateParamSets: Prevent multiplication overflow.
Change-Id: I6aea83511caf50e10d2e76ccafbecc0bba68cdf9
Pawin Vongmasa [Fri, 13 May 2016 19:54:19 +0000 (19:54 +0000)]
h264bsdActivateParamSets: Prevent multiplication overflow. am:
87277aac64 am:
2a68d5279d am:
5dfa5f268e am:
a0bb560e3b
am:
7c22e59819
* commit '
7c22e598197706108f15fe182c4bf76fc26b105c':
h264bsdActivateParamSets: Prevent multiplication overflow.
Change-Id: I9a70fe73ccb761e8c39021608bf31d79884fc165
Pawin Vongmasa [Fri, 13 May 2016 19:51:36 +0000 (19:51 +0000)]
h264bsdActivateParamSets: Prevent multiplication overflow. am:
87277aac64 am:
2a68d5279d am:
5dfa5f268e
am:
a0bb560e3b
* commit '
a0bb560e3bdbfa96c4184545ed82c17d01025294':
h264bsdActivateParamSets: Prevent multiplication overflow.
Change-Id: I24776d732ce661acf0a3ee1bdb31055a39258c98
Pawin Vongmasa [Fri, 13 May 2016 19:48:56 +0000 (19:48 +0000)]
h264bsdActivateParamSets: Prevent multiplication overflow. am:
87277aac64 am:
2a68d5279d
am:
5dfa5f268e
* commit '
5dfa5f268e97d862744ffddc4596577495022bea':
h264bsdActivateParamSets: Prevent multiplication overflow.
Change-Id: I30bba39d44061c72485419ac8686fba2427e3328
Pawin Vongmasa [Fri, 13 May 2016 19:46:20 +0000 (19:46 +0000)]
h264bsdActivateParamSets: Prevent multiplication overflow. am:
87277aac64
am:
2a68d5279d
* commit '
2a68d5279d714188c50a32819ae0d0ed2535a763':
h264bsdActivateParamSets: Prevent multiplication overflow.
Change-Id: I00c30eb03aab08cb86afa34ab3e7a86a176b4dda
Pawin Vongmasa [Fri, 13 May 2016 19:43:42 +0000 (19:43 +0000)]
h264bsdActivateParamSets: Prevent multiplication overflow.
am:
87277aac64
* commit '
87277aac64a21461b657298dcdcb809737347980':
h264bsdActivateParamSets: Prevent multiplication overflow.
Change-Id: I87166daa0493721d44a10531466b59080b65f153
Jeff Tinker [Fri, 13 May 2016 18:48:11 +0000 (11:48 -0700)]
Fix security vulnerability in libstagefright
bug:
28175045
Change-Id: Icee6c7eb5b761da4aa3e412fb71825508d74d38f
Pawin Vongmasa [Wed, 11 May 2016 23:08:21 +0000 (16:08 -0700)]
h264bsdActivateParamSets: Prevent multiplication overflow.
Report MEMORY_ALLOCATION_ERROR if pStorage->picSizeInMbs would
exceed UINT32_MAX bytes.
Bug:
28532266
Change-Id: Ia6f11efb18818afcdb5fa2a38a14f2a2d8c8447a
Marco Nelissen [Tue, 3 May 2016 23:32:43 +0000 (23:32 +0000)]
Merge "Clear unused pointer field when sending across binder" into klp-dev am:
71095f174e am:
4b817b51e2 am:
2d4cf313fa am:
ef1fcffc98 am:
38f24823d0
am:
d2c61d049b
* commit '
d2c61d049b52158c506a2c61727078fccb92b898':
Clear unused pointer field when sending across binder
Change-Id: I5e41f418c9fcdea8bc05c150772a0b87cef101bd
Marco Nelissen [Tue, 3 May 2016 23:30:14 +0000 (23:30 +0000)]
Merge "Clear unused pointer field when sending across binder" into klp-dev am:
71095f174e am:
4b817b51e2 am:
2d4cf313fa am:
ef1fcffc98
am:
38f24823d0
* commit '
38f24823d0bb4b15db9ceac264e01401a653619c':
Clear unused pointer field when sending across binder
Change-Id: If5737426858f8f5d57ee0e375e4515132628b6a5
Marco Nelissen [Tue, 3 May 2016 23:27:46 +0000 (23:27 +0000)]
Merge "Clear unused pointer field when sending across binder" into klp-dev am:
71095f174e am:
4b817b51e2 am:
2d4cf313fa
am:
ef1fcffc98
* commit '
ef1fcffc9808df37f4031ddbf247492c8609559a':
Clear unused pointer field when sending across binder
Change-Id: I77dcc292f32549bd62869b710d3842853a7528fa
Marco Nelissen [Tue, 3 May 2016 23:25:22 +0000 (23:25 +0000)]
Merge "Clear unused pointer field when sending across binder" into klp-dev am:
71095f174e am:
4b817b51e2
am:
2d4cf313fa
* commit '
2d4cf313fa141d11cfae7c31797da114598d8ed7':
Clear unused pointer field when sending across binder
Change-Id: I0d1569e886ff40a43423cdbf83ed5d04e35f2d07
Marco Nelissen [Tue, 3 May 2016 23:23:01 +0000 (23:23 +0000)]
Merge "Clear unused pointer field when sending across binder" into klp-dev am:
71095f174e
am:
4b817b51e2
* commit '
4b817b51e2998719037f362c7b70ee71c76abeb8':
Clear unused pointer field when sending across binder
Change-Id: I6d09ecb88cf32f2c720dd0ec66964ec94ad210da
Marco Nelissen [Tue, 3 May 2016 23:20:38 +0000 (23:20 +0000)]
Merge "Clear unused pointer field when sending across binder" into klp-dev
am:
71095f174e
* commit '
71095f174e8b88e008623b4cacd4ec0581b9015c':
Clear unused pointer field when sending across binder
Change-Id: I5d6dee2901dca6c63ed41abf5d1165ac85a69d7e
Marco Nelissen [Tue, 3 May 2016 23:15:43 +0000 (23:15 +0000)]
Merge "Clear unused pointer field when sending across binder" into klp-dev
Marco Nelissen [Mon, 2 May 2016 21:12:34 +0000 (14:12 -0700)]
Clear unused pointer field when sending across binder
Bug:
28377502
Change-Id: Iad5ebfb0a9ef89f09755bb332579dbd3534f9c98
Marco Nelissen [Fri, 22 Apr 2016 23:38:35 +0000 (23:38 +0000)]
Merge "DO NOT MERGE Verify OMX buffer sizes prior to access" into lmp-mr1-dev am:
0822864
am:
c90ba30
* commit '
c90ba3056712a9c0ef6383fb00dc3b9c9b0edbc7':
DO NOT MERGE Verify OMX buffer sizes prior to access
Change-Id: I42551c5f62380f422257f80a933ccd301674a041
Marco Nelissen [Fri, 22 Apr 2016 23:35:55 +0000 (23:35 +0000)]
Merge "DO NOT MERGE Verify OMX buffer sizes prior to access" into lmp-mr1-dev
am:
0822864
* commit '
08228644dda7d9d7e5cb5349a5d4790e08a99e5c':
DO NOT MERGE Verify OMX buffer sizes prior to access
Change-Id: Iac61afcd015713ad9e2704ef5f5a2a5ced631344
Marco Nelissen [Fri, 22 Apr 2016 22:25:47 +0000 (22:25 +0000)]
Merge "DO NOT MERGE Verify OMX buffer sizes prior to access" into lmp-mr1-dev
Marco Nelissen [Fri, 22 Apr 2016 19:23:02 +0000 (19:23 +0000)]
Merge "DO NOT MERGE More OMX struct checking" into lmp-dev am:
a3c7788 -s ours am:
3127286
am:
9385896
* commit '
9385896fa3e2df582c3106604fe79a818a0c525e':
DO NOT MERGE More OMX struct checking
Change-Id: I28618963e39ad9ab70d9a358a7645cef5f5ce001
Marco Nelissen [Fri, 22 Apr 2016 19:20:38 +0000 (19:20 +0000)]
Merge "DO NOT MERGE More OMX struct checking" into lmp-dev am:
a3c7788 -s ours
am:
3127286
* commit '
3127286b19112082f3c467c134776794a239654e':
DO NOT MERGE More OMX struct checking
Change-Id: Iab926fa3439fc3e78509973a726c1e51e753b41a
Marco Nelissen [Fri, 22 Apr 2016 19:18:00 +0000 (19:18 +0000)]
Merge "DO NOT MERGE More OMX struct checking" into lmp-dev
am:
a3c7788 -s ours
* commit '
a3c7788e822f5f961489bd93ae88c6824c9d3915':
DO NOT MERGE More OMX struct checking
Change-Id: I3563a97b4eb7a55f005919c4978cd73527327406
Marco Nelissen [Fri, 22 Apr 2016 19:01:04 +0000 (19:01 +0000)]
Merge "DO NOT MERGE More OMX struct checking" into lmp-dev
Marco Nelissen [Fri, 22 Apr 2016 18:24:06 +0000 (18:24 +0000)]
Merge "DO NOT MERGE More OMX struct checking" into klp-dev am:
c002126cb0 am:
e25ff0130e am:
f54f5b54bd -s ours am:
a79dd03ce6 -s ours am:
4567d7b780
am:
24bb5389ee
* commit '
24bb5389eef47288d947115bfee13ceceebddab8':
DO NOT MERGE More OMX struct checking
Change-Id: I4ec81d779d064862ef01e397497d0c7acb359e44
Marco Nelissen [Fri, 22 Apr 2016 18:21:51 +0000 (18:21 +0000)]
Merge "DO NOT MERGE More OMX struct checking" into klp-dev am:
c002126cb0 am:
e25ff0130e am:
f54f5b54bd -s ours am:
a79dd03ce6 -s ours
am:
4567d7b780
* commit '
4567d7b7803dc13a65627d5c2765b93e01f2188e':
DO NOT MERGE More OMX struct checking
Change-Id: Ibb36a00d2d520198a2ebd2871a47309a5ea0d52e
Marco Nelissen [Fri, 22 Apr 2016 18:19:32 +0000 (18:19 +0000)]
Merge "DO NOT MERGE More OMX struct checking" into klp-dev am:
c002126cb0 am:
e25ff0130e am:
f54f5b54bd -s ours
am:
a79dd03ce6 -s ours
* commit '
a79dd03ce68e9b660a8d70e7389af6aac82ebddb':
DO NOT MERGE More OMX struct checking
Change-Id: Ia2b23ddbfe4f540d346b6ba0bbb2b93ab5d4c140
Marco Nelissen [Fri, 22 Apr 2016 18:17:18 +0000 (18:17 +0000)]
Merge "DO NOT MERGE More OMX struct checking" into klp-dev am:
c002126cb0 am:
e25ff0130e
am:
f54f5b54bd -s ours
* commit '
f54f5b54bd5bd78e045fbf9dbc6462d0720f1ff6':
DO NOT MERGE More OMX struct checking
Change-Id: I4c079e3f5ac920005dcbba2af992312fbf35f5bc
Marco Nelissen [Fri, 22 Apr 2016 18:15:07 +0000 (18:15 +0000)]
Merge "DO NOT MERGE More OMX struct checking" into klp-dev am:
c002126cb0
am:
e25ff0130e
* commit '
e25ff0130ef9fa184afb87e92c184172c8a96f71':
DO NOT MERGE More OMX struct checking
Change-Id: Ia9767e906a247c330031837c3b0b6415e319c836
Marco Nelissen [Fri, 22 Apr 2016 18:12:58 +0000 (18:12 +0000)]
Merge "DO NOT MERGE More OMX struct checking" into klp-dev
am:
c002126cb0
* commit '
c002126cb05b1d640c0a0b51bc0de810a62ab2b1':
DO NOT MERGE More OMX struct checking
Change-Id: I206ad72ac3ed1da96b417dd9cbe170e0a0dd1d66
Marco Nelissen [Fri, 22 Apr 2016 17:45:56 +0000 (17:45 +0000)]
Merge "DO NOT MERGE More OMX struct checking" into klp-dev
Marco Nelissen [Fri, 22 Apr 2016 14:54:04 +0000 (07:54 -0700)]
DO NOT MERGE More OMX struct checking
These were lost due to bad merges.
Bug:
27207275
Change-Id: Ia0f403d7aef79a8e0ac618eb49b34dbf9faa25c2
Marco Nelissen [Fri, 22 Apr 2016 14:55:10 +0000 (07:55 -0700)]
DO NOT MERGE More OMX struct checking
These were lost due to bad merges.
Bug:
27207275
Change-Id: Idc7a9fc75376a88b91e9e259d664d6ee54c77330
Marco Nelissen [Mon, 29 Feb 2016 20:47:20 +0000 (12:47 -0800)]
DO NOT MERGE Verify OMX buffer sizes prior to access
Bug:
27207275
Change-Id: I4412825d1ee233d993af0a67708bea54304ff62d
Pawin Vongmasa [Thu, 21 Apr 2016 19:06:26 +0000 (19:06 +0000)]
SampleTable.cpp: Fixed a regression caused by a fix for bug
28076789. am:
70dec4dc7d am:
a1e309beb9 am:
63e9b57353 am:
ef21738066 am:
59f9cc2a46
am:
9be65cb007
* commit '
9be65cb007a1525cae776c155144d73e23f10ada':
SampleTable.cpp: Fixed a regression caused by a fix for bug
28076789.
Change-Id: Icc2ba78e6bd4c4fbd401c13c8d09e5f5eb686373
Pawin Vongmasa [Thu, 21 Apr 2016 19:04:07 +0000 (19:04 +0000)]
SampleTable.cpp: Fixed a regression caused by a fix for bug
28076789. am:
70dec4dc7d am:
a1e309beb9 am:
63e9b57353 am:
ef21738066
am:
59f9cc2a46
* commit '
59f9cc2a46281fd9e491f3e6631d3a34b9f6c84d':
SampleTable.cpp: Fixed a regression caused by a fix for bug
28076789.
Change-Id: I0b35a0333028928fe892b306b680c3c1a7469bb1
Pawin Vongmasa [Thu, 21 Apr 2016 19:01:49 +0000 (19:01 +0000)]
SampleTable.cpp: Fixed a regression caused by a fix for bug
28076789. am:
70dec4dc7d am:
a1e309beb9 am:
63e9b57353
am:
ef21738066
* commit '
ef21738066caa918b34c57844d3e0f6cebbce86a':
SampleTable.cpp: Fixed a regression caused by a fix for bug
28076789.
Change-Id: I32d931ef1d2ac785f5d5e024786cb54ca833dbf7
Pawin Vongmasa [Thu, 21 Apr 2016 18:59:33 +0000 (18:59 +0000)]
SampleTable.cpp: Fixed a regression caused by a fix for bug
28076789. am:
70dec4dc7d am:
a1e309beb9
am:
63e9b57353
* commit '
63e9b573530837702e42e00900407bbe9fdae952':
SampleTable.cpp: Fixed a regression caused by a fix for bug
28076789.
Change-Id: Idcf74c810152b7160cf99aa25fe664c6b40f0750
Pawin Vongmasa [Thu, 21 Apr 2016 18:57:16 +0000 (18:57 +0000)]
SampleTable.cpp: Fixed a regression caused by a fix for bug
28076789. am:
70dec4dc7d
am:
a1e309beb9
* commit '
a1e309beb98e8fb35422102717af4f973ef1f34b':
SampleTable.cpp: Fixed a regression caused by a fix for bug
28076789.
Change-Id: I1dd3ffd9a489453d0f66c0344f52c6efecf31b2e
Pawin Vongmasa [Thu, 21 Apr 2016 18:55:02 +0000 (18:55 +0000)]
SampleTable.cpp: Fixed a regression caused by a fix for bug
28076789.
am:
70dec4dc7d
* commit '
70dec4dc7d1d813afaff58fb26b0fd7127e897bf':
SampleTable.cpp: Fixed a regression caused by a fix for bug
28076789.
Change-Id: Ie3a265ed0dc34c544b0793dce06434ec64f9bacf
Pawin Vongmasa [Wed, 20 Apr 2016 22:51:48 +0000 (15:51 -0700)]
SampleTable.cpp: Fixed a regression caused by a fix for bug
28076789.
Detail: Before the original fix
(Id207f369ab7b27787d83f5d8fc48dc53ed9fcdc9) for
28076789, the
code allowed a time-to-sample table size to be 0. The change
made in that fix disallowed such situation, which in fact should
be allowed. This current patch allows it again while maintaining
the security of the previous fix.
Bug:
28288202
Bug:
28076789
Change-Id: I1c9a60c7f0cfcbd3d908f24998dde15d5136a295
Wonsik Kim [Mon, 18 Apr 2016 05:16:16 +0000 (05:16 +0000)]
Merge "DO NOT MERGE codecs: check OMX buffer size before use in (gsm|g711)dec" into klp-dev am:
7cab953 am:
f249b0f am:
9345299 -s ours am:
cbc0d3a -s ours am:
ece67a9
am:
ad59949
* commit '
ad5994985d3426a774cb3d0ac782b53129ba3fad':
DO NOT MERGE codecs: check OMX buffer size before use in (gsm|g711)dec
Change-Id: I0e844b3de5a3c292a5f3bd148d6df2694cf67b91
Wonsik Kim [Mon, 18 Apr 2016 05:11:25 +0000 (05:11 +0000)]
Merge "DO NOT MERGE codecs: check OMX buffer size before use in (gsm|g711)dec" into klp-dev am:
7cab953 am:
f249b0f am:
9345299 -s ours am:
cbc0d3a -s ours
am:
ece67a9
* commit '
ece67a933004ba370258156194d8141902f994a9':
DO NOT MERGE codecs: check OMX buffer size before use in (gsm|g711)dec
Change-Id: Ia990a81af0c56c92c91c43a168f50635e2efa9a0
Wonsik Kim [Mon, 18 Apr 2016 05:07:23 +0000 (05:07 +0000)]
Merge "DO NOT MERGE codecs: check OMX buffer size before use in (gsm|g711)dec" into klp-dev am:
7cab953 am:
f249b0f am:
9345299 -s ours
am:
cbc0d3a -s ours
* commit '
cbc0d3ac143082dffaaf03b317b012590abbfbbb':
DO NOT MERGE codecs: check OMX buffer size before use in (gsm|g711)dec
Change-Id: Idae0950623cf27c2344d95754402c3cdbb9261ed
Wonsik Kim [Mon, 18 Apr 2016 05:01:48 +0000 (05:01 +0000)]
Merge "DO NOT MERGE codecs: check OMX buffer size before use in (gsm|g711)dec" into klp-dev am:
7cab953 am:
f249b0f
am:
9345299 -s ours
* commit '
9345299e27e68b524c4b606d178802a4e7289aa1':
DO NOT MERGE codecs: check OMX buffer size before use in (gsm|g711)dec
Change-Id: I50f3feb751614bf8ef8f7e0c3214ef9d1c0632f9
Wonsik Kim [Mon, 18 Apr 2016 05:01:47 +0000 (05:01 +0000)]
Merge "DO NOT MERGE codecs: check OMX buffer size before use in (gsm|g711)dec" into lmp-dev am:
406a06f -s ours am:
304fca8
am:
8fb433d
* commit '
8fb433db5aaf31f5dba5aef256dabb88e5a7faca':
DO NOT MERGE codecs: check OMX buffer size before use in (gsm|g711)dec
Change-Id: I818d39db1d527437a9bcfed6b060c2c74faa4260
Wonsik Kim [Mon, 18 Apr 2016 04:57:43 +0000 (04:57 +0000)]
Merge "DO NOT MERGE codecs: check OMX buffer size before use in (gsm|g711)dec" into lmp-dev am:
406a06f -s ours
am:
304fca8
* commit '
304fca82550c306142483c02a86e48c840f77f43':
DO NOT MERGE codecs: check OMX buffer size before use in (gsm|g711)dec
Change-Id: Ib2b7a92c0f8e6094466b5d9583866f5853931f82
Wonsik Kim [Mon, 18 Apr 2016 04:56:57 +0000 (04:56 +0000)]
Merge "DO NOT MERGE codecs: check OMX buffer size before use in (gsm|g711)dec" into klp-dev am:
7cab953
am:
f249b0f
* commit '
f249b0fe1d2602d07da8bfeb64bc64518a0ec46a':
DO NOT MERGE codecs: check OMX buffer size before use in (gsm|g711)dec
Change-Id: I87ec36dcfaccae4fa8d7cb247651704c7ef0e4d3
Wonsik Kim [Mon, 18 Apr 2016 04:52:07 +0000 (04:52 +0000)]
Merge "DO NOT MERGE codecs: check OMX buffer size before use in (gsm|g711)dec" into klp-dev
am:
7cab953
* commit '
7cab953629b615cfe5fec8f56266996bc17307b5':
DO NOT MERGE codecs: check OMX buffer size before use in (gsm|g711)dec
Change-Id: Icbd07fb9f62bb4f1381f6573188d32c8f126dc90
Wonsik Kim [Mon, 18 Apr 2016 04:52:07 +0000 (04:52 +0000)]
Merge "DO NOT MERGE codecs: check OMX buffer size before use in (gsm|g711)dec" into lmp-dev
am:
406a06f -s ours
* commit '
406a06f89815e7a4dca2d9d4d0828f1516c4e20d':
DO NOT MERGE codecs: check OMX buffer size before use in (gsm|g711)dec
Change-Id: Ic5235fe0ede890af7e0a967ef05e48e5879c486a
Wonsik Kim [Mon, 18 Apr 2016 04:40:03 +0000 (04:40 +0000)]
Merge "DO NOT MERGE codecs: check OMX buffer size before use in (gsm|g711)dec" into lmp-dev
Wonsik Kim [Mon, 18 Apr 2016 04:39:54 +0000 (04:39 +0000)]
Merge "DO NOT MERGE codecs: check OMX buffer size before use in (gsm|g711)dec" into klp-dev
Pawin Vongmasa [Sat, 16 Apr 2016 00:19:22 +0000 (00:19 +0000)]
Merge "SampleTable.cpp: Prevent corrupted stts block from causing excessive memory allocation." into klp-dev am:
5964527 am:
e896c41 am:
a0970c9 am:
ab72763 am:
8cf4bf3
am:
f720186
* commit '
f7201862c852cbf780e546c0e23e23cd7dcab4a1':
SampleTable.cpp: Prevent corrupted stts block from causing excessive memory allocation.
Change-Id: I3b26c1a4781e38d2b327b09972091d169bba1338
Pawin Vongmasa [Sat, 16 Apr 2016 00:16:11 +0000 (00:16 +0000)]
Merge "SampleTable.cpp: Prevent corrupted stts block from causing excessive memory allocation." into klp-dev am:
5964527 am:
e896c41 am:
a0970c9 am:
ab72763
am:
8cf4bf3
* commit '
8cf4bf38b13adb805746a3f3e172670b1af7c9fd':
SampleTable.cpp: Prevent corrupted stts block from causing excessive memory allocation.
Change-Id: Ie35530048156f7f5c4fd36c5901f6de4e1374f56
Pawin Vongmasa [Sat, 16 Apr 2016 00:13:47 +0000 (00:13 +0000)]
Merge "SampleTable.cpp: Prevent corrupted stts block from causing excessive memory allocation." into klp-dev am:
5964527 am:
e896c41 am:
a0970c9
am:
ab72763
* commit '
ab7276351e41bc0d40d28c231993ba240b5f21a0':
SampleTable.cpp: Prevent corrupted stts block from causing excessive memory allocation.
Change-Id: I3dc4066c53dfeb3fc07ee31431ee5a5571c89528
Pawin Vongmasa [Sat, 16 Apr 2016 00:11:25 +0000 (00:11 +0000)]
Merge "SampleTable.cpp: Prevent corrupted stts block from causing excessive memory allocation." into klp-dev am:
5964527 am:
e896c41
am:
a0970c9
* commit '
a0970c9faabdaca647cb22b78432511de3220399':
SampleTable.cpp: Prevent corrupted stts block from causing excessive memory allocation.
Change-Id: I7d7e410e25d8a5b1066251cae8cddfa050b07f71
Pawin Vongmasa [Sat, 16 Apr 2016 00:09:00 +0000 (00:09 +0000)]
Merge "SampleTable.cpp: Prevent corrupted stts block from causing excessive memory allocation." into klp-dev am:
5964527
am:
e896c41
* commit '
e896c41d85a15de06c74885fe040f3f57b63cd5d':
SampleTable.cpp: Prevent corrupted stts block from causing excessive memory allocation.
Change-Id: I5f23c14d155ea5a64b00d877a329c77cfc5b55f7
Pawin Vongmasa [Sat, 16 Apr 2016 00:06:36 +0000 (00:06 +0000)]
Merge "SampleTable.cpp: Prevent corrupted stts block from causing excessive memory allocation." into klp-dev
am:
5964527
* commit '
59645279f48b3ae83ab42445148ea236c5dc72c4':
SampleTable.cpp: Prevent corrupted stts block from causing excessive memory allocation.
Change-Id: I37ea7cd16f1e0fcf2ce14d6687de080a7c0931c1
Pawin Vongmasa [Sat, 16 Apr 2016 00:01:22 +0000 (00:01 +0000)]
Merge "SampleTable.cpp: Prevent corrupted stts block from causing excessive memory allocation." into klp-dev
Pawin Vongmasa [Wed, 13 Apr 2016 23:25:12 +0000 (16:25 -0700)]
SampleTable.cpp: Prevent corrupted stts block from causing
excessive memory allocation.
Details:
DataSource.h
- Added function getVector() for reading from a data source into
a Vector object, whose capacity grows only as much as needed
(in case of EOS or reading error).
SampleTable.h
- Changed the type of mTimeToSample from uint32_t* to
Vector<uint32_t>.
SampleTable.cpp
- In setTimeToSample, modified the code to use getVector()
instead of readAt(). If the input source has a corrupt
time-to-sample table size that is too big, EOS will be reached
before the whole table is read, and the return value from
getVector() will be false.
- Also, tightened the bound for the provided time-to-sample table
size to guarantee that the table does not take more than
UINT_MAX32 bytes in memory.
Bug:
28076789
Change-Id: Id207f369ab7b27787d83f5d8fc48dc53ed9fcdc9
Marco Nelissen [Wed, 13 Apr 2016 22:40:34 +0000 (22:40 +0000)]
h264dec: check for overflows when calculating allocation size. am:
a3dd713 am:
d504c68 am:
9f3762d am:
76f606b am:
9d9ebc9
am:
8e46016
* commit '
8e4601608f3ecbc7b5b40c6b6efe3290104aa743':
h264dec: check for overflows when calculating allocation size.
Change-Id: Icac8c5785b5c15c1e882a5ced0f536c3501e1159
Marco Nelissen [Wed, 13 Apr 2016 22:37:01 +0000 (22:37 +0000)]
h264dec: check for overflows when calculating allocation size. am:
a3dd713 am:
d504c68 am:
9f3762d am:
76f606b
am:
9d9ebc9
* commit '
9d9ebc990f4b4b18f48d09232b053b3cb69dbb6b':
h264dec: check for overflows when calculating allocation size.
Change-Id: I175db41766562a7638365091ce087628b31fed56
Marco Nelissen [Wed, 13 Apr 2016 22:33:28 +0000 (22:33 +0000)]
h264dec: check for overflows when calculating allocation size. am:
a3dd713 am:
d504c68 am:
9f3762d
am:
76f606b
* commit '
76f606bdf9d52a4406dc285e06a0f15b13903bac':
h264dec: check for overflows when calculating allocation size.
Change-Id: I1ae828ed17ca9df7b3097cdb1acaf06e0202321d
Marco Nelissen [Wed, 13 Apr 2016 22:25:40 +0000 (22:25 +0000)]
h264dec: check for overflows when calculating allocation size. am:
a3dd713 am:
d504c68
am:
9f3762d
* commit '
9f3762d8c76b778c8f600486a464838731105b09':
h264dec: check for overflows when calculating allocation size.
Change-Id: Iefdde609316ffa6fb9037f24d3865980633cd4b9
Marco Nelissen [Wed, 13 Apr 2016 22:21:11 +0000 (22:21 +0000)]
h264dec: check for overflows when calculating allocation size. am:
a3dd713
am:
d504c68
* commit '
d504c68310bf86e24321a7260c2ecdd9962c8b3b':
h264dec: check for overflows when calculating allocation size.
Change-Id: Iabbe0fcaf14241d1aa01184c61f1ecb134c16fe8
Marco Nelissen [Wed, 13 Apr 2016 22:17:37 +0000 (22:17 +0000)]
h264dec: check for overflows when calculating allocation size.
am:
a3dd713
* commit '
a3dd713893658baf50df88b261aba83bb0c40687':
h264dec: check for overflows when calculating allocation size.
Change-Id: Ie1acdd0ddaddce72f9072abf288db29ab3d75fc1
Marco Nelissen [Fri, 8 Apr 2016 17:04:48 +0000 (10:04 -0700)]
h264dec: check for overflows when calculating allocation size.
Bug:
27855419
Change-Id: Idabedca52913ec31ea5cb6a6109ab94e3fb2badd
Wonsik Kim [Fri, 8 Apr 2016 01:32:46 +0000 (01:32 +0000)]
Merge "DO NOT MERGE codecs: check OMX buffer size before use in vorbisdec" into klp-dev am:
52636f8 am:
9f83485 am:
eedc29f -s ours am:
040d973 -s ours am:
121b740
am:
73f28a1
* commit '
73f28a11d22a03689d7b6c0b5b2640aba675f154':
DO NOT MERGE codecs: check OMX buffer size before use in vorbisdec
Change-Id: I8b3348589f989b7adb8f4386c43a76649bef9d24
OSDN Git Service
