OSDN Git Service
Robert Shih [Wed, 15 Mar 2017 01:14:04 +0000 (01:14 +0000)]
FLACExtractor: copy protect mWriteBuffer am:
8ee699977c am:
038fd6e5ec am:
4eea0b3aa4 am:
b06f7c6e15 am:
5c1a7d4c64 am:
5b937b03d5 am:
ced3c15960 am:
5f6b69ea29 am:
5770ac25f3 am:
bde48bfbcc am:
bdd4b82237
am:
b67638b64e -s ours
Change-Id: I6a9152a4d017cd317c81c19cfe286f644f6d7961
Robert Shih [Wed, 15 Mar 2017 00:45:34 +0000 (00:45 +0000)]
FLACExtractor: copy protect mWriteBuffer am:
8ee699977c am:
038fd6e5ec am:
4eea0b3aa4 am:
b06f7c6e15 am:
5c1a7d4c64 am:
5b937b03d5 am:
ced3c15960 am:
5f6b69ea29 am:
5770ac25f3 am:
bde48bfbcc
am:
bdd4b82237
Change-Id: Ie30544eaad64d5aa305b0bcd0ff1a14ca6ace841
Robert Shih [Wed, 15 Mar 2017 00:40:34 +0000 (00:40 +0000)]
FLACExtractor: copy protect mWriteBuffer am:
8ee699977c am:
038fd6e5ec am:
4eea0b3aa4 am:
b06f7c6e15 am:
5c1a7d4c64 am:
5b937b03d5 am:
ced3c15960 am:
5f6b69ea29 am:
5770ac25f3
am:
bde48bfbcc
Change-Id: If195d8356235b7aebeb0d4e242cbaf678ded067e
Robert Shih [Wed, 15 Mar 2017 00:35:32 +0000 (00:35 +0000)]
FLACExtractor: copy protect mWriteBuffer am:
8ee699977c am:
038fd6e5ec am:
4eea0b3aa4 am:
b06f7c6e15 am:
5c1a7d4c64 am:
5b937b03d5 am:
ced3c15960 am:
5f6b69ea29
am:
5770ac25f3
Change-Id: I531cbbcdba72ef21b5938468bc3aa1eda067d55a
Robert Shih [Wed, 15 Mar 2017 00:30:32 +0000 (00:30 +0000)]
FLACExtractor: copy protect mWriteBuffer am:
8ee699977c am:
038fd6e5ec am:
4eea0b3aa4 am:
b06f7c6e15 am:
5c1a7d4c64 am:
5b937b03d5 am:
ced3c15960
am:
5f6b69ea29
Change-Id: I5b3ebe0b7272970e401b0bedcdcf65f92cf23687
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: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)]
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:04:31 +0000 (00:04 +0000)]
FLACExtractor: copy protect mWriteBuffer am:
8ee699977c am:
038fd6e5ec
am:
4eea0b3aa4
Change-Id: I4f3b1e4a100374da2e412082564fc6fb54dc122a
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 [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)
Ray Essick [Mon, 13 Mar 2017 23:47:22 +0000 (23:47 +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 am:
457bde5e35 am:
ed1109257a am:
9ab3187ff5 am:
530cf7afef
am:
7b0b51c337
Change-Id: I7c661b582f8511bc2e978ef6294a472ebee21dbd
Ray Essick [Mon, 13 Mar 2017 23:47:04 +0000 (23:47 +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 am:
d4d9c97a9d am:
b532a32912 am:
e4cce73b86 am:
ce559427fd
am:
bb8e18154d
Change-Id: I2ccabcce8115b1b9d1ad90ab14fc7eccc2ab0c15
Ray Essick [Mon, 13 Mar 2017 23:42:51 +0000 (23:42 +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 am:
457bde5e35 am:
ed1109257a am:
9ab3187ff5
am:
530cf7afef
Change-Id: I3ded31b95bff54d255eed96d7e6e1ccd083468f4
Ray Essick [Mon, 13 Mar 2017 23:42:34 +0000 (23:42 +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 am:
d4d9c97a9d am:
b532a32912 am:
e4cce73b86
am:
ce559427fd
Change-Id: Ide697c3ae0093839acb6a08e1617eef0f43677fe
Marco Nelissen [Mon, 13 Mar 2017 23:38:39 +0000 (23:38 +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 am:
d218b51912 am:
9305cf71d1 am:
7422dafea0 am:
731527f43f
am:
4e083b91ae
Change-Id: I375a88ca9ba2e9ea807c7471b347a68f7631a91a
Marco Nelissen [Mon, 13 Mar 2017 23:38:21 +0000 (23:38 +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 am:
bd47b7e23c am:
33745e6537 am:
d79e9c79f7 am:
a83fb59933
am:
16b4299141
Change-Id: I62dc6b12ffe41bb50dee56986c042047935058a9
Ray Essick [Mon, 13 Mar 2017 23:38:19 +0000 (23:38 +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 am:
457bde5e35 am:
ed1109257a
am:
9ab3187ff5
Change-Id: Id973b57ec24481f0852bd3b468eb37b1c0c4fa9c
Ray Essick [Mon, 13 Mar 2017 23:38:03 +0000 (23:38 +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 am:
d4d9c97a9d am:
b532a32912
am:
e4cce73b86
Change-Id: Ic9e5b1baa7344129820e9cdb340ee2998892edf2
Marco Nelissen [Mon, 13 Mar 2017 23:38:03 +0000 (23:38 +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 am:
4c5f8398f0 am:
31b147f2f7 am:
b9002a6643 am:
448e61d0d7
am:
b1f14803fe
Change-Id: I68be1067743fa39062940a2346f5d3443edf4315
Marco Nelissen [Mon, 13 Mar 2017 23:33:04 +0000 (23:33 +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 am:
d218b51912 am:
9305cf71d1 am:
7422dafea0
am:
731527f43f
Change-Id: I617276f7d81fc3e6d231522ff064aa96b4d5b4e6
Marco Nelissen [Mon, 13 Mar 2017 23:32:48 +0000 (23:32 +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 am:
bd47b7e23c am:
33745e6537 am:
d79e9c79f7
am:
a83fb59933
Change-Id: I3b1bf346e0f662bfc52abe774f0402659a035e75
Ray Essick [Mon, 13 Mar 2017 23:32:45 +0000 (23:32 +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 am:
457bde5e35
am:
ed1109257a
Change-Id: I86d9fc749345ede7521eb2d6222e8aec17bcd9da
Marco Nelissen [Mon, 13 Mar 2017 23:32:32 +0000 (23:32 +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 am:
4c5f8398f0 am:
31b147f2f7 am:
b9002a6643
am:
448e61d0d7
Change-Id: I58ad7452682461b2685a4194151de145ab3f3adf
Ray Essick [Mon, 13 Mar 2017 23:32:31 +0000 (23:32 +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 am:
d4d9c97a9d
am:
b532a32912
Change-Id: Ibc2f3193bbec30007428900d55caff74876bb856
Marco Nelissen [Mon, 13 Mar 2017 23:28:33 +0000 (23:28 +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 am:
d218b51912 am:
9305cf71d1
am:
7422dafea0
Change-Id: I9981960bd9ddf47e41825de77bb0e4a7a0c29c37
Ray Essick [Mon, 13 Mar 2017 23:28:20 +0000 (23:28 +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
am:
457bde5e35
Change-Id: I404c43a22e26d9e410c507c065acfb855e27944e
Marco Nelissen [Mon, 13 Mar 2017 23:28:17 +0000 (23:28 +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 am:
bd47b7e23c am:
33745e6537
am:
d79e9c79f7
Change-Id: I524ef7a4ce26bb77416aed8c4288418231c358cf
Marco Nelissen [Mon, 13 Mar 2017 23:28:02 +0000 (23:28 +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 am:
4c5f8398f0 am:
31b147f2f7
am:
b9002a6643
Change-Id: I03338600fb6c019efec8ae2429213c732bfdc4b3
Ray Essick [Mon, 13 Mar 2017 23:28:02 +0000 (23:28 +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
am:
d4d9c97a9d
Change-Id: I2ba0a0c9cdddddde43b1feac211e85a11db5ae14
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
Marco Nelissen [Mon, 13 Mar 2017 23:23:32 +0000 (23:23 +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 am:
d218b51912
am:
9305cf71d1
Change-Id: Ica4e4d677aa87358d6d90fc4e230a62f6ef518e3
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
Marco Nelissen [Mon, 13 Mar 2017 23:23:16 +0000 (23:23 +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 am:
bd47b7e23c
am:
33745e6537
Change-Id: I8e26826bdf58e39f2d115737d49323867d947651
Marco Nelissen [Mon, 13 Mar 2017 23:23:00 +0000 (23:23 +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 am:
4c5f8398f0
am:
31b147f2f7
Change-Id: I35435bc317247a2f51b7d211000c683784628af4
Marco Nelissen [Mon, 13 Mar 2017 23:19:03 +0000 (23:19 +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
am:
d218b51912
Change-Id: I3f43ab6ed39910e20259a25cec59a79b87856f48
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
Marco Nelissen [Mon, 13 Mar 2017 23:18:46 +0000 (23:18 +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
am:
bd47b7e23c
Change-Id: Ib1affab1f1957366239d1c04f8b9cb769ad023ac
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:18:31 +0000 (23:18 +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
am:
4c5f8398f0
Change-Id: I16ceed4b5bf842cda7ede27f744d78aed127c417
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 17:21:07 +0000 (17:21 +0000)]
Merge "Validate lengths in HEVC metadata parsing" into nyc-dev am:
d4c1d61625 am:
8e1aef08e6 am:
3754af193c am:
0d9990d9f0
am:
98284d4fe0
Change-Id: I933545664aaf68c77cff760c023c364aa605e394
Ray Essick [Mon, 13 Mar 2017 17:16:37 +0000 (17:16 +0000)]
Merge "Validate lengths in HEVC metadata parsing" into nyc-dev am:
d4c1d61625 am:
8e1aef08e6 am:
3754af193c
am:
0d9990d9f0
Change-Id: I709642fdd65cabaeffe4549c1685d2e23e45ed66
Ray Essick [Mon, 13 Mar 2017 17:11:36 +0000 (17:11 +0000)]
Merge "Validate lengths in HEVC metadata parsing" into nyc-dev am:
d4c1d61625 am:
8e1aef08e6
am:
3754af193c
Change-Id: I19532dd565f3d1e21427336db5efd7137ddeb92a
Ray Essick [Mon, 13 Mar 2017 17:07:05 +0000 (17:07 +0000)]
Merge "Validate lengths in HEVC metadata parsing" into nyc-dev am:
d4c1d61625
am:
8e1aef08e6
Change-Id: I3e4606ccac6574a786470fcb3ccab962273334c0
Ray Essick [Mon, 13 Mar 2017 17:03:05 +0000 (17:03 +0000)]
Merge "Validate lengths in HEVC metadata parsing" into nyc-dev
am:
d4c1d61625
Change-Id: I1d495aadf1ea82b715680596b086a1f29dd1f37c
Ray Essick [Mon, 13 Mar 2017 16:56:49 +0000 (16:56 +0000)]
Merge "Validate lengths in HEVC metadata parsing" into nyc-dev