OSDN Git Service
Dongwon Kang [Wed, 16 Aug 2017 19:00:51 +0000 (19:00 +0000)]
Merge "Check buffer size in useBuffer in software components" into klp-dev am:
c65287a08c am:
5dfd2b5d9f am:
f84e9b9169 am:
0d7d0ab16e am:
5b89f4af6d am:
49903e4e0d
am:
395c7417a7
Change-Id: I6c6f140b5d164ce5e7e0fa7206016e0ce80a8396
Dongwon Kang [Wed, 16 Aug 2017 18:57:53 +0000 (18:57 +0000)]
Merge "Check buffer size in useBuffer in software components" into klp-dev am:
c65287a08c am:
5dfd2b5d9f am:
f84e9b9169 am:
0d7d0ab16e am:
5b89f4af6d
am:
49903e4e0d
Change-Id: I4896ddcb270fe1c07e2f70e70eea99946e5c2ac1
Dongwon Kang [Wed, 16 Aug 2017 18:54:54 +0000 (18:54 +0000)]
Merge "Check buffer size in useBuffer in software components" into klp-dev am:
c65287a08c am:
5dfd2b5d9f am:
f84e9b9169 am:
0d7d0ab16e
am:
5b89f4af6d
Change-Id: Iaf9973226c72e46e7bf976e7917c102e737516b2
Dongwon Kang [Wed, 16 Aug 2017 18:48:54 +0000 (18:48 +0000)]
Merge "Check buffer size in useBuffer in software components" into klp-dev am:
c65287a08c am:
5dfd2b5d9f am:
f84e9b9169
am:
0d7d0ab16e
Change-Id: If958b023d571cabf9b180daaa6f7049e148cbe35
Dongwon Kang [Wed, 16 Aug 2017 18:43:50 +0000 (18:43 +0000)]
Merge "Check buffer size in useBuffer in software components" into klp-dev am:
c65287a08c am:
5dfd2b5d9f
am:
f84e9b9169
Change-Id: Ic4b40082b3a42c470e4cea5d7efb19c32ba47030
Dongwon Kang [Wed, 16 Aug 2017 18:40:50 +0000 (18:40 +0000)]
Merge "Check buffer size in useBuffer in software components" into klp-dev am:
c65287a08c
am:
5dfd2b5d9f
Change-Id: I353d7057154a79d1ef44614450e75d123885be27
Dongwon Kang [Wed, 16 Aug 2017 18:32:19 +0000 (18:32 +0000)]
Merge "Check buffer size in useBuffer in software components" into klp-dev
am:
c65287a08c
Change-Id: I4b97f1df29bc3a2be401542be525c85880987b9b
Android Build Merger (Role) [Wed, 16 Aug 2017 18:20:05 +0000 (18:20 +0000)]
[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into klp-dev am:
9e41bec8d3 -s ours am:
c1e3b0cda0 am:
f6ae88fdec am:
398d2167a0 am:
94b2e04aae am:
35a1e90c82 am:
dc3b1f6afb
Change-Id: I9e8e351a90cebbe87a755fc9ddcd5d06d7b37add
Android Build Merger (Role) [Wed, 16 Aug 2017 18:20:00 +0000 (18:20 +0000)]
[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into klp-dev am:
9e41bec8d3 -s ours am:
c1e3b0cda0 am:
f6ae88fdec am:
398d2167a0 am:
94b2e04aae am:
35a1e90c82
Change-Id: I3042941f91290fdca070bcaa5cd00de36deb5d16
Android Build Merger (Role) [Wed, 16 Aug 2017 18:19:56 +0000 (18:19 +0000)]
[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into klp-dev am:
9e41bec8d3 -s ours am:
c1e3b0cda0 am:
f6ae88fdec am:
398d2167a0 am:
94b2e04aae
Change-Id: I3bed8696d76f4d08d059fd74e5e85b3d361a4c77
Android Build Merger (Role) [Wed, 16 Aug 2017 18:19:51 +0000 (18:19 +0000)]
[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into klp-dev am:
9e41bec8d3 -s ours am:
c1e3b0cda0 am:
f6ae88fdec am:
398d2167a0
Change-Id: Iba67f3a765f9398b8ce0c2b90aa13be1a9669ba7
Android Build Merger (Role) [Wed, 16 Aug 2017 18:19:46 +0000 (18:19 +0000)]
[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into klp-dev am:
9e41bec8d3 -s ours am:
c1e3b0cda0 am:
f6ae88fdec
Change-Id: I8523a6a7220d1b6022965cd7df1b736b06aeee02
Android Build Merger (Role) [Wed, 16 Aug 2017 18:19:42 +0000 (18:19 +0000)]
[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into klp-dev am:
9e41bec8d3 -s ours am:
c1e3b0cda0
Change-Id: I203f15b2b318b43ef01ab2e741a2cec7a5a55e5c
Lajos Molnar [Wed, 16 Aug 2017 18:19:15 +0000 (18:19 +0000)]
Merge "stagefright: avoid buffer overflow in base64 decoder" into klp-dev
am:
9e41bec8d3 -s ours
Change-Id: I8e3a43273b89ae97ccba0715d99e9dc5286821ef
Android Build Merger (Role) [Wed, 16 Aug 2017 01:58:41 +0000 (01:58 +0000)]
[automerger] Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into klp-ub-dev am:
15f75d0422 am:
ce9a76f40c am:
0640937bdb am:
480084e6af am:
34b2a8b522 am:
d98bd836b8
Change-Id: Iad6852ae0dc6d2297469a0a388ab593de6209188
Android Build Merger (Role) [Wed, 16 Aug 2017 01:58:36 +0000 (01:58 +0000)]
[automerger] Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into klp-ub-dev am:
15f75d0422 am:
ce9a76f40c am:
0640937bdb am:
480084e6af am:
34b2a8b522
Change-Id: Iffd510d4e17d68a038c0755bbd42bd51b656e8fa
Android Build Merger (Role) [Wed, 16 Aug 2017 01:58:30 +0000 (01:58 +0000)]
[automerger] Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into klp-ub-dev am:
15f75d0422 am:
ce9a76f40c am:
0640937bdb am:
480084e6af
Change-Id: I33f6fdffdaa35fbd524c61a30348b90680ab9dae
Android Build Merger (Role) [Wed, 16 Aug 2017 01:58:23 +0000 (01:58 +0000)]
[automerger] Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into klp-ub-dev am:
15f75d0422 am:
ce9a76f40c am:
0640937bdb
Change-Id: Ifce752f0511ce8fc5d16f79f682063109b8bee37
Android Build Merger (Role) [Wed, 16 Aug 2017 01:58:18 +0000 (01:58 +0000)]
[automerger] Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into klp-ub-dev am:
15f75d0422 am:
ce9a76f40c
Change-Id: Ib1416049d9793045e08182d61c22cad65383ffd5
Dongwon Kang [Wed, 16 Aug 2017 01:57:43 +0000 (01:57 +0000)]
Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into klp-ub-dev
am:
15f75d0422
Change-Id: Id14d38f22f91c68682acdb3572c07a6e57780b03
Android Build Merger (Role) [Wed, 16 Aug 2017 00:34:40 +0000 (00:34 +0000)]
[automerger] Merge "Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into lmp-mr1-dev am:
4c01d8afde" into lmp-mr1-app-dev am:
7321b13ddc am:
1d8b613b36
Change-Id: I0201484dc7447147690dbf4e0c429f515e20b6ff
Dongwon Kang [Wed, 16 Aug 2017 00:33:59 +0000 (00:33 +0000)]
Merge "Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into lmp-mr1-dev am:
4c01d8afde" into lmp-mr1-app-dev
am:
7321b13ddc
Change-Id: If2e53431ccd1bf4bc0bb720bf916b731a35fdaaf
Android Build Merger (Role) [Wed, 16 Aug 2017 00:17:19 +0000 (00:17 +0000)]
Merge "Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into lmp-mr1-dev am:
4c01d8afde" into lmp-mr1-app-dev
Android Build Merger (Role) [Wed, 16 Aug 2017 00:13:08 +0000 (00:13 +0000)]
[automerger] Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into lmp-mr1-dev am:
4c01d8afde am:
fafd25255e am:
a78c7f4ecc
Change-Id: Ib01cacc36ddeeb6c999601ff74e717992745d40d
Android Build Merger (Role) [Wed, 16 Aug 2017 00:13:03 +0000 (00:13 +0000)]
[automerger] Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into lmp-mr1-dev am:
4c01d8afde am:
fafd25255e
Change-Id: Id2a32097ac7af664a6fdb3e6e69ccdb6df38e8b4
Dongwon Kang [Wed, 16 Aug 2017 00:12:17 +0000 (00:12 +0000)]
Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into lmp-mr1-dev
am:
4c01d8afde
Change-Id: I8c11f8cac81a8c9de0df8506f3bb3fa339422bb6
Android Build Merger (Role) [Wed, 16 Aug 2017 00:06:44 +0000 (00:06 +0000)]
[automerger] Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into klp-modular-dev am:
47da6c0b7e am:
bc09b59061 am:
ff9c5ad85f am:
31199e5d39 am:
7db07c6af2
Change-Id: I74e32ac4f04c5729613961aecc900c5f612935e7
Android Build Merger (Role) [Wed, 16 Aug 2017 00:06:39 +0000 (00:06 +0000)]
[automerger] Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into klp-modular-dev am:
47da6c0b7e am:
bc09b59061 am:
ff9c5ad85f am:
31199e5d39
Change-Id: Ia07ed172e6fdaa560add83dc2bb8d2c4f50b3448
Android Build Merger (Role) [Wed, 16 Aug 2017 00:06:34 +0000 (00:06 +0000)]
[automerger] Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into klp-modular-dev am:
47da6c0b7e am:
bc09b59061 am:
ff9c5ad85f
Change-Id: I565376e4dda0297ba53ce7f4418d1b7fc685a600
Android Build Merger (Role) [Wed, 16 Aug 2017 00:06:29 +0000 (00:06 +0000)]
[automerger] Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into klp-modular-dev am:
47da6c0b7e am:
bc09b59061
Change-Id: I7e3fc6ae23f15b69860965678eaa788e3c75add1
Dongwon Kang [Wed, 16 Aug 2017 00:05:57 +0000 (00:05 +0000)]
Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into klp-modular-dev
am:
47da6c0b7e
Change-Id: Ic636c904d8dd4f7b329e2571f336aabf4f2a0079
Android Build Merger (Role) [Tue, 15 Aug 2017 23:59:43 +0000 (23:59 +0000)]
Merge changes from topic "am-
a8e8440a183d4fe18cbe2acc2bff719b" into mnc-dr-dev
* changes:
[automerger] Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into lmp-mr1-app-dev am:
220213623b am:
2a30ea07f1
Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into lmp-mr1-app-dev am:
220213623b
Android Build Merger (Role) [Tue, 15 Aug 2017 23:55:09 +0000 (23:55 +0000)]
[automerger] Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into lmp-mr1-app-dev am:
220213623b am:
2a30ea07f1
Change-Id: I550412747a6afe16ff7791a8c50a4d7c6e9866e1
Dongwon Kang [Tue, 15 Aug 2017 23:54:32 +0000 (23:54 +0000)]
Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into lmp-mr1-app-dev
am:
220213623b
Change-Id: I64dc27a3b6982c33ed8bb6f3c6b2801480447faa
Dongwon Kang [Tue, 15 Aug 2017 23:53:34 +0000 (23:53 +0000)]
Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into mnc-dev
am:
c17b510a15
Change-Id: I07e52bccb5178319f753f243f41a7522d7535eb7
TreeHugger Robot [Tue, 15 Aug 2017 23:44:25 +0000 (23:44 +0000)]
Merge "Check buffer size in useBuffer in software components" into klp-dev
TreeHugger Robot [Tue, 15 Aug 2017 23:44:25 +0000 (23:44 +0000)]
Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into klp-ub-dev
* changes:
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb
Check buffer size in useBuffer in software components
TreeHugger Robot [Tue, 15 Aug 2017 23:44:25 +0000 (23:44 +0000)]
Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into klp-modular-dev
* changes:
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb
Check buffer size in useBuffer in software components
TreeHugger Robot [Tue, 15 Aug 2017 23:44:25 +0000 (23:44 +0000)]
Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into lmp-mr1-app-dev
* changes:
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9 am:
33508aff52 am:
0de0b6806a am:
6d0c3ebd0f
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9 am:
33508aff52 am:
0de0b6806a
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9 am:
33508aff52
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb
Check buffer size in useBuffer in software components
TreeHugger Robot [Tue, 15 Aug 2017 23:44:25 +0000 (23:44 +0000)]
Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into lmp-mr1-dev
* changes:
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9 am:
33508aff52 am:
0de0b6806a
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9 am:
33508aff52
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb
Check buffer size in useBuffer in software components
TreeHugger Robot [Tue, 15 Aug 2017 23:44:25 +0000 (23:44 +0000)]
Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into lmp-dev
* changes:
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9 am:
33508aff52
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb
Check buffer size in useBuffer in software components
TreeHugger Robot [Tue, 15 Aug 2017 23:44:25 +0000 (23:44 +0000)]
Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into mnc-dr-dev
* changes:
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9 am:
33508aff52 am:
0de0b6806a am:
6d0c3ebd0f am:
d411bde017 am:
62cee3ee93
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9 am:
33508aff52 am:
0de0b6806a am:
6d0c3ebd0f am:
d411bde017
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9 am:
33508aff52 am:
0de0b6806a am:
6d0c3ebd0f
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9 am:
33508aff52 am:
0de0b6806a
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9 am:
33508aff52
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb
Check buffer size in useBuffer in software components
TreeHugger Robot [Tue, 15 Aug 2017 23:44:25 +0000 (23:44 +0000)]
Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into mnc-dev
* changes:
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9 am:
33508aff52 am:
0de0b6806a am:
6d0c3ebd0f am:
d411bde017
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9 am:
33508aff52 am:
0de0b6806a am:
6d0c3ebd0f
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9 am:
33508aff52 am:
0de0b6806a
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9 am:
33508aff52
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb
Check buffer size in useBuffer in software components
Lajos Molnar [Tue, 15 Aug 2017 23:03:50 +0000 (23:03 +0000)]
Merge "stagefright: avoid buffer overflow in base64 decoder" into klp-dev
Lajos Molnar [Tue, 15 Aug 2017 22:21:39 +0000 (22:21 +0000)]
[automerger] Merge commit '
e42038e5c7286a15a50dd1decfa1a579dbda8cd6' into HEAD am:
1ec4196300 am:
dba49298e2 am:
b9348d12a8 am:
983ab59558
Change-Id: I6ba96d5aeb9268ceac0a7287a650afcf459231ed
Lajos Molnar [Tue, 15 Aug 2017 22:21:33 +0000 (22:21 +0000)]
[automerger] Merge commit '
e42038e5c7286a15a50dd1decfa1a579dbda8cd6' into HEAD am:
1ec4196300 am:
dba49298e2 am:
b9348d12a8
Change-Id: Ic9a15317becdbb4acf1343ac064f4e2c77b2b114
Lajos Molnar [Tue, 15 Aug 2017 22:21:28 +0000 (22:21 +0000)]
[automerger] Merge commit '
e42038e5c7286a15a50dd1decfa1a579dbda8cd6' into HEAD am:
1ec4196300 am:
dba49298e2
Change-Id: I674a5e8e1587de842352deb41279b6ea32045b60
Lajos Molnar [Tue, 15 Aug 2017 22:21:23 +0000 (22:21 +0000)]
[automerger] Merge commit '
e42038e5c7286a15a50dd1decfa1a579dbda8cd6' into HEAD am:
1ec4196300
Change-Id: I16d35492c1254579794d4398dee28dd556a1703d
Lajos Molnar [Tue, 15 Aug 2017 22:10:32 +0000 (15:10 -0700)]
Merge commit '
e42038e5c7286a15a50dd1decfa1a579dbda8cd6' into HEAD
* commit '
e42038e5c7286a15a50dd1decfa1a579dbda8cd6':
stagefright: avoid buffer overflow in base64 decoder
Bug:
62673128
Change-Id: I2cfd6b4f7e30c111de54d9b42e7bc94a3a5aefba
Dongwon Kang [Tue, 15 Aug 2017 22:06:20 +0000 (22:06 +0000)]
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9 am:
33508aff52 am:
0de0b6806a am:
6d0c3ebd0f am:
d411bde017 am:
62cee3ee93
Change-Id: Id63b9b26263436ac54269878d15897b6d6e4d41f
Dongwon Kang [Tue, 15 Aug 2017 22:06:15 +0000 (22:06 +0000)]
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9 am:
33508aff52 am:
0de0b6806a am:
6d0c3ebd0f am:
d411bde017
Change-Id: Ic6c8672379bf0e84715d0da49ae4704ac0a2ea02
Dongwon Kang [Tue, 15 Aug 2017 22:06:10 +0000 (22:06 +0000)]
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9 am:
33508aff52 am:
0de0b6806a am:
6d0c3ebd0f
Change-Id: I6a29a7a6f8db29380f6adcc0d4ed6b4c3935c309
Dongwon Kang [Tue, 15 Aug 2017 22:06:05 +0000 (22:06 +0000)]
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9 am:
33508aff52 am:
0de0b6806a
Change-Id: Idf513ba06641aacf48f457b3a8ae02721404b7c1
Dongwon Kang [Tue, 15 Aug 2017 22:05:59 +0000 (22:05 +0000)]
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9 am:
33508aff52
Change-Id: Ic12354524144a6d1337be0a7c57efb4711cee660
Dongwon Kang [Tue, 15 Aug 2017 22:05:53 +0000 (22:05 +0000)]
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9
Change-Id: Ibbbdacd98e6362267e5f7b926a70c133a0a3d9f4
Dongwon Kang [Tue, 15 Aug 2017 22:05:47 +0000 (22:05 +0000)]
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb
Change-Id: I12e72631c86a3d1cb5fadb89243c1acacc7c20a7
Dongwon Kang [Mon, 24 Jul 2017 20:59:51 +0000 (13:59 -0700)]
Check buffer size in useBuffer in software components
Test: No more crash from oob read/write with running poc.
Bug:
63522430
Change-Id: I232d256eacdfaa9347902fe9b42650999f0d2d85
Lajos Molnar [Tue, 15 Aug 2017 22:02:19 +0000 (22:02 +0000)]
[automerger] stagefright: avoid buffer overflow in base64 decoder am:
b4d9e1b413 am:
8710f4666e
Change-Id: I954737558188868ffe66a844acc4b268dc2918f4
Lajos Molnar [Tue, 15 Aug 2017 22:02:12 +0000 (22:02 +0000)]
[automerger] stagefright: avoid buffer overflow in base64 decoder am:
b4d9e1b413
Change-Id: I9ba3a1d3deffa395ef454da57bfeb4200943f190
Lajos Molnar [Tue, 15 Aug 2017 00:13:07 +0000 (00:13 +0000)]
Merge "Merge changes from topic "am-
b89fd127-e87f-4013-8a91-
d8bfa01a2650" into lmp-mr1-app-dev am:
5293df6bb6" into mnc-dev
am:
a0388f92c7
Change-Id: I92c20c87114bce30d61f3505187a9aa5782370c5
Android Build Merger (Role) [Mon, 14 Aug 2017 23:58:17 +0000 (23:58 +0000)]
Merge "Merge changes from topic "am-
b89fd127-e87f-4013-8a91-
d8bfa01a2650" into lmp-mr1-app-dev am:
5293df6bb6" into mnc-dev
Android Build Merger (Role) [Mon, 14 Aug 2017 23:58:17 +0000 (23:58 +0000)]
Merge changes from topic "am-
30695673681a430e9c5896e3258d3047" into mnc-dr-dev
* changes:
[automerger] Merge changes from topic "am-
b89fd127-e87f-4013-8a91-
d8bfa01a2650" into lmp-mr1-app-dev am:
5293df6bb6 am:
0089ba9485
Merge changes from topic "am-
b89fd127-e87f-4013-8a91-
d8bfa01a2650" into lmp-mr1-app-dev am:
5293df6bb6
Android Build Merger (Role) [Mon, 14 Aug 2017 23:58:06 +0000 (23:58 +0000)]
Merge "Merge changes from topic "am-
b89fd127-e87f-4013-8a91-
d8bfa01a2650" into mnc-dev am:
371e4fc283" into mnc-dr-dev
Android Build Merger (Role) [Mon, 14 Aug 2017 23:52:47 +0000 (23:52 +0000)]
[automerger] Merge changes from topic "am-
b89fd127-e87f-4013-8a91-
d8bfa01a2650" into lmp-mr1-app-dev am:
5293df6bb6 am:
0089ba9485
Change-Id: I9537087f5a039e122f3a91d7d9191b8771bad602
Android Build Merger (Role) [Mon, 14 Aug 2017 23:52:05 +0000 (23:52 +0000)]
[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into lmp-dev am:
cddbfe5496 am:
3c2b8586ad am:
5dc58ac31b am:
c42e782644
Change-Id: Ia50926f618e0c9045196fbf8413901c28ccd1f73
Android Build Merger (Role) [Mon, 14 Aug 2017 23:52:00 +0000 (23:52 +0000)]
[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into lmp-dev am:
cddbfe5496 am:
3c2b8586ad am:
5dc58ac31b
Change-Id: I068312923b05f1fb82d47331272515d294809317
Android Build Merger (Role) [Mon, 14 Aug 2017 23:51:56 +0000 (23:51 +0000)]
[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into lmp-dev am:
cddbfe5496 am:
3c2b8586ad
Change-Id: Ic6f76fbc3f7c128d8a6bad06bdf596e37701090f
Lajos Molnar [Mon, 14 Aug 2017 23:51:53 +0000 (23:51 +0000)]
Merge changes from topic "am-
b89fd127-e87f-4013-8a91-
d8bfa01a2650" into lmp-mr1-app-dev
am:
5293df6bb6
Change-Id: I54288e3fe8017dc920fead91513ea7ab6d22b849
Lajos Molnar [Mon, 14 Aug 2017 23:51:52 +0000 (23:51 +0000)]
Merge changes from topic "am-
b89fd127-e87f-4013-8a91-
d8bfa01a2650" into mnc-dev
am:
371e4fc283
Change-Id: I1e9abee95a7361acb06a447f0838a79c49b03d4e
Lajos Molnar [Mon, 14 Aug 2017 23:51:34 +0000 (23:51 +0000)]
Merge "stagefright: avoid buffer overflow in base64 decoder" into lmp-dev
am:
cddbfe5496
Change-Id: Ic03f8dbd9b54cd9a4899b10cb554e294155dcc6d
Lajos Molnar [Mon, 14 Aug 2017 23:30:11 +0000 (23:30 +0000)]
Merge "stagefright: avoid buffer overflow in base64 decoder" into lmp-dev
Lajos Molnar [Mon, 14 Aug 2017 23:30:11 +0000 (23:30 +0000)]
Merge changes from topic "am-
b89fd127-e87f-4013-8a91-
d8bfa01a2650" into mnc-dr-dev
* changes:
[automerger] stagefright: avoid buffer overflow in base64 decoder am:
5e96386ab7 am:
5045de6f46 am:
8f6c537ffb am:
4d76a4b525
[automerger] stagefright: avoid buffer overflow in base64 decoder am:
5e96386ab7 am:
5045de6f46 am:
8f6c537ffb
[automerger] stagefright: avoid buffer overflow in base64 decoder am:
5e96386ab7 am:
5045de6f46
[automerger] stagefright: avoid buffer overflow in base64 decoder am:
5e96386ab7
stagefright: avoid buffer overflow in base64 decoder
Lajos Molnar [Mon, 14 Aug 2017 23:30:11 +0000 (23:30 +0000)]
Merge changes from topic "am-
b89fd127-e87f-4013-8a91-
d8bfa01a2650" into mnc-dev
* changes:
[automerger] stagefright: avoid buffer overflow in base64 decoder am:
5e96386ab7 am:
5045de6f46 am:
8f6c537ffb
[automerger] stagefright: avoid buffer overflow in base64 decoder am:
5e96386ab7 am:
5045de6f46
[automerger] stagefright: avoid buffer overflow in base64 decoder am:
5e96386ab7
stagefright: avoid buffer overflow in base64 decoder
Lajos Molnar [Mon, 14 Aug 2017 23:30:11 +0000 (23:30 +0000)]
Merge changes from topic "am-
b89fd127-e87f-4013-8a91-
d8bfa01a2650" into lmp-mr1-app-dev
* changes:
[automerger] stagefright: avoid buffer overflow in base64 decoder am:
5e96386ab7 am:
5045de6f46
[automerger] stagefright: avoid buffer overflow in base64 decoder am:
5e96386ab7
stagefright: avoid buffer overflow in base64 decoder
Lajos Molnar [Mon, 14 Aug 2017 23:30:11 +0000 (23:30 +0000)]
Merge changes from topic "am-
b89fd127-e87f-4013-8a91-
d8bfa01a2650" into lmp-mr1-dev
* changes:
[automerger] stagefright: avoid buffer overflow in base64 decoder am:
5e96386ab7
stagefright: avoid buffer overflow in base64 decoder
Wei Jia [Mon, 14 Aug 2017 22:22:44 +0000 (22:22 +0000)]
[automerger] MPEG4Source: fix fragmented read. am:
5c57e911b4 am:
7445f0e400 am:
ab9bfb83b1 am:
da2d2587d3 am:
ca0bd10918 am:
442d5ba7b6 am:
fb86876c62
Change-Id: I2c156d1e0f52aa28448448eb403478ed7759c512
Wei Jia [Mon, 14 Aug 2017 22:22:39 +0000 (22:22 +0000)]
[automerger] MPEG4Source: fix fragmented read. am:
5c57e911b4 am:
7445f0e400 am:
ab9bfb83b1 am:
da2d2587d3 am:
ca0bd10918 am:
442d5ba7b6
Change-Id: Ieb9ea8613b8f4ce3848344380cc79bbf252cb996
Wei Jia [Mon, 14 Aug 2017 22:22:33 +0000 (22:22 +0000)]
[automerger] MPEG4Source: fix fragmented read. am:
5c57e911b4 am:
7445f0e400 am:
ab9bfb83b1 am:
da2d2587d3 am:
ca0bd10918
Change-Id: I56303a18ee48e2032d1d937899bd73035f507eba
Wei Jia [Mon, 14 Aug 2017 22:22:28 +0000 (22:22 +0000)]
[automerger] MPEG4Source: fix fragmented read. am:
5c57e911b4 am:
7445f0e400 am:
ab9bfb83b1 am:
da2d2587d3
Change-Id: I3f836425d32d5e5cd53162c5dcbb0150a6947a95
Wei Jia [Mon, 14 Aug 2017 22:22:23 +0000 (22:22 +0000)]
[automerger] MPEG4Source: fix fragmented read. am:
5c57e911b4 am:
7445f0e400 am:
ab9bfb83b1
Change-Id: I33ebb671bd8f8b036bd585b70fff42f3d61c078f
Wei Jia [Mon, 14 Aug 2017 22:22:17 +0000 (22:22 +0000)]
[automerger] MPEG4Source: fix fragmented read. am:
5c57e911b4 am:
7445f0e400
Change-Id: I63d3ee56db210794a06b97f1283bebf978284f42
Wei Jia [Mon, 14 Aug 2017 22:22:12 +0000 (22:22 +0000)]
[automerger] MPEG4Source: fix fragmented read. am:
5c57e911b4
Change-Id: If51ef2fb8858fa23a4503f031e9a9127c975ef36
Wei Jia [Fri, 24 Mar 2017 21:04:05 +0000 (14:04 -0700)]
MPEG4Source: fix fragmented read.
Test: passed CTS test DecoderTest#testDecodeFragmented
Bug:
64314728
Bug:
36571704
Change-Id: I71ad6aaae473b03483f8405899d3178148597bba
(cherry picked from commit
ba9af7792dfed6e9b1b216aab91a97e713eec891)
(cherry picked from commit
6b401a337674f2f22b7589534700a33187899869)
Mikhail Naganov [Mon, 14 Aug 2017 19:37:24 +0000 (19:37 +0000)]
[automerger] Add EFFECT_CMD_SET_PARAM parameter checking to Downmix and Reverb am:
804632afcd am:
bc1d023cc9 am:
03c1ecd9fe am:
c4b06bbc1e am:
5c6acee104 am:
fcc98fa3b1 am:
1f2d8b0b36
Change-Id: Ib9efffefd4952e675a13f51951a4d02f00c6abe6
Mikhail Naganov [Mon, 14 Aug 2017 19:37:19 +0000 (19:37 +0000)]
[automerger] Add EFFECT_CMD_SET_PARAM parameter checking to Downmix and Reverb am:
804632afcd am:
bc1d023cc9 am:
03c1ecd9fe am:
c4b06bbc1e am:
5c6acee104 am:
fcc98fa3b1
Change-Id: Ia0244b37df369a27b4bad024eef06cc56b5e64a2
Mikhail Naganov [Mon, 14 Aug 2017 19:37:13 +0000 (19:37 +0000)]
[automerger] Add EFFECT_CMD_SET_PARAM parameter checking to Downmix and Reverb am:
804632afcd am:
bc1d023cc9 am:
03c1ecd9fe am:
c4b06bbc1e am:
5c6acee104
Change-Id: I9127fb8696af5ef68ca122545ef6da09bba360c2
Mikhail Naganov [Mon, 14 Aug 2017 19:37:08 +0000 (19:37 +0000)]
[automerger] Add EFFECT_CMD_SET_PARAM parameter checking to Downmix and Reverb am:
804632afcd am:
bc1d023cc9 am:
03c1ecd9fe am:
c4b06bbc1e
Change-Id: I13d92901d6f54840bb2ff8a9802cdf94b690b8e2
Mikhail Naganov [Mon, 14 Aug 2017 19:37:03 +0000 (19:37 +0000)]
[automerger] Add EFFECT_CMD_SET_PARAM parameter checking to Downmix and Reverb am:
804632afcd am:
bc1d023cc9 am:
03c1ecd9fe
Change-Id: Iaaaead614bb1a1dbc62f0443e7e3e0d7d4fb9012
Mikhail Naganov [Mon, 14 Aug 2017 19:36:57 +0000 (19:36 +0000)]
[automerger] Add EFFECT_CMD_SET_PARAM parameter checking to Downmix and Reverb am:
804632afcd am:
bc1d023cc9
Change-Id: I8dfe1cdebec08b9ad5d3c7b19b8891158ac51132
Mikhail Naganov [Mon, 14 Aug 2017 19:36:51 +0000 (19:36 +0000)]
[automerger] Add EFFECT_CMD_SET_PARAM parameter checking to Downmix and Reverb am:
804632afcd
Change-Id: Ie44dd9c0d77ebcbc1b33603f06bb3fd3d86c6174
Lajos Molnar [Fri, 11 Aug 2017 21:06:25 +0000 (21:06 +0000)]
[automerger] stagefright: avoid buffer overflow in base64 decoder am:
5e96386ab7 am:
5045de6f46 am:
8f6c537ffb am:
4d76a4b525
Change-Id: Ifd01cbe03ab9bea87ccbc6fa8ff1c119cfca57d8
Lajos Molnar [Fri, 11 Aug 2017 21:06:20 +0000 (21:06 +0000)]
[automerger] stagefright: avoid buffer overflow in base64 decoder am:
5e96386ab7 am:
5045de6f46 am:
8f6c537ffb
Change-Id: I3ca735e893a638f412656f64bb3e857b6c863790
Lajos Molnar [Fri, 11 Aug 2017 21:06:14 +0000 (21:06 +0000)]
[automerger] stagefright: avoid buffer overflow in base64 decoder am:
5e96386ab7 am:
5045de6f46
Change-Id: Iddb5c897937a3acd8ee404a0d1f71ec5da22738e
Lajos Molnar [Fri, 11 Aug 2017 21:06:09 +0000 (21:06 +0000)]
[automerger] stagefright: avoid buffer overflow in base64 decoder am:
5e96386ab7
Change-Id: I5cd909195abd8ba442120aee597774f96c9db32d
Lajos Molnar [Tue, 27 Jun 2017 20:58:07 +0000 (13:58 -0700)]
stagefright: avoid buffer overflow in base64 decoder
Bug:
62673128
Change-Id: Id5f04b772aaca3184879bd5bca453ad9e82c7f94
Mikhail Naganov [Tue, 25 Jul 2017 00:25:47 +0000 (17:25 -0700)]
Add EFFECT_CMD_SET_PARAM parameter checking to Downmix and Reverb
Bug:
63662938
Bug:
63526567
Test: Added CTS tests
Change-Id: I8ed398cd62a9f461b0590e37f593daa3d8e4dbc4
Marco Nelissen [Fri, 4 Aug 2017 23:10:13 +0000 (23:10 +0000)]
Merge "Skip track if verification fails" into klp-dev am:
ab2c5046ef am:
f233415199 am:
87f1a3041d am:
222dca470e am:
ff9e1b0303 am:
6d050827c3 -s ours
am:
84b2e0717c -s ours
Change-Id: Ib5f483ddb67d18c95c720088f9b0ed1c64b65979
Marco Nelissen [Fri, 4 Aug 2017 23:03:47 +0000 (23:03 +0000)]
Merge "Skip track if verification fails" into klp-dev am:
ab2c5046ef am:
f233415199 am:
87f1a3041d am:
222dca470e am:
ff9e1b0303
am:
6d050827c3 -s ours
Change-Id: I192b34239fc52c5532a0ea4ce71fc110639d462f
Marco Nelissen [Fri, 4 Aug 2017 22:56:40 +0000 (22:56 +0000)]
Merge "Skip track if verification fails" into klp-dev am:
ab2c5046ef am:
f233415199 am:
87f1a3041d am:
222dca470e
am:
ff9e1b0303
Change-Id: I57d1b50eea3a31fae57bd20f856a0ebc53e73357
Marco Nelissen [Fri, 4 Aug 2017 22:51:11 +0000 (22:51 +0000)]
Merge "Skip track if verification fails" into klp-dev am:
ab2c5046ef am:
f233415199 am:
87f1a3041d
am:
222dca470e
Change-Id: Icd722065f9256e7afec3e3d7f53c2aa5340856d8
OSDN Git Service
