OSDN Git Service
Robert Shih [Thu, 14 Jul 2016 18:15:20 +0000 (18:15 +0000)]
Merge \\\"DO NOT MERGE - SoftMP3: memset safely\\\" into lmp-dev am:
d5573715d8 -s ours am:
f2fffc9fd0
am:
047fb889cc
Change-Id: I09b46561d6490b0693e0f37e3b770a50de2b82f2
Robert Shih [Thu, 14 Jul 2016 18:11:42 +0000 (18:11 +0000)]
Merge \\"DO NOT MERGE - SoftMP3: memset safely\\" into lmp-dev am:
d5573715d8 -s ours
am:
f2fffc9fd0
Change-Id: I5a1d3e49a82b031a74d48396ee719410d8e6a09a
Robert Shih [Thu, 14 Jul 2016 18:09:23 +0000 (18:09 +0000)]
Merge \"DO NOT MERGE - SoftMP3: memset safely\" into lmp-dev
am:
d5573715d8 -s ours
Change-Id: I8f7f2b98145c76b2904a0ef57651214e6881aac5
Robert Shih [Thu, 14 Jul 2016 18:06:19 +0000 (18:06 +0000)]
Merge "DO NOT MERGE - SoftMP3: memset safely" into lmp-dev
Sergio Giro [Thu, 14 Jul 2016 18:00:54 +0000 (18:00 +0000)]
Merge \\\"DO NOT MERGE Add bound checks to utf16_to_utf8\\\" into lmp-dev am:
5f34f40530 -s ours am:
20ae503b50
am:
012d1246ce
Change-Id: I07f7f569d97ccf58cd48f11e700c64d2eaeededc
Sergio Giro [Thu, 14 Jul 2016 17:59:53 +0000 (17:59 +0000)]
DO NOT MERGE Add bound checks to utf16_to_utf8 am:
0d9d569c26
am:
edce8ad060
Change-Id: I1c725b97d3f1fcabaa7129200ca67c3d479fd771
Sergio Giro [Thu, 14 Jul 2016 17:59:45 +0000 (17:59 +0000)]
Merge \\"DO NOT MERGE Add bound checks to utf16_to_utf8\\" into lmp-dev am:
5f34f40530 -s ours
am:
20ae503b50
Change-Id: Ib55ae047145673b53042b2e705f4407a0627b5bc
Sergio Giro [Thu, 14 Jul 2016 17:52:03 +0000 (17:52 +0000)]
Merge \"DO NOT MERGE Add bound checks to utf16_to_utf8\" into lmp-dev
am:
5f34f40530 -s ours
Change-Id: I2426d28827f0ee2e2077f31d411af78a58e72b32
Sergio Giro [Thu, 14 Jul 2016 17:52:03 +0000 (17:52 +0000)]
DO NOT MERGE Add bound checks to utf16_to_utf8
am:
0d9d569c26
Change-Id: Ic54078ce7eed59b04e6e4862bf2daf2aa0185950
Sergio Giro [Thu, 14 Jul 2016 17:36:23 +0000 (17:36 +0000)]
Merge "DO NOT MERGE Add bound checks to utf16_to_utf8" into lmp-dev
Sergio Giro [Tue, 28 Jun 2016 17:24:52 +0000 (18:24 +0100)]
DO NOT MERGE Add bound checks to utf16_to_utf8
Bug:
29250543
(cherry picked from commit
1d3f4278b2666d1a145af2f54782c993aa07d1d9)
Change-Id: Id4ffb4bee02c3bd53796723b4cbcc88e693f8e83
Sergio Giro [Tue, 28 Jun 2016 17:24:52 +0000 (18:24 +0100)]
DO NOT MERGE Add bound checks to utf16_to_utf8
Bug:
29250543
(cherry picked from commit
1d3f4278b2666d1a145af2f54782c993aa07d1d9)
Change-Id: Id4ffb4bee02c3bd53796723b4cbcc88e693f8e83
Robert Shih [Thu, 14 Jul 2016 01:58:04 +0000 (01:58 +0000)]
Merge \\\\\\"DO NOT MERGE - SoftMP3: memset safely\\\\\\" into klp-dev am:
3242dcf6e9 am:
f4ad14f154 am:
e3c1c2d734 -s ours am:
a2f91257fd -s ours am:
da2ac348fc
am:
8635613bf3
Change-Id: I534362c8ac08d793e2e9b19190a3091c252edc66
Robert Shih [Thu, 14 Jul 2016 01:49:30 +0000 (01:49 +0000)]
Merge \\\\\"DO NOT MERGE - SoftMP3: memset safely\\\\\" into klp-dev am:
3242dcf6e9 am:
f4ad14f154 am:
e3c1c2d734 -s ours am:
a2f91257fd -s ours
am:
da2ac348fc
Change-Id: I6d0517817b12073b3ce93dcfe14626399770a1fb
Robert Shih [Thu, 14 Jul 2016 01:43:50 +0000 (01:43 +0000)]
Merge \\\\"DO NOT MERGE - SoftMP3: memset safely\\\\" into klp-dev am:
3242dcf6e9 am:
f4ad14f154 am:
e3c1c2d734 -s ours
am:
a2f91257fd -s ours
Change-Id: I64c9657a66aa2e818ebc002af31591e6db51907d
Robert Shih [Thu, 14 Jul 2016 01:41:18 +0000 (01:41 +0000)]
Merge \\\"DO NOT MERGE - SoftMP3: memset safely\\\" into klp-dev am:
3242dcf6e9 am:
f4ad14f154
am:
e3c1c2d734 -s ours
Change-Id: I018c8bedc4d810b7abca34ff4273e249ebc0648f
Robert Shih [Thu, 14 Jul 2016 01:41:18 +0000 (01:41 +0000)]
Merge \\\\\\"DO NOT MERGE - SoftVPX: fix nFilledLen overflow\\\\\\" into klp-dev am:
91ad8847ab am:
74b10b831c am:
6bdf8cb440 -s ours am:
1f5fe85d74 -s ours am:
67443ebc81
am:
12165c481f
Change-Id: I97c5746a61515aefdb065f9d6a9ce3f9281999cb
Robert Shih [Thu, 14 Jul 2016 01:41:16 +0000 (01:41 +0000)]
Merge \\\\\\"OMXCodec: check IMemory::pointer() before using allocation\\\\\\" into klp-dev am:
f545c72b97 am:
d89781f3be am:
c9c40b829f am:
29f09eb295 am:
5d36fedeb8
am:
a17d7c0307
Change-Id: If552708dbdb28fe1b744adbd92790faafbc10783
Robert Shih [Thu, 14 Jul 2016 01:38:01 +0000 (01:38 +0000)]
Merge \\\\\"DO NOT MERGE - SoftVPX: fix nFilledLen overflow\\\\\" into klp-dev am:
91ad8847ab am:
74b10b831c am:
6bdf8cb440 -s ours am:
1f5fe85d74 -s ours
am:
67443ebc81
Change-Id: Ieb95c0c81bd8f5503e0162fc5ee2c7f2421612e7
Robert Shih [Thu, 14 Jul 2016 01:38:00 +0000 (01:38 +0000)]
Merge \\\\\"OMXCodec: check IMemory::pointer() before using allocation\\\\\" into klp-dev am:
f545c72b97 am:
d89781f3be am:
c9c40b829f am:
29f09eb295
am:
5d36fedeb8
Change-Id: I38291dfa8aa8956b53f074df1084668f53b7f7fe
Robert Shih [Thu, 14 Jul 2016 01:37:58 +0000 (01:37 +0000)]
Merge \\"DO NOT MERGE - SoftMP3: memset safely\\" into klp-dev am:
3242dcf6e9
am:
f4ad14f154
Change-Id: Iec5f4a53a3db5fbb40bfecd4bddf4b3f607ae450
Robert Shih [Thu, 14 Jul 2016 01:34:32 +0000 (01:34 +0000)]
DO NOT MERGE - SoftVPX: fix nFilledLen overflow am:
b7ba49c1a0 -s ours am:
c7dd19198c
am:
3cb33198d6
Change-Id: Ie17c37e86bebce202fa6c18f60149a191b3eaf2f
Robert Shih [Thu, 14 Jul 2016 01:31:31 +0000 (01:31 +0000)]
Merge \\\\"DO NOT MERGE - SoftVPX: fix nFilledLen overflow\\\\" into klp-dev am:
91ad8847ab am:
74b10b831c am:
6bdf8cb440 -s ours
am:
1f5fe85d74 -s ours
Change-Id: I3bb44ca286fd216f56d945996675a3d6045aa93d
Robert Shih [Thu, 14 Jul 2016 01:31:30 +0000 (01:31 +0000)]
Merge \\\\"OMXCodec: check IMemory::pointer() before using allocation\\\\" into klp-dev am:
f545c72b97 am:
d89781f3be am:
c9c40b829f
am:
29f09eb295
Change-Id: Ib65bf1a2dd56dfa84881a18acf0ba1871cdff38c
Robert Shih [Thu, 14 Jul 2016 01:31:29 +0000 (01:31 +0000)]
Merge \"DO NOT MERGE - SoftMP3: memset safely\" into klp-dev
am:
3242dcf6e9
Change-Id: I09c381c92c7efeacc95c611b2775d875a6202027
Robert Shih [Thu, 14 Jul 2016 01:28:42 +0000 (01:28 +0000)]
Merge \\\"DO NOT MERGE - SoftVPX: fix nFilledLen overflow\\\" into klp-dev am:
91ad8847ab am:
74b10b831c
am:
6bdf8cb440 -s ours
Change-Id: Id01ce97ff7add25f1f0b067440916e9d299a740b
Robert Shih [Thu, 14 Jul 2016 01:28:41 +0000 (01:28 +0000)]
Merge \\\"OMXCodec: check IMemory::pointer() before using allocation\\\" into klp-dev am:
f545c72b97 am:
d89781f3be
am:
c9c40b829f
Change-Id: I5facfd78f7050928d30c86585036128749b1f292
Robert Shih [Thu, 14 Jul 2016 01:28:38 +0000 (01:28 +0000)]
DO NOT MERGE - SoftVPX: fix nFilledLen overflow am:
b7ba49c1a0 -s ours
am:
c7dd19198c
Change-Id: Ie8bd4477f33d081adc23e74d1be699780ba2cf41
Robert Shih [Thu, 14 Jul 2016 01:26:14 +0000 (01:26 +0000)]
Merge "DO NOT MERGE - SoftMP3: memset safely" into klp-dev
Robert Shih [Thu, 14 Jul 2016 01:25:31 +0000 (01:25 +0000)]
Merge \\"DO NOT MERGE - SoftVPX: fix nFilledLen overflow\\" into klp-dev am:
91ad8847ab
am:
74b10b831c
Change-Id: I2b300c5f4993d4beb866e4f1c94eb4fece1149e2
Robert Shih [Thu, 14 Jul 2016 01:25:30 +0000 (01:25 +0000)]
Merge \\"OMXCodec: check IMemory::pointer() before using allocation\\" into klp-dev am:
f545c72b97
am:
d89781f3be
Change-Id: Iae2cc6d8f4512e7e1f4273bbb28b292337e291b6
Robert Shih [Thu, 14 Jul 2016 01:22:56 +0000 (01:22 +0000)]
Merge \"DO NOT MERGE - SoftVPX: fix nFilledLen overflow\" into klp-dev
am:
91ad8847ab
Change-Id: I66eec25f4bc143dd5d67b9bb77825f6e6c732880
Robert Shih [Thu, 14 Jul 2016 01:22:56 +0000 (01:22 +0000)]
Merge \"OMXCodec: check IMemory::pointer() before using allocation\" into klp-dev
am:
f545c72b97
Change-Id: I9206ce86485cb3acc2540d135f6beacc03bb38f5
Robert Shih [Thu, 14 Jul 2016 01:22:48 +0000 (01:22 +0000)]
DO NOT MERGE - SoftVPX: fix nFilledLen overflow
am:
b7ba49c1a0 -s ours
Change-Id: I87244bcc43caae1977289c0cf66093f5d94b3527
Robert Shih [Thu, 14 Jul 2016 01:18:10 +0000 (01:18 +0000)]
Merge "DO NOT MERGE - SoftVPX: fix nFilledLen overflow" into klp-dev
Robert Shih [Thu, 14 Jul 2016 01:16:52 +0000 (01:16 +0000)]
Merge "OMXCodec: check IMemory::pointer() before using allocation" into klp-dev
Robert Shih [Mon, 27 Jun 2016 20:55:14 +0000 (13:55 -0700)]
DO NOT MERGE - SoftMP3: memset safely
Bug:
29422022
Change-Id: I70c9e33269d16bf8c163815706ac24e18e34fe97
Robert Shih [Mon, 27 Jun 2016 20:55:14 +0000 (13:55 -0700)]
DO NOT MERGE - SoftMP3: memset safely
Bug:
29422022
Change-Id: I70c9e33269d16bf8c163815706ac24e18e34fe97
Robert Shih [Fri, 24 Jun 2016 19:37:45 +0000 (12:37 -0700)]
DO NOT MERGE - SoftVPX: fix nFilledLen overflow
Bug:
29421675
Change-Id: I25d4cf54a5df22c2130c37e95c7c7f75063111f3
Robert Shih [Fri, 24 Jun 2016 19:37:45 +0000 (12:37 -0700)]
DO NOT MERGE - SoftVPX: fix nFilledLen overflow
Bug:
29421675
Change-Id: I25d4cf54a5df22c2130c37e95c7c7f75063111f3
Ray Essick [Wed, 13 Jul 2016 22:52:22 +0000 (22:52 +0000)]
Merge \\\\\\"Fix corruption via buffer overflow in mediaserver\\\\\\" into klp-dev am:
b5299033ce am:
357e0f132e am:
efa1272404 am:
e20f434b16 am:
63b7b724b0
am:
fbdd8670a0
Change-Id: I42f79dd854a98d8fe20e922a35db372b54fc53b8
Ray Essick [Wed, 13 Jul 2016 22:49:23 +0000 (22:49 +0000)]
Merge \\\\\"Fix corruption via buffer overflow in mediaserver\\\\\" into klp-dev am:
b5299033ce am:
357e0f132e am:
efa1272404 am:
e20f434b16
am:
63b7b724b0
Change-Id: If438c59c09568b57a0348f42bdc112d4613a3f8c
Ray Essick [Wed, 13 Jul 2016 22:46:32 +0000 (22:46 +0000)]
Merge \\\\"Fix corruption via buffer overflow in mediaserver\\\\" into klp-dev am:
b5299033ce am:
357e0f132e am:
efa1272404
am:
e20f434b16
Change-Id: I0a68641bab795e8488a4b74050ef8c182cedd02c
Ray Essick [Wed, 13 Jul 2016 22:43:51 +0000 (22:43 +0000)]
Merge \\\"Fix corruption via buffer overflow in mediaserver\\\" into klp-dev am:
b5299033ce am:
357e0f132e
am:
efa1272404
Change-Id: Ia5996291c99df58d5986195424ce98ea354e6a8b
Ray Essick [Wed, 13 Jul 2016 22:41:18 +0000 (22:41 +0000)]
Merge \\"Fix corruption via buffer overflow in mediaserver\\" into klp-dev am:
b5299033ce
am:
357e0f132e
Change-Id: Ia387bc54c8d51975aa4c938616a43e47cb3338d9
Ray Essick [Wed, 13 Jul 2016 22:38:29 +0000 (22:38 +0000)]
Merge \"Fix corruption via buffer overflow in mediaserver\" into klp-dev
am:
b5299033ce
Change-Id: I774cb0256be49317851488879221a1c3602148f3
Ray Essick [Wed, 13 Jul 2016 22:12:57 +0000 (22:12 +0000)]
Merge "Fix corruption via buffer overflow in mediaserver" into klp-dev
Wonsik Kim [Wed, 13 Jul 2016 04:15:59 +0000 (04:15 +0000)]
Merge \\\\\\"DO NOT MERGE stagefright: fix possible stack overflow in AVCC reassemble\\\\\\" into klp-dev am:
b239e27433 am:
cc3c549065 am:
19ca2d2486 -s ours am:
ef64984fe6 -s ours am:
fe184469d5
am:
a0b2421e41
Change-Id: Iea6d3d13c19f9121e7a505f89fa59e02b7cf7834
Wonsik Kim [Wed, 13 Jul 2016 04:11:53 +0000 (04:11 +0000)]
Merge \\\\\"DO NOT MERGE stagefright: fix possible stack overflow in AVCC reassemble\\\\\" into klp-dev am:
b239e27433 am:
cc3c549065 am:
19ca2d2486 -s ours am:
ef64984fe6 -s ours
am:
fe184469d5
Change-Id: I9d419a11d17b23fc63ff441e67da089abde4cb5e
Wonsik Kim [Wed, 13 Jul 2016 04:04:19 +0000 (04:04 +0000)]
Merge \\\\"DO NOT MERGE stagefright: fix possible stack overflow in AVCC reassemble\\\\" into klp-dev am:
b239e27433 am:
cc3c549065 am:
19ca2d2486 -s ours
am:
ef64984fe6 -s ours
Change-Id: If5f6b4b949911c9421172c90f45ede3f8d5fe27d
Wonsik Kim [Wed, 13 Jul 2016 04:00:37 +0000 (04:00 +0000)]
Merge \\\"DO NOT MERGE stagefright: fix possible stack overflow in AVCC reassemble\\\" into klp-dev am:
b239e27433 am:
cc3c549065
am:
19ca2d2486 -s ours
Change-Id: I1fc5df6c606b357c59fca2dc90e716c5ce7d266c
Wonsik Kim [Wed, 13 Jul 2016 03:56:57 +0000 (03:56 +0000)]
Merge \\"DO NOT MERGE stagefright: fix possible stack overflow in AVCC reassemble\\" into klp-dev am:
b239e27433
am:
cc3c549065
Change-Id: I772fba4484975a2f28fc947e4a16296b400f5a99
Wonsik Kim [Wed, 13 Jul 2016 03:49:20 +0000 (03:49 +0000)]
Merge \\\"DO NOT MERGE stagefright: fix possible stack overflow in AVCC reassemble\\\" into lmp-dev am:
250935d18a -s ours am:
0db8fd31e1
am:
ca08fe34fe
Change-Id: I3c51a12a8a52322f71654660e6023769c5024ec9
Wonsik Kim [Wed, 13 Jul 2016 03:45:39 +0000 (03:45 +0000)]
Merge \"DO NOT MERGE stagefright: fix possible stack overflow in AVCC reassemble\" into klp-dev
am:
b239e27433
Change-Id: I2f3e5b3b1e4451506e7c66ced8222137d504abdb
Wonsik Kim [Wed, 13 Jul 2016 03:41:55 +0000 (03:41 +0000)]
Merge \\"DO NOT MERGE stagefright: fix possible stack overflow in AVCC reassemble\\" into lmp-dev am:
250935d18a -s ours
am:
0db8fd31e1
Change-Id: Ib1aa01330422cc6b030e045bde785aa10e0cda96
Wonsik Kim [Wed, 13 Jul 2016 03:38:14 +0000 (03:38 +0000)]
Merge \"DO NOT MERGE stagefright: fix possible stack overflow in AVCC reassemble\" into lmp-dev
am:
250935d18a -s ours
Change-Id: I69bb1a049c80c45e6863e5064d8bb20c0c9a9d10
Wonsik Kim [Wed, 13 Jul 2016 03:32:16 +0000 (03:32 +0000)]
Merge "DO NOT MERGE stagefright: fix possible stack overflow in AVCC reassemble" into klp-dev
Wonsik Kim [Wed, 13 Jul 2016 03:32:08 +0000 (03:32 +0000)]
Merge "DO NOT MERGE stagefright: fix possible stack overflow in AVCC reassemble" into lmp-dev
Robert Shih [Wed, 13 Jul 2016 01:00:53 +0000 (18:00 -0700)]
OMXCodec: check IMemory::pointer() before using allocation
Bug:
29421811
Change-Id: I0a73ba12bae4122f1d89fc92e5ea4f6a96cd1ed1
Pawin Vongmasa [Mon, 11 Jul 2016 21:17:11 +0000 (21:17 +0000)]
Impose a size bound for dynamically allocated tables in stbl. am:
583a012a9f am:
34519820bf am:
726010eb1f am:
7a9538cd36 am:
80fa0cde3f
am:
e97d67a51c
Change-Id: I7b6aad59efd44d39d6658b9990c11e4f02f76a16
Pawin Vongmasa [Mon, 11 Jul 2016 21:14:30 +0000 (21:14 +0000)]
Impose a size bound for dynamically allocated tables in stbl. am:
583a012a9f am:
34519820bf am:
726010eb1f am:
7a9538cd36
am:
80fa0cde3f
Change-Id: I530021f80aca9ecfd81ffb90a1083f6f6e4fe1d3
Pawin Vongmasa [Mon, 11 Jul 2016 21:12:11 +0000 (21:12 +0000)]
Impose a size bound for dynamically allocated tables in stbl. am:
583a012a9f am:
34519820bf am:
726010eb1f
am:
7a9538cd36
Change-Id: I8e2bb6e6f42c8a9a094eafe3c618ed809eb4fd3b
Pawin Vongmasa [Mon, 11 Jul 2016 21:09:10 +0000 (21:09 +0000)]
Impose a size bound for dynamically allocated tables in stbl. am:
583a012a9f am:
34519820bf
am:
726010eb1f
Change-Id: Id4fd4a863d083b27286e7b3abf7897ca8f20b798
Pawin Vongmasa [Mon, 11 Jul 2016 21:06:45 +0000 (21:06 +0000)]
Impose a size bound for dynamically allocated tables in stbl. am:
583a012a9f
am:
34519820bf
Change-Id: Ie338b5b5c726137d173caa97e3a1b428d04d1837
Pawin Vongmasa [Mon, 11 Jul 2016 21:03:59 +0000 (21:03 +0000)]
Impose a size bound for dynamically allocated tables in stbl.
am:
583a012a9f
Change-Id: Ide23dfb85980fe89f3b7b536894947981ccd7aaf
Ray Essick [Wed, 6 Jul 2016 17:13:25 +0000 (10:13 -0700)]
Fix corruption via buffer overflow in mediaserver
change unbound sprintf() to snprintf() so network-provided values
can't overflow the buffers.
Applicable to all K/L/M/N branches.
Bug:
25747670
Change-Id: Id6a5120c2d08a6fbbd47deffb680ecf82015f4f6
Wonsik Kim [Thu, 16 Jun 2016 16:24:30 +0000 (01:24 +0900)]
DO NOT MERGE stagefright: fix possible stack overflow in AVCC reassemble
Additionally, remove use of variable length array which is
non-standard in C++.
Bug:
29161888
Change-Id: Ifdc3e7435f2225214c053b13f3bfe71c7d0ff506
Wonsik Kim [Thu, 16 Jun 2016 16:24:30 +0000 (01:24 +0900)]
DO NOT MERGE stagefright: fix possible stack overflow in AVCC reassemble
Additionally, remove use of variable length array which is
non-standard in C++.
Bug:
29161888
Change-Id: Ifdc3e7435f2225214c053b13f3bfe71c7d0ff506
Pawin Vongmasa [Wed, 22 Jun 2016 02:10:21 +0000 (19:10 -0700)]
Impose a size bound for dynamically allocated tables in stbl.
Impose a restriction of 200MiB for tables in stsc, stts, ctts and stss
boxes. Also change mTimeToSample from Vector to array.
Bug:
29367429
Change-Id: I953bea9fe0590268cf27376740f582dc88563d42
Wonsik Kim [Wed, 22 Jun 2016 18:46:49 +0000 (18:46 +0000)]
Merge \\\\\\"Revert \\\\\\"Impose a size bound for dynamically allocated tables in stbl.\\\\\\"\\\\\\" into klp-dev am:
7e6bd6a911 am:
3ad7688745 am:
9d65d13cc7 am:
4ef5122525 am:
77d31bde26
am:
b53ba5e7a6
Change-Id: I72a7f15894380adabfc21e017abac88b6fe26348
Wonsik Kim [Wed, 22 Jun 2016 18:41:24 +0000 (18:41 +0000)]
Merge \\\\\"Revert \\\\\"Impose a size bound for dynamically allocated tables in stbl.\\\\\"\\\\\" into klp-dev am:
7e6bd6a911 am:
3ad7688745 am:
9d65d13cc7 am:
4ef5122525
am:
77d31bde26
Change-Id: Id330cd73e8f46b9f6bbf52600da0a0d2425a0354
Wonsik Kim [Wed, 22 Jun 2016 18:39:08 +0000 (18:39 +0000)]
Merge \\\\"Revert \\\\"Impose a size bound for dynamically allocated tables in stbl.\\\\"\\\\" into klp-dev am:
7e6bd6a911 am:
3ad7688745 am:
9d65d13cc7
am:
4ef5122525
Change-Id: Ib0106bbe2ffba8de744907a2714eedf207756abe
Wonsik Kim [Wed, 22 Jun 2016 18:36:14 +0000 (18:36 +0000)]
Merge \\\"Revert \\\"Impose a size bound for dynamically allocated tables in stbl.\\\"\\\" into klp-dev am:
7e6bd6a911 am:
3ad7688745
am:
9d65d13cc7
Change-Id: Ib8d8f9c58c1ffb169cf488d57fb841f80a664e97
Wonsik Kim [Wed, 22 Jun 2016 18:33:49 +0000 (18:33 +0000)]
Merge \\"Revert \\"Impose a size bound for dynamically allocated tables in stbl.\\"\\" into klp-dev am:
7e6bd6a911
am:
3ad7688745
Change-Id: I02de46ed2ce14428a45826270b557426ee2aaf47
Wonsik Kim [Wed, 22 Jun 2016 18:31:13 +0000 (18:31 +0000)]
Merge \"Revert \"Impose a size bound for dynamically allocated tables in stbl.\"\" into klp-dev
am:
7e6bd6a911
Change-Id: Id0ca80f03ee0426730951f7961ef903c29d3c6ef
Wonsik Kim [Wed, 22 Jun 2016 18:27:32 +0000 (18:27 +0000)]
Merge "Revert "Impose a size bound for dynamically allocated tables in stbl."" into klp-dev
Wonsik Kim [Wed, 22 Jun 2016 18:19:15 +0000 (18:19 +0000)]
Revert "Impose a size bound for dynamically allocated tables in stbl."
This reverts commit
25e029746796fe88e82417fb01af2e27b8bbadb2.
Change-Id: I91225838a8be72a3cd413f2bcb99e7dca7e62929
Wonsik Kim [Wed, 22 Jun 2016 18:11:22 +0000 (18:11 +0000)]
Merge \\\\\\"Impose a size bound for dynamically allocated tables in stbl.\\\\\\" into klp-dev am:
8f73edb22a am:
a263248bf0 am:
4c969bf93f am:
7e06799472 am:
fcb008b743
am:
26dc0a2a91
Change-Id: Ic91093f89dad5ada3f6997b7dff1557e726099c4
Pawin Vongmasa [Wed, 22 Jun 2016 18:07:16 +0000 (18:07 +0000)]
Merge \\\\\"Impose a size bound for dynamically allocated tables in stbl.\\\\\" into klp-dev am:
8f73edb22a am:
a263248bf0 am:
4c969bf93f am:
7e06799472
am:
fcb008b743
Change-Id: I3527f060a0f723c047081c70d83e0a18dfadf119
Wonsik Kim [Wed, 22 Jun 2016 18:01:43 +0000 (18:01 +0000)]
Merge \\\\"Impose a size bound for dynamically allocated tables in stbl.\\\\" into klp-dev am:
8f73edb22a am:
a263248bf0 am:
4c969bf93f
am:
7e06799472
Change-Id: I4c877fcf9839e44ca849d25f46ba55f74cd0064e
Pawin Vongmasa [Wed, 22 Jun 2016 17:58:26 +0000 (17:58 +0000)]
Merge \\\"Impose a size bound for dynamically allocated tables in stbl.\\\" into klp-dev am:
8f73edb22a am:
a263248bf0
am:
4c969bf93f
Change-Id: I6258bac89bbe02e47b3c912df26f26033d7b76b4
Wonsik Kim [Wed, 22 Jun 2016 17:55:12 +0000 (17:55 +0000)]
Merge \\"Impose a size bound for dynamically allocated tables in stbl.\\" into klp-dev am:
8f73edb22a
am:
a263248bf0
Change-Id: I0389073f6b18450edc8fa70ed3ec72683a166915
Pawin Vongmasa [Wed, 22 Jun 2016 17:51:55 +0000 (17:51 +0000)]
Merge \"Impose a size bound for dynamically allocated tables in stbl.\" into klp-dev
am:
8f73edb22a
Change-Id: I2dfcb7ee560fdd01f6800a34d50397ac4f71798f
Wonsik Kim [Wed, 22 Jun 2016 17:38:54 +0000 (17:38 +0000)]
Merge "Impose a size bound for dynamically allocated tables in stbl." into klp-dev
Pawin Vongmasa [Wed, 22 Jun 2016 02:10:21 +0000 (19:10 -0700)]
Impose a size bound for dynamically allocated tables in stbl.
Impose a restriction of 200MiB for tables in stsc, stts, ctts and stss
boxes. Also change Vector to std::vector for efficiency and consistency.
Bug:
29367429
Change-Id: I175da524612b9fe68496c612966af51f01a5cd5e
Eino-Ville Talvala [Tue, 21 Jun 2016 22:17:37 +0000 (22:17 +0000)]
Merge \\\\\\"DO NOT MERGE: Camera: Adjust pointers to ANW buffers to avoid infoleak\\\\\\" into klp-dev am:
22d6575710 am:
4bec033ded am:
5c1f01675c -s ours am:
495ba35a17 -s ours am:
f45a909f14
am:
aec4789b06
Change-Id: I8d30a1d2c304de0f3ce748e03a975c46bbc6164e
Eino-Ville Talvala [Tue, 21 Jun 2016 22:14:04 +0000 (22:14 +0000)]
Merge \\\\\"DO NOT MERGE: Camera: Adjust pointers to ANW buffers to avoid infoleak\\\\\" into klp-dev am:
22d6575710 am:
4bec033ded am:
5c1f01675c -s ours am:
495ba35a17 -s ours
am:
f45a909f14
Change-Id: I5f316563ea3551f03409d95daf21aab453e60711
Eino-Ville Talvala [Tue, 21 Jun 2016 22:10:41 +0000 (22:10 +0000)]
Merge \\\\"DO NOT MERGE: Camera: Adjust pointers to ANW buffers to avoid infoleak\\\\" into klp-dev am:
22d6575710 am:
4bec033ded am:
5c1f01675c -s ours
am:
495ba35a17 -s ours
Change-Id: I68de90dcbd6453609197e3fb7b0f8f7c4473e482
Eino-Ville Talvala [Tue, 21 Jun 2016 22:06:36 +0000 (22:06 +0000)]
Merge \\\"DO NOT MERGE: Camera: Adjust pointers to ANW buffers to avoid infoleak\\\" into klp-dev am:
22d6575710 am:
4bec033ded
am:
5c1f01675c -s ours
Change-Id: I9a27186dd8c57aaf4a7c0385c2c521945c6fcd1e
Eino-Ville Talvala [Tue, 21 Jun 2016 22:06:30 +0000 (22:06 +0000)]
Merge \\\"DO NOT MERGE: Camera: Adjust pointers to ANW buffers to avoid infoleak\\\" into lmp-dev am:
f832feb17b -s ours am:
817545929d
am:
4ba6f225ec
Change-Id: I14b593fa50f2a22d76ebc04c040838836c9af362
Eino-Ville Talvala [Tue, 21 Jun 2016 22:03:33 +0000 (22:03 +0000)]
Merge \\"DO NOT MERGE: Camera: Adjust pointers to ANW buffers to avoid infoleak\\" into klp-dev am:
22d6575710
am:
4bec033ded
Change-Id: I68dd7d3ea94b10104c235007fd03230ef5ae0146
Eino-Ville Talvala [Tue, 21 Jun 2016 22:03:32 +0000 (22:03 +0000)]
Merge \\"DO NOT MERGE: Camera: Adjust pointers to ANW buffers to avoid infoleak\\" into lmp-dev am:
f832feb17b -s ours
am:
817545929d
Change-Id: I0cdde9b06adb1f522783df3e35943fd761090cca
Eino-Ville Talvala [Tue, 21 Jun 2016 22:00:23 +0000 (22:00 +0000)]
Merge \"DO NOT MERGE: Camera: Adjust pointers to ANW buffers to avoid infoleak\" into lmp-dev
am:
f832feb17b -s ours
Change-Id: I120a53e20423bd4df63a22e1abf8aee54f12cc9d
Eino-Ville Talvala [Tue, 21 Jun 2016 22:00:22 +0000 (22:00 +0000)]
Merge \"DO NOT MERGE: Camera: Adjust pointers to ANW buffers to avoid infoleak\" into klp-dev
am:
22d6575710
Change-Id: I0c2a4ebf1ce1e47a819f2ea2e67ea4bb6f055526
Eino-Ville Talvala [Tue, 21 Jun 2016 21:57:34 +0000 (21:57 +0000)]
Merge "DO NOT MERGE: Camera: Adjust pointers to ANW buffers to avoid infoleak" into klp-dev
Eino-Ville Talvala [Tue, 21 Jun 2016 21:57:34 +0000 (21:57 +0000)]
Merge "DO NOT MERGE: Camera: Adjust pointers to ANW buffers to avoid infoleak" into lmp-dev
Wonsik Kim [Tue, 21 Jun 2016 17:49:41 +0000 (17:49 +0000)]
Merge \\\\\\"DO NOT MERGE omx: check buffer port before using\\\\\\" into klp-dev am:
5713902f6a am:
1410b5034f am:
8b35cb563d -s ours am:
71676a9dc4 -s ours am:
6a2a3ed69e
am:
f63f606a8e
Change-Id: I15845a3e06589f6e2ab65264c64f783069cee498
Andy Hung [Tue, 21 Jun 2016 17:49:41 +0000 (17:49 +0000)]
Check effect command reply size in AudioFlinger am:
110bc9547a am:
075c8f7713 am:
c971a59f4c am:
195f7c6125 am:
1e1b7e4c3d
am:
d34a9dfc5e
Change-Id: I2705198deaaeb485503135fe97bc0d6f5ba8cf70
Wonsik Kim [Tue, 21 Jun 2016 17:47:04 +0000 (17:47 +0000)]
Merge \\\\\"DO NOT MERGE omx: check buffer port before using\\\\\" into klp-dev am:
5713902f6a am:
1410b5034f am:
8b35cb563d -s ours am:
71676a9dc4 -s ours
am:
6a2a3ed69e
Change-Id: I62ebdb3da8b5c1cba67e3143e1c67a9fe7b1ec7c
Andy Hung [Tue, 21 Jun 2016 17:47:03 +0000 (17:47 +0000)]
Check effect command reply size in AudioFlinger am:
110bc9547a am:
075c8f7713 am:
c971a59f4c am:
195f7c6125
am:
1e1b7e4c3d
Change-Id: I6558d45c768225007c53016542459cec3dd1387f
OSDN Git Service
