OSDN Git Service
Roger1 Jonsson [Wed, 5 Apr 2017 23:28:09 +0000 (23:28 +0000)]
Avoid crash for stss sync sample number 0 am:
5c364997a3 am:
e77a32bd3d am:
ab28d49e41 -s ours am:
73db408aa3 am:
0bb0a8e1e8 am:
4d86bef7f7 am:
241f5feb8a am:
a7cec6180f am:
d022170614
am:
cbdc2b7899
Change-Id: Id114e3cd00bcdbb000d26e0d48e4ec91affd062c
Roger1 Jonsson [Wed, 5 Apr 2017 23:25:09 +0000 (23:25 +0000)]
Avoid crash for stss sync sample number 0 am:
5c364997a3 am:
e77a32bd3d am:
ab28d49e41 -s ours am:
73db408aa3 am:
0bb0a8e1e8 am:
4d86bef7f7 am:
241f5feb8a am:
a7cec6180f
am:
d022170614
Change-Id: I488701da8808d3da8695aaabae74074f8080d512
Roger1 Jonsson [Wed, 5 Apr 2017 23:22:11 +0000 (23:22 +0000)]
Avoid crash for stss sync sample number 0 am:
5c364997a3 am:
e77a32bd3d am:
ab28d49e41 -s ours am:
73db408aa3 am:
0bb0a8e1e8 am:
4d86bef7f7 am:
241f5feb8a
am:
a7cec6180f
Change-Id: I75a8ee185d28f82f6760a9b7d392161762e3399d
Roger1 Jonsson [Wed, 5 Apr 2017 23:19:37 +0000 (23:19 +0000)]
Avoid crash for stss sync sample number 0 am:
5c364997a3 am:
e77a32bd3d am:
ab28d49e41 -s ours am:
73db408aa3 am:
0bb0a8e1e8 am:
4d86bef7f7
am:
241f5feb8a
Change-Id: I52d24edf474be0f12e7debf052e1398a56674dc8
Roger1 Jonsson [Wed, 5 Apr 2017 23:16:08 +0000 (23:16 +0000)]
Avoid crash for stss sync sample number 0 am:
5c364997a3 am:
e77a32bd3d am:
ab28d49e41 -s ours am:
73db408aa3 am:
0bb0a8e1e8
am:
4d86bef7f7
Change-Id: I53fd99fb4436b2cce7a8473a1e188cf8fcdf19eb
Roger1 Jonsson [Wed, 5 Apr 2017 23:13:37 +0000 (23:13 +0000)]
Avoid crash for stss sync sample number 0 am:
5c364997a3 am:
e77a32bd3d am:
ab28d49e41 -s ours am:
73db408aa3
am:
0bb0a8e1e8
Change-Id: Id88b6709127ad9799d63dff3c1310001142a0a2c
Roger1 Jonsson [Wed, 5 Apr 2017 23:10:38 +0000 (23:10 +0000)]
Avoid crash for stss sync sample number 0 am:
5c364997a3 am:
e77a32bd3d am:
ab28d49e41 -s ours
am:
73db408aa3
Change-Id: Ibe55680e73e9caddc3fc79883fa17a50742f393d
Roger1 Jonsson [Wed, 5 Apr 2017 23:07:37 +0000 (23:07 +0000)]
Avoid crash for stss sync sample number 0 am:
5c364997a3 am:
e77a32bd3d
am:
ab28d49e41 -s ours
Change-Id: I63e6f4ea65dda85e5d779f6aaf1fbd4ca5806f8c
Roger1 Jonsson [Wed, 5 Apr 2017 22:52:35 +0000 (22:52 +0000)]
Avoid crash for stss sync sample number 0 am:
5c364997a3
am:
e77a32bd3d
Change-Id: If61ba19bc937c6b7c7227296ddba5a1797072f9d
Roger1 Jonsson [Wed, 5 Apr 2017 22:49:34 +0000 (22:49 +0000)]
Avoid crash for stss sync sample number 0
am:
5c364997a3
Change-Id: Ia97daf543c65b52db1c5d09471ed8d00a434364d
Roger1 Jonsson [Wed, 26 Oct 2016 07:20:00 +0000 (09:20 +0200)]
Avoid crash for stss sync sample number 0
A sample number value of 0 means that the value stored in
the mSyncSamples array, would become negative (-1),
when converted to index value. This causes a crash.
Make sure that stss sample numbers are bigger
than 0 before converting sample number to index value.
Bug:
32423862
bug:
35645051
Test: Playback video that triggers stss sync sample number 0
Change-Id: I35bee7c718e01b086d7e05deda13b38083f509f5
Robert Shih [Wed, 15 Mar 2017 00:30:31 +0000 (00:30 +0000)]
DO NOT MERGE FLACExtractor: copy protect mWriteBuffer am:
13c77f4fe0 am:
761abda1bd am:
aca26c9d45 -s ours am:
1e4d8d67bc -s ours am:
413ad04890 am:
27ba2d85d6 -s ours am:
4066f0e808 am:
db11181861 am:
b38fd0baf8
am:
acc15f5a71 -s ours
Change-Id: If271c8cc840e5447f9bfa882cba4ae76801cd17b
Robert Shih [Wed, 15 Mar 2017 00:25:32 +0000 (00:25 +0000)]
DO NOT MERGE FLACExtractor: copy protect mWriteBuffer am:
13c77f4fe0 am:
761abda1bd am:
aca26c9d45 -s ours am:
1e4d8d67bc -s ours am:
413ad04890 am:
27ba2d85d6 -s ours am:
4066f0e808 am:
db11181861
am:
b38fd0baf8
Change-Id: I0d43d8afed17f5c64e731080002260ec2f05cfee
Robert Shih [Wed, 15 Mar 2017 00:25:31 +0000 (00:25 +0000)]
FLACExtractor: copy protect mWriteBuffer am:
8ee699977c am:
038fd6e5ec am:
4eea0b3aa4 am:
b06f7c6e15 am:
5c1a7d4c64 am:
5b937b03d5
am:
ced3c15960
Change-Id: I0e56cd59a6c8818f6fbd1f909c226970cd3b330e
Robert Shih [Wed, 15 Mar 2017 00:21:02 +0000 (00:21 +0000)]
DO NOT MERGE FLACExtractor: copy protect mWriteBuffer am:
13c77f4fe0 am:
761abda1bd am:
aca26c9d45 -s ours am:
1e4d8d67bc -s ours am:
413ad04890 am:
27ba2d85d6 -s ours am:
4066f0e808
am:
db11181861
Change-Id: I857531fc1e7a6727de639813c63423758eb37017
Robert Shih [Wed, 15 Mar 2017 00:20:32 +0000 (00:20 +0000)]
FLACExtractor: copy protect mWriteBuffer am:
8ee699977c am:
038fd6e5ec am:
4eea0b3aa4 am:
b06f7c6e15 am:
5c1a7d4c64
am:
5b937b03d5
Change-Id: I07fae26ec82b190b82c2949a4fbfc1d4e293fda5
Robert Shih [Wed, 15 Mar 2017 00:15:30 +0000 (00:15 +0000)]
DO NOT MERGE FLACExtractor: copy protect mWriteBuffer am:
13c77f4fe0 am:
761abda1bd am:
aca26c9d45 -s ours am:
1e4d8d67bc -s ours am:
413ad04890 am:
27ba2d85d6 -s ours
am:
4066f0e808
Change-Id: Icaa568c50688db3157c524978deda0a52ca87e37
Robert Shih [Wed, 15 Mar 2017 00:15:30 +0000 (00:15 +0000)]
FLACExtractor: copy protect mWriteBuffer am:
8ee699977c am:
038fd6e5ec am:
4eea0b3aa4 am:
b06f7c6e15
am:
5c1a7d4c64
Change-Id: Id2cc3152facf8147504b34c9ee575acfc3f67668
Robert Shih [Wed, 15 Mar 2017 00:10:00 +0000 (00:10 +0000)]
FLACExtractor: copy protect mWriteBuffer am:
8ee699977c am:
038fd6e5ec am:
4eea0b3aa4
am:
b06f7c6e15
Change-Id: I9b5601e129a7162aa125feef425bdc93de4e4471
Robert Shih [Wed, 15 Mar 2017 00:09:59 +0000 (00:09 +0000)]
DO NOT MERGE FLACExtractor: copy protect mWriteBuffer am:
13c77f4fe0 am:
761abda1bd am:
aca26c9d45 -s ours am:
1e4d8d67bc -s ours am:
413ad04890
am:
27ba2d85d6 -s ours
Change-Id: Ib80a0800bbcbb4033081ff9052681dbaf5406ab8
Robert Shih [Wed, 15 Mar 2017 00:04:31 +0000 (00:04 +0000)]
FLACExtractor: copy protect mWriteBuffer am:
8ee699977c am:
038fd6e5ec
am:
4eea0b3aa4
Change-Id: I4f3b1e4a100374da2e412082564fc6fb54dc122a
Robert Shih [Wed, 15 Mar 2017 00:04:30 +0000 (00:04 +0000)]
DO NOT MERGE FLACExtractor: copy protect mWriteBuffer am:
13c77f4fe0 am:
761abda1bd am:
aca26c9d45 -s ours am:
1e4d8d67bc -s ours
am:
413ad04890
Change-Id: I160f5893987b330ae73e6675ffb2dc2fed2d1304
Robert Shih [Tue, 14 Mar 2017 23:58:59 +0000 (23:58 +0000)]
DO NOT MERGE FLACExtractor: copy protect mWriteBuffer am:
13c77f4fe0 am:
761abda1bd am:
aca26c9d45 -s ours
am:
1e4d8d67bc -s ours
Change-Id: Iab0b678707ea31ad02f0f9be5f02f5638c601826
Robert Shih [Tue, 14 Mar 2017 23:58:59 +0000 (23:58 +0000)]
FLACExtractor: copy protect mWriteBuffer am:
8ee699977c
am:
038fd6e5ec
Change-Id: I475073171089f82eac7816d479f9b720a887a0c9
Robert Shih [Tue, 14 Mar 2017 23:55:10 +0000 (23:55 +0000)]
FLACExtractor: copy protect mWriteBuffer
am:
8ee699977c
Change-Id: Icdfd99c85fb0f76cc607f8bb29430913cf72bad1
Robert Shih [Tue, 14 Mar 2017 23:54:28 +0000 (23:54 +0000)]
DO NOT MERGE FLACExtractor: copy protect mWriteBuffer am:
13c77f4fe0 am:
761abda1bd
am:
aca26c9d45 -s ours
Change-Id: Id436554a36de729ccd7a3220e32e155c423d0531
Robert Shih [Tue, 14 Mar 2017 23:49:57 +0000 (23:49 +0000)]
DO NOT MERGE FLACExtractor: copy protect mWriteBuffer am:
13c77f4fe0
am:
761abda1bd
Change-Id: I30bf5233b69619d260edb952248865adf5c55c83
Robert Shih [Tue, 14 Mar 2017 23:45:27 +0000 (23:45 +0000)]
DO NOT MERGE FLACExtractor: copy protect mWriteBuffer
am:
13c77f4fe0
Change-Id: Ib7f8b77b3ba27fcd8e61e540eb39259cb287185c
Robert Shih [Mon, 24 Oct 2016 18:38:31 +0000 (11:38 -0700)]
FLACExtractor: copy protect mWriteBuffer
Bug:
30895578
Bug:
34970788
Change-Id: I4cba36bbe3502678210e5925181683df9726b431
(cherry picked from commit
328cd66cc72ba7bc5452ed5a93f29ddcd73aa9f9)
Robert Shih [Mon, 24 Oct 2016 18:38:31 +0000 (11:38 -0700)]
DO NOT MERGE FLACExtractor: copy protect mWriteBuffer
Bug:
30895578
Bug:
34970788
Change-Id: I4cba36bbe3502678210e5925181683df9726b431
Ray Essick [Mon, 13 Mar 2017 23:23:43 +0000 (23:23 +0000)]
Merge "Add bounds check in SoftAACEncoder2::onQueueFilled()" into klp-dev am:
19b91af752 am:
8e3cf4d841 am:
5b1bfc1f43 am:
8abf11b512 am:
4bc4f78933 am:
7f2592fe4a am:
dbdf026f76 am:
c4305aeda4 am:
1baad9ad99
am:
2ad7f9b172
Change-Id: Iff4a0475dde613d649196c826dbc482e9af93872
Ray Essick [Mon, 13 Mar 2017 23:23:26 +0000 (23:23 +0000)]
Merge "Fix TOCTOU problem in libstagefright_soft_aacenc" into klp-dev am:
2076915c5f am:
dcda2ec2fe am:
f5c7784dbd am:
c3de266a99 am:
8655d4fc01 am:
b05be00f56 am:
eb58ce5bb0 am:
a830539187 am:
e973c65525
am:
ae7fae1810
Change-Id: I08b043910e7bf2173cd1b19c3bb76f5753b38ff0
Ray Essick [Mon, 13 Mar 2017 23:18:46 +0000 (23:18 +0000)]
Merge "Add bounds check in SoftAACEncoder2::onQueueFilled()" into klp-dev am:
19b91af752 am:
8e3cf4d841 am:
5b1bfc1f43 am:
8abf11b512 am:
4bc4f78933 am:
7f2592fe4a am:
dbdf026f76 am:
c4305aeda4
am:
1baad9ad99
Change-Id: If99804d172112b671974d84d29ac61fe8bf885d8
Ray Essick [Mon, 13 Mar 2017 23:18:31 +0000 (23:18 +0000)]
Merge "Fix TOCTOU problem in libstagefright_soft_aacenc" into klp-dev am:
2076915c5f am:
dcda2ec2fe am:
f5c7784dbd am:
c3de266a99 am:
8655d4fc01 am:
b05be00f56 am:
eb58ce5bb0 am:
a830539187
am:
e973c65525
Change-Id: Icb9263d13832bc7826aa67af92f61bafbff4b7a1
Marco Nelissen [Mon, 13 Mar 2017 23:14:57 +0000 (23:14 +0000)]
Merge "Fix integer overflow and divide-by-zero" into klp-dev am:
b264ece2c0 am:
bbca2719c6 am:
c2e69851ea am:
3285770d37 am:
d935c7f16e am:
98ee832c7e am:
1db2ee3dbd am:
946a690f5c am:
5fef11c61a
am:
3a3cc883c1
Change-Id: Iefe473341e64546c69ee98a8a4e47b17903ca02d
Marco Nelissen [Mon, 13 Mar 2017 23:14:42 +0000 (23:14 +0000)]
Merge "Fix NPDs in h263 decoder" into klp-dev am:
012e5fd39e am:
9e8dfb5938 am:
9e4a0e1fab am:
3c4401fce8 am:
8867ca40df am:
4ba3934ec3 am:
89349b8d29 am:
176e7e8183 am:
0cbbb5c561
am:
2e1457123f
Change-Id: Idf145d96a408f70a6b5637af0603832f8dfdbcd7
Marco Nelissen [Mon, 13 Mar 2017 23:14:25 +0000 (23:14 +0000)]
Merge "Fix out of bounds access" into klp-dev am:
360cbbd72c am:
f71b76cae8 am:
36c2e14da3 am:
8a3cc1963e am:
5b0ca6a92c am:
d270a899c2 am:
8f2b91f0a1 am:
6e25e6f7a2 am:
f375fd0f70
am:
5d1ce82bb3
Change-Id: Ia8706bf387c1f779f31952fe287e3414e67ccbbe
Ray Essick [Mon, 13 Mar 2017 23:14:14 +0000 (23:14 +0000)]
Merge "Add bounds check in SoftAACEncoder2::onQueueFilled()" into klp-dev am:
19b91af752 am:
8e3cf4d841 am:
5b1bfc1f43 am:
8abf11b512 am:
4bc4f78933 am:
7f2592fe4a am:
dbdf026f76
am:
c4305aeda4
Change-Id: Idac42ec10c4295ae4e5761531b96bd4ce58a8473
Ray Essick [Mon, 13 Mar 2017 23:13:59 +0000 (23:13 +0000)]
Merge "Fix TOCTOU problem in libstagefright_soft_aacenc" into klp-dev am:
2076915c5f am:
dcda2ec2fe am:
f5c7784dbd am:
c3de266a99 am:
8655d4fc01 am:
b05be00f56 am:
eb58ce5bb0
am:
a830539187
Change-Id: I10929475d031fb3d1b6aab57bd2041f40e5bcf01
Marco Nelissen [Mon, 13 Mar 2017 23:09:59 +0000 (23:09 +0000)]
Merge "Fix integer overflow and divide-by-zero" into klp-dev am:
b264ece2c0 am:
bbca2719c6 am:
c2e69851ea am:
3285770d37 am:
d935c7f16e am:
98ee832c7e am:
1db2ee3dbd am:
946a690f5c
am:
5fef11c61a
Change-Id: I39d07c6a978c2e0c2b4c6f8bc02135c1acbb3ba5
Marco Nelissen [Mon, 13 Mar 2017 23:09:44 +0000 (23:09 +0000)]
Merge "Fix NPDs in h263 decoder" into klp-dev am:
012e5fd39e am:
9e8dfb5938 am:
9e4a0e1fab am:
3c4401fce8 am:
8867ca40df am:
4ba3934ec3 am:
89349b8d29 am:
176e7e8183
am:
0cbbb5c561
Change-Id: I2dc56447dd0386046bc765110a545b967237e63b
Ray Essick [Mon, 13 Mar 2017 23:09:43 +0000 (23:09 +0000)]
Merge "Add bounds check in SoftAACEncoder2::onQueueFilled()" into klp-dev am:
19b91af752 am:
8e3cf4d841 am:
5b1bfc1f43 am:
8abf11b512 am:
4bc4f78933 am:
7f2592fe4a
am:
dbdf026f76
Change-Id: I4d2bba1d77108acad20a8886d79a99f8b521ede3
Marco Nelissen [Mon, 13 Mar 2017 23:09:29 +0000 (23:09 +0000)]
Merge "Fix out of bounds access" into klp-dev am:
360cbbd72c am:
f71b76cae8 am:
36c2e14da3 am:
8a3cc1963e am:
5b0ca6a92c am:
d270a899c2 am:
8f2b91f0a1 am:
6e25e6f7a2
am:
f375fd0f70
Change-Id: Ia373be05422e21dc98702e04a25a5f530031aaad
Ray Essick [Mon, 13 Mar 2017 23:09:29 +0000 (23:09 +0000)]
Merge "Fix TOCTOU problem in libstagefright_soft_aacenc" into klp-dev am:
2076915c5f am:
dcda2ec2fe am:
f5c7784dbd am:
c3de266a99 am:
8655d4fc01 am:
b05be00f56
am:
eb58ce5bb0
Change-Id: Id8ea82f6504b70d8a448a8d00063b1b393a2f336
Marco Nelissen [Mon, 13 Mar 2017 23:06:24 +0000 (23:06 +0000)]
Merge "Fix integer overflow and divide-by-zero" into klp-dev am:
b264ece2c0 am:
bbca2719c6 am:
c2e69851ea am:
3285770d37 am:
d935c7f16e am:
98ee832c7e am:
1db2ee3dbd
am:
946a690f5c
Change-Id: I265078e7cab77a8865862f3b0319bfb0746ee814
Ray Essick [Mon, 13 Mar 2017 23:05:46 +0000 (23:05 +0000)]
Merge "Add bounds check in SoftAACEncoder2::onQueueFilled()" into klp-dev am:
19b91af752 am:
8e3cf4d841 am:
5b1bfc1f43 am:
8abf11b512 am:
4bc4f78933
am:
7f2592fe4a
Change-Id: Ie8c0fadcf5c424e8a4627030c04cbac96442ebf4
Marco Nelissen [Mon, 13 Mar 2017 23:05:43 +0000 (23:05 +0000)]
Merge "Fix NPDs in h263 decoder" into klp-dev am:
012e5fd39e am:
9e8dfb5938 am:
9e4a0e1fab am:
3c4401fce8 am:
8867ca40df am:
4ba3934ec3 am:
89349b8d29
am:
176e7e8183
Change-Id: I0d1fd31c2cbfb05a70cc7941df7c06846999a6cc
Marco Nelissen [Mon, 13 Mar 2017 23:05:29 +0000 (23:05 +0000)]
Merge "Fix out of bounds access" into klp-dev am:
360cbbd72c am:
f71b76cae8 am:
36c2e14da3 am:
8a3cc1963e am:
5b0ca6a92c am:
d270a899c2 am:
8f2b91f0a1
am:
6e25e6f7a2
Change-Id: I445e63688e03fa8088e6d8f10132f613e1377c92
Ray Essick [Mon, 13 Mar 2017 23:05:29 +0000 (23:05 +0000)]
Merge "Fix TOCTOU problem in libstagefright_soft_aacenc" into klp-dev am:
2076915c5f am:
dcda2ec2fe am:
f5c7784dbd am:
c3de266a99 am:
8655d4fc01
am:
b05be00f56
Change-Id: I79378b8fa75e6912f49a9af3c4f46bd711494314
Marco Nelissen [Mon, 13 Mar 2017 23:01:30 +0000 (23:01 +0000)]
Merge "Fix integer overflow and divide-by-zero" into klp-dev am:
b264ece2c0 am:
bbca2719c6 am:
c2e69851ea am:
3285770d37 am:
d935c7f16e am:
98ee832c7e
am:
1db2ee3dbd
Change-Id: Ia7e87aa7baaf9bbff299ff70af5c77b90a922229
Marco Nelissen [Mon, 13 Mar 2017 23:01:14 +0000 (23:01 +0000)]
Merge "Fix NPDs in h263 decoder" into klp-dev am:
012e5fd39e am:
9e8dfb5938 am:
9e4a0e1fab am:
3c4401fce8 am:
8867ca40df am:
4ba3934ec3
am:
89349b8d29
Change-Id: I156d984af4dc64fa69d3b07661e8f2e7e86ca7e5
Ray Essick [Mon, 13 Mar 2017 23:01:13 +0000 (23:01 +0000)]
Merge "Add bounds check in SoftAACEncoder2::onQueueFilled()" into klp-dev am:
19b91af752 am:
8e3cf4d841 am:
5b1bfc1f43 am:
8abf11b512
am:
4bc4f78933
Change-Id: I53212f1bdf2491a6b20ec9713adec169ef0d08c1
Marco Nelissen [Mon, 13 Mar 2017 23:00:59 +0000 (23:00 +0000)]
Merge "Fix out of bounds access" into klp-dev am:
360cbbd72c am:
f71b76cae8 am:
36c2e14da3 am:
8a3cc1963e am:
5b0ca6a92c am:
d270a899c2
am:
8f2b91f0a1
Change-Id: Ib43ba6aeba921b0d2c5b8649ac1e7015c48a7884
Ray Essick [Mon, 13 Mar 2017 23:00:58 +0000 (23:00 +0000)]
Merge "Fix TOCTOU problem in libstagefright_soft_aacenc" into klp-dev am:
2076915c5f am:
dcda2ec2fe am:
f5c7784dbd am:
c3de266a99
am:
8655d4fc01
Change-Id: Ia8696372f4015580ca91bed1f1c373a68d2ea196
Marco Nelissen [Mon, 13 Mar 2017 22:57:31 +0000 (22:57 +0000)]
Merge "Fix integer overflow and divide-by-zero" into klp-dev am:
b264ece2c0 am:
bbca2719c6 am:
c2e69851ea am:
3285770d37 am:
d935c7f16e
am:
98ee832c7e
Change-Id: Ie82d1dfa473886b9b166804da985bce439c90900
Marco Nelissen [Mon, 13 Mar 2017 22:57:14 +0000 (22:57 +0000)]
Merge "Fix NPDs in h263 decoder" into klp-dev am:
012e5fd39e am:
9e8dfb5938 am:
9e4a0e1fab am:
3c4401fce8 am:
8867ca40df
am:
4ba3934ec3
Change-Id: I6babc4703d1462a30d3075cfb6a3fbfdffac5724
Ray Essick [Mon, 13 Mar 2017 22:57:12 +0000 (22:57 +0000)]
Merge "Add bounds check in SoftAACEncoder2::onQueueFilled()" into klp-dev am:
19b91af752 am:
8e3cf4d841 am:
5b1bfc1f43
am:
8abf11b512
Change-Id: I1cdf8344d8ca41cf5c4b6622ec743bb094c3dff0
Marco Nelissen [Mon, 13 Mar 2017 22:56:58 +0000 (22:56 +0000)]
Merge "Fix out of bounds access" into klp-dev am:
360cbbd72c am:
f71b76cae8 am:
36c2e14da3 am:
8a3cc1963e am:
5b0ca6a92c
am:
d270a899c2
Change-Id: I64b30e83c6825a83ff628477a58d607eded0ec7d
Ray Essick [Mon, 13 Mar 2017 22:56:57 +0000 (22:56 +0000)]
Merge "Fix TOCTOU problem in libstagefright_soft_aacenc" into klp-dev am:
2076915c5f am:
dcda2ec2fe am:
f5c7784dbd
am:
c3de266a99
Change-Id: I38701178a3fd7632fc8717472338d60d4cb0de2e
Marco Nelissen [Mon, 13 Mar 2017 22:52:57 +0000 (22:52 +0000)]
Merge "Fix integer overflow and divide-by-zero" into klp-dev am:
b264ece2c0 am:
bbca2719c6 am:
c2e69851ea am:
3285770d37
am:
d935c7f16e
Change-Id: I272acb1f5178ccaf43fa12ed096bb4bb03834213
Ray Essick [Mon, 13 Mar 2017 22:52:42 +0000 (22:52 +0000)]
Merge "Add bounds check in SoftAACEncoder2::onQueueFilled()" into klp-dev am:
19b91af752 am:
8e3cf4d841
am:
5b1bfc1f43
Change-Id: I32327162d3e69259656f0b3a82800f45572527fd
Marco Nelissen [Mon, 13 Mar 2017 22:52:42 +0000 (22:52 +0000)]
Merge "Fix NPDs in h263 decoder" into klp-dev am:
012e5fd39e am:
9e8dfb5938 am:
9e4a0e1fab am:
3c4401fce8
am:
8867ca40df
Change-Id: Id8e824b0411c463ee4278a8a8e61ea4be4053046
Ray Essick [Mon, 13 Mar 2017 22:52:28 +0000 (22:52 +0000)]
Merge "Fix TOCTOU problem in libstagefright_soft_aacenc" into klp-dev am:
2076915c5f am:
dcda2ec2fe
am:
f5c7784dbd
Change-Id: Ic1901b3fa14a1e1c7f582e5b7862e777489e7314
Marco Nelissen [Mon, 13 Mar 2017 22:52:27 +0000 (22:52 +0000)]
Merge "Fix out of bounds access" into klp-dev am:
360cbbd72c am:
f71b76cae8 am:
36c2e14da3 am:
8a3cc1963e
am:
5b0ca6a92c
Change-Id: I2da6bc9ff1d3503c62042391fce0a0957f11433b
Marco Nelissen [Mon, 13 Mar 2017 22:48:27 +0000 (22:48 +0000)]
Merge "Fix integer overflow and divide-by-zero" into klp-dev am:
b264ece2c0 am:
bbca2719c6 am:
c2e69851ea
am:
3285770d37
Change-Id: Id82c89fed96d3cfa11d68ba5d791d5a360aa243c
Marco Nelissen [Mon, 13 Mar 2017 22:48:12 +0000 (22:48 +0000)]
Merge "Fix NPDs in h263 decoder" into klp-dev am:
012e5fd39e am:
9e8dfb5938 am:
9e4a0e1fab
am:
3c4401fce8
Change-Id: Ib6bd99193a44fbd801906d234c42b3fa3d33fb9a
Ray Essick [Mon, 13 Mar 2017 22:48:10 +0000 (22:48 +0000)]
Merge "Add bounds check in SoftAACEncoder2::onQueueFilled()" into klp-dev am:
19b91af752
am:
8e3cf4d841
Change-Id: I804c61a21202d3c5aef3edac5872f56cef67753b
Marco Nelissen [Mon, 13 Mar 2017 22:47:58 +0000 (22:47 +0000)]
Merge "Fix out of bounds access" into klp-dev am:
360cbbd72c am:
f71b76cae8 am:
36c2e14da3
am:
8a3cc1963e
Change-Id: I72dd260e2ee0f9560c9322c3aaf7b93c8008607e
Ray Essick [Mon, 13 Mar 2017 22:47:56 +0000 (22:47 +0000)]
Merge "Fix TOCTOU problem in libstagefright_soft_aacenc" into klp-dev am:
2076915c5f
am:
dcda2ec2fe
Change-Id: I6759f0d478dd70baf59c3e006cb904d26793c1d4
Marco Nelissen [Mon, 13 Mar 2017 22:43:54 +0000 (22:43 +0000)]
Merge "Fix integer overflow and divide-by-zero" into klp-dev am:
b264ece2c0 am:
bbca2719c6
am:
c2e69851ea
Change-Id: I2720c4439848f9aab8d7fa4f93b548793d129a4f
Marco Nelissen [Mon, 13 Mar 2017 22:43:40 +0000 (22:43 +0000)]
Merge "Fix NPDs in h263 decoder" into klp-dev am:
012e5fd39e am:
9e8dfb5938
am:
9e4a0e1fab
Change-Id: I17a5c0765c31c92a25e7c89a330aa656adc03baf
Ray Essick [Mon, 13 Mar 2017 22:43:39 +0000 (22:43 +0000)]
Merge "Add bounds check in SoftAACEncoder2::onQueueFilled()" into klp-dev
am:
19b91af752
Change-Id: I83ad1fa809b82d1b4a6158b66ebffc5ae1d35590
Ray Essick [Mon, 13 Mar 2017 22:43:27 +0000 (22:43 +0000)]
Merge "Fix TOCTOU problem in libstagefright_soft_aacenc" into klp-dev
am:
2076915c5f
Change-Id: Ib9bc5c92218231acefda2800df84a8bffe2da92f
Marco Nelissen [Mon, 13 Mar 2017 22:43:26 +0000 (22:43 +0000)]
Merge "Fix out of bounds access" into klp-dev am:
360cbbd72c am:
f71b76cae8
am:
36c2e14da3
Change-Id: Ie6d46a6979bc89e2485fa4d2a25b21fc601e9783
Marco Nelissen [Mon, 13 Mar 2017 22:39:25 +0000 (22:39 +0000)]
Merge "Fix integer overflow and divide-by-zero" into klp-dev am:
b264ece2c0
am:
bbca2719c6
Change-Id: If5ae485e1be0df3d4f61edf689d5b4c1520077b8
Marco Nelissen [Mon, 13 Mar 2017 22:39:10 +0000 (22:39 +0000)]
Merge "Fix NPDs in h263 decoder" into klp-dev am:
012e5fd39e
am:
9e8dfb5938
Change-Id: I875cb7bba1bc6f6f443923a04629ae44a9d41140
Marco Nelissen [Mon, 13 Mar 2017 22:38:56 +0000 (22:38 +0000)]
Merge "Fix out of bounds access" into klp-dev am:
360cbbd72c
am:
f71b76cae8
Change-Id: I3306be5d7bb3867287732757dd14170527488b68
Ray Essick [Mon, 13 Mar 2017 22:38:40 +0000 (22:38 +0000)]
Merge "Add bounds check in SoftAACEncoder2::onQueueFilled()" into klp-dev
Ray Essick [Mon, 13 Mar 2017 22:35:43 +0000 (22:35 +0000)]
Merge "Fix TOCTOU problem in libstagefright_soft_aacenc" into klp-dev
Marco Nelissen [Mon, 13 Mar 2017 22:34:54 +0000 (22:34 +0000)]
Merge "Fix integer overflow and divide-by-zero" into klp-dev
am:
b264ece2c0
Change-Id: Id65ef33cb965b6fbdec95d9429ee05b134fd14f3
Marco Nelissen [Mon, 13 Mar 2017 22:34:40 +0000 (22:34 +0000)]
Merge "Fix NPDs in h263 decoder" into klp-dev
am:
012e5fd39e
Change-Id: I2ad3e1364472558cf48c51fb3e2a08002d74c32d
Marco Nelissen [Mon, 13 Mar 2017 22:34:26 +0000 (22:34 +0000)]
Merge "Fix out of bounds access" into klp-dev
am:
360cbbd72c
Change-Id: I9ea32d31b1281689c4b5997a6c328630031c1795
Marco Nelissen [Mon, 13 Mar 2017 22:31:24 +0000 (22:31 +0000)]
Merge "Fix integer overflow and divide-by-zero" into klp-dev
Marco Nelissen [Mon, 13 Mar 2017 22:30:25 +0000 (22:30 +0000)]
Merge "Fix NPDs in h263 decoder" into klp-dev
Marco Nelissen [Mon, 13 Mar 2017 22:28:40 +0000 (22:28 +0000)]
Merge "Fix out of bounds access" into klp-dev
Ray Essick [Mon, 13 Mar 2017 18:59:57 +0000 (11:59 -0700)]
Add bounds check in SoftAACEncoder2::onQueueFilled()
Original code blindly copied some header information into the
user-supplied buffer without checking for sufficient space.
The code does check when it gets to filling the data -- it's
just the header copies that weren't checked.
Bug:
34617444
Test: ran POC before/after
Change-Id: I6e80ec90616f6cd02bb8316cd2d6e309b7e4729d
Ray Essick [Mon, 13 Mar 2017 16:56:49 +0000 (16:56 +0000)]
Merge "Validate lengths in HEVC metadata parsing" into nyc-dev
Marco Nelissen [Fri, 3 Mar 2017 21:37:27 +0000 (13:37 -0800)]
Fix NPDs in h263 decoder
Bug:
35269635
Test: decoded PoC with and without patch
Change-Id: I636a14360c7801cc5bca63c9cb44d1d235df8fd8
Ray Essick [Sat, 11 Mar 2017 00:03:40 +0000 (16:03 -0800)]
Fix TOCTOU problem in libstagefright_soft_aacenc
Fixes a configuration error where we sized a buffer initially based
on the configuration at the time and held onto the buffer through the
rest of our lifetime. If the configuration was changed in a way that
resulted in needing a different size buffer, the code did not make
this happen.
Patch keeps the buffer around but also stores the 'current allocation
size'. This allows the later code that preps the buffer to query if
the buffer size is same or changed. If changed, we discard the old
buffer and allocate a new one of the appropriate size.
safetynet logging added so we can tell how often this happens in the
field.
Testing was done on nyc-mr2 (where poc was built). Patch applies
without change to k/l/m/n/master.
Bug:
34621073
Test: run POC, saw new diagnostics saying it caught the size change.
Change-Id: Ia95aadc8c727434b7ba9628deeae327c405336d3
Andy Hung [Fri, 10 Mar 2017 23:04:02 +0000 (23:04 +0000)]
Merge "DO NOT MERGE AudioFlinger: Check framecount overflow when creating track" into klp-dev am:
e0da30dc57 am:
737754e97a am:
de6072164a -s ours am:
9fe1d60957 -s ours am:
fe66ce6f1e am:
3995196b9d -s ours am:
b1c01ac1a0 am:
5a18b3d70d am:
2a381e6f2f
am:
d331c1ec6a -s ours
Change-Id: I002064f85d1b2f40f5f01e3327cfc9e7db70769d
Andy Hung [Fri, 10 Mar 2017 23:00:32 +0000 (23:00 +0000)]
Merge "DO NOT MERGE AudioFlinger: Check framecount overflow when creating track" into klp-dev am:
e0da30dc57 am:
737754e97a am:
de6072164a -s ours am:
9fe1d60957 -s ours am:
fe66ce6f1e am:
3995196b9d -s ours am:
b1c01ac1a0 am:
5a18b3d70d
am:
2a381e6f2f
Change-Id: Id9435fdd365f1eb5f1cf759e47cd675549f83a20
Marco Nelissen [Fri, 10 Mar 2017 19:28:44 +0000 (11:28 -0800)]
Fix out of bounds access
Bug:
34618607
Change-Id: I84f0ef948414d0b2d54e8948b6c30b8ae4da2b36
Andy Hung [Fri, 10 Mar 2017 22:56:31 +0000 (22:56 +0000)]
Merge "DO NOT MERGE AudioFlinger: Check framecount overflow when creating track" into klp-dev am:
e0da30dc57 am:
737754e97a am:
de6072164a -s ours am:
9fe1d60957 -s ours am:
fe66ce6f1e am:
3995196b9d -s ours am:
b1c01ac1a0
am:
5a18b3d70d
Change-Id: I90e4e976fd9a07f06a32233ae245134fe372d234
Andy Hung [Fri, 10 Mar 2017 22:53:03 +0000 (22:53 +0000)]
Merge "DO NOT MERGE AudioFlinger: Check framecount overflow when creating track" into klp-dev am:
e0da30dc57 am:
737754e97a am:
de6072164a -s ours am:
9fe1d60957 -s ours am:
fe66ce6f1e am:
3995196b9d -s ours
am:
b1c01ac1a0
Change-Id: I271a41d905cafdb3f4fa2c9fc4fbd183fd0af08b
Andy Hung [Fri, 10 Mar 2017 22:53:00 +0000 (22:53 +0000)]
Merge "AudioFlinger: Check framecount overflow when creating track" into lmp-dev am:
51a3483ec9 am:
5dc0e88cc1 am:
6d4b5fc334 am:
5562d70451 am:
3fb4149ed2 am:
78ec332732
am:
9262496af9
Change-Id: I8df7a4c1308afb39a1f1a37a588e70e049a868fa
Andy Hung [Fri, 10 Mar 2017 22:49:30 +0000 (22:49 +0000)]
Merge "AudioFlinger: Check framecount overflow when creating track" into lmp-dev am:
51a3483ec9 am:
5dc0e88cc1 am:
6d4b5fc334 am:
5562d70451 am:
3fb4149ed2
am:
78ec332732
Change-Id: I50a7b9f86a494bff6aa43e719e5c819eb0c191ae
Andy Hung [Fri, 10 Mar 2017 22:49:29 +0000 (22:49 +0000)]
Merge "DO NOT MERGE AudioFlinger: Check framecount overflow when creating track" into klp-dev am:
e0da30dc57 am:
737754e97a am:
de6072164a -s ours am:
9fe1d60957 -s ours am:
fe66ce6f1e
am:
3995196b9d -s ours
Change-Id: I4fa4eb204b244593d03c8bfa7f1169ee047c6652
Andy Hung [Fri, 10 Mar 2017 22:46:29 +0000 (22:46 +0000)]
Merge "DO NOT MERGE AudioFlinger: Check framecount overflow when creating track" into klp-dev am:
e0da30dc57 am:
737754e97a am:
de6072164a -s ours am:
9fe1d60957 -s ours
am:
fe66ce6f1e
Change-Id: I1c49e3520b11aebc987242540b8a3047db72e269
Andy Hung [Fri, 10 Mar 2017 22:46:29 +0000 (22:46 +0000)]
Merge "AudioFlinger: Check framecount overflow when creating track" into lmp-dev am:
51a3483ec9 am:
5dc0e88cc1 am:
6d4b5fc334 am:
5562d70451
am:
3fb4149ed2
Change-Id: I9101bb9cc966e9d99c78427697b6c570a7da753d
Andy Hung [Fri, 10 Mar 2017 22:42:59 +0000 (22:42 +0000)]
Merge "DO NOT MERGE AudioFlinger: Check framecount overflow when creating track" into klp-dev am:
e0da30dc57 am:
737754e97a am:
de6072164a -s ours
am:
9fe1d60957 -s ours
Change-Id: I06683878d8e39e9d9dcae9f897124c36f6b968bf
OSDN Git Service
