OSDN Git Service
Pawin Vongmasa [Fri, 19 Aug 2016 02:44:07 +0000 (02:44 +0000)]
DO NOT MERGE - SoftMPEG4: Check the buffer size before writing the reference frame.
am:
180185da19 -s ours
Change-Id: I73131f2361fa0f950aca6ed77551cb8d7e6a96d9
Pawin Vongmasa [Tue, 19 Jul 2016 03:12:02 +0000 (20:12 -0700)]
DO NOT MERGE - SoftMPEG4: Check the buffer size before writing the reference frame.
Also prevent overflow in SoftMPEG4 and division by zero in SoftMPEG4Encoder.
Bug:
30033990
Change-Id: I7701f5fc54c2670587d122330e5dc851f64ed3c2
(cherry picked from commit
695123195034402ca76169b195069c28c30342d3)
Pawin Vongmasa [Tue, 19 Jul 2016 03:12:02 +0000 (20:12 -0700)]
SoftMPEG4: Check the buffer size before writing the reference frame.
Also prevent overflow in SoftMPEG4 and division by zero in SoftMPEG4Encoder.
Bug:
30033990
Change-Id: I7701f5fc54c2670587d122330e5dc851f64ed3c2
TreeHugger Robot [Mon, 1 Aug 2016 22:05:02 +0000 (22:05 +0000)]
Merge "DO NOT MERGE - stagefright: fix integer overflow error" into lmp-mr1-dev
Wonsik Kim [Thu, 21 Jul 2016 05:43:38 +0000 (14:43 +0900)]
DO NOT MERGE - stagefright: fix integer overflow error
Bug:
30103394
Change-Id: If449d3e30a0bf2ebea5317f41813bfed094f7408
(cherry picked from commit
2c74a3cd5d1d66b9a35424b9c4443dafa6db5bef)
Wonsik Kim [Mon, 1 Aug 2016 21:11:24 +0000 (21:11 +0000)]
Merge "DO NOT MERGE - stagefright: fix integer overflow error" into lmp-dev
am:
8f4b1a7de0 -s ours
Change-Id: I5ccb9ee7ddd79e6a3599c1e53ff0247c0af50bf4
Wonsik Kim [Mon, 1 Aug 2016 21:11:23 +0000 (21:11 +0000)]
DO NOT MERGE - stagefright: fix integer overflow error
am:
f4f36a0a31 -s ours
Change-Id: I5f7bb034371e3651a00a6023352b871eeeb9740a
Marco Nelissen [Mon, 1 Aug 2016 21:08:39 +0000 (21:08 +0000)]
Merge "DO NOT MERGE - stagefright: fix integer overflow error" into lmp-dev
Wonsik Kim [Mon, 1 Aug 2016 20:35:41 +0000 (20:35 +0000)]
DO NOT MERGE - stagefright: fix integer overflow error am:
17a10c50e2 am:
8df5df78a3 am:
e40e452a3a -s ours
am:
87d4805d94 -s ours
Change-Id: I7316ed78d4308e8528a79ec2f2ea7708164401ad
Wonsik Kim [Mon, 1 Aug 2016 20:33:17 +0000 (20:33 +0000)]
DO NOT MERGE - stagefright: fix integer overflow error am:
17a10c50e2 am:
8df5df78a3
am:
e40e452a3a -s ours
Change-Id: Ib76f39590bc10ace428d2e142db1f752ac3567c6
Wonsik Kim [Mon, 1 Aug 2016 20:30:39 +0000 (20:30 +0000)]
DO NOT MERGE - stagefright: fix integer overflow error am:
17a10c50e2
am:
8df5df78a3
Change-Id: Iba844e14f530d15531c5b47e7aaaedfd7849813b
Wonsik Kim [Mon, 1 Aug 2016 20:28:10 +0000 (20:28 +0000)]
DO NOT MERGE - stagefright: fix integer overflow error
am:
17a10c50e2
Change-Id: I310e406b5370678b112f5ad0603e22456d6c3de7
Wonsik Kim [Thu, 21 Jul 2016 05:43:38 +0000 (14:43 +0900)]
DO NOT MERGE - stagefright: fix integer overflow error
Bug:
30103394
Change-Id: If449d3e30a0bf2ebea5317f41813bfed094f7408
(cherry picked from commit
2c74a3cd5d1d66b9a35424b9c4443dafa6db5bef)
Wonsik Kim [Thu, 21 Jul 2016 05:43:38 +0000 (14:43 +0900)]
DO NOT MERGE - stagefright: fix integer overflow error
Bug:
30103394
Change-Id: If449d3e30a0bf2ebea5317f41813bfed094f7408
(cherry picked from commit
2c74a3cd5d1d66b9a35424b9c4443dafa6db5bef)
Wonsik Kim [Tue, 19 Jul 2016 22:54:16 +0000 (22:54 +0000)]
omx: prevent input port enable/disable for software codecs am:
2b94fa8277 am:
c83b53c9e5 am:
f054728108
am:
062fd4a341
Change-Id: I979b1c6b415b83d11f1a0c24b7fe54fe79556676
Wonsik Kim [Tue, 19 Jul 2016 22:51:43 +0000 (22:51 +0000)]
omx: prevent input port enable/disable for software codecs am:
2b94fa8277 am:
c83b53c9e5
am:
f054728108
Change-Id: I230da4ea86abf01ff9057900f0eea1af151c9a00
Wonsik Kim [Tue, 19 Jul 2016 22:46:54 +0000 (22:46 +0000)]
omx: prevent input port enable/disable for software codecs am:
2b94fa8277
am:
c83b53c9e5
Change-Id: I6eeb301a2418cae6a57e49ed29527edd5e8de2b0
Wonsik Kim [Tue, 19 Jul 2016 22:44:18 +0000 (22:44 +0000)]
omx: prevent input port enable/disable for software codecs
am:
2b94fa8277
Change-Id: I5c370c34986be1435f2d0eebae8e264c0f4f0f44
Wonsik Kim [Thu, 7 Jul 2016 03:57:02 +0000 (12:57 +0900)]
omx: prevent input port enable/disable for software codecs
Bug:
29421804
Change-Id: Iba1011e9af942a6dff7f659af769a51e3f5ba66f
Robert Shih [Thu, 14 Jul 2016 23:06:31 +0000 (23:06 +0000)]
DO NOT MERGE - Fix build am:
bf835e4525 am:
98b31b9270 am:
1038762b09 -s ours
am:
5d925fce78 -s ours
Change-Id: Ie8c4b4df445063c09bfaf9a1e987798c6d1df978
Robert Shih [Thu, 14 Jul 2016 23:04:02 +0000 (23:04 +0000)]
DO NOT MERGE - Fix build am:
bf835e4525 am:
98b31b9270
am:
1038762b09 -s ours
Change-Id: I43d1bdb6bd3f432b44513687d1736fc344c68f9a
Robert Shih [Thu, 14 Jul 2016 23:01:31 +0000 (23:01 +0000)]
DO NOT MERGE - Fix build am:
bf835e4525
am:
98b31b9270
Change-Id: Ib3dd2d315096bcb31dbfcd5be66f00d482594c9b
Robert Shih [Thu, 14 Jul 2016 22:58:30 +0000 (22:58 +0000)]
DO NOT MERGE - Fix build
am:
bf835e4525
Change-Id: Idd0b7779345c8b4c595681de7431c3339b44129e
Robert Shih [Thu, 14 Jul 2016 22:32:08 +0000 (15:32 -0700)]
DO NOT MERGE - Fix build
Change-Id: Iff47bb735778fb275abeee573c636856b839feb5
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 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: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: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: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: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: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: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: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: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: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: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: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: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: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: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: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:44:06 +0000 (17:44 +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
Change-Id: I4ed0d5198d2f4f892b72f4a0c8f6986355dbc1e3
Andy Hung [Tue, 21 Jun 2016 17:44:05 +0000 (17:44 +0000)]
Check effect command reply size in AudioFlinger am:
110bc9547a am:
075c8f7713 am:
c971a59f4c
am:
195f7c6125
Change-Id: I8da29433f8dabffc94a82617e325a314c4ae84d0
Wonsik Kim [Tue, 21 Jun 2016 17:41:27 +0000 (17:41 +0000)]
Merge \\\"DO NOT MERGE omx: check buffer port before using\\\" into klp-dev am:
5713902f6a am:
1410b5034f
am:
8b35cb563d -s ours
Change-Id: I40733cfbad5dac51eceb5e09ad3cad4688bea63e
Andy Hung [Tue, 21 Jun 2016 17:41:26 +0000 (17:41 +0000)]
Check effect command reply size in AudioFlinger am:
110bc9547a am:
075c8f7713
am:
c971a59f4c
Change-Id: I86d971f1a537a34e90e4f0697c9c9a43e509cfc4
Wonsik Kim [Tue, 21 Jun 2016 17:38:38 +0000 (17:38 +0000)]
Merge \\"DO NOT MERGE omx: check buffer port before using\\" into klp-dev am:
5713902f6a
am:
1410b5034f
Change-Id: Ib6d17c24784c51a7301094d69a08d13693a1dd16
Andy Hung [Tue, 21 Jun 2016 17:38:37 +0000 (17:38 +0000)]
Check effect command reply size in AudioFlinger am:
110bc9547a
am:
075c8f7713
Change-Id: I7b70873d12dc258b362c88c8a9ea47ca0e0578ca
Wonsik Kim [Tue, 21 Jun 2016 17:35:54 +0000 (17:35 +0000)]
Merge \"DO NOT MERGE omx: check buffer port before using\" into klp-dev
am:
5713902f6a
Change-Id: I8556765a98c6e381548b0b15a90ff08e7281411b
Wonsik Kim [Tue, 21 Jun 2016 17:35:54 +0000 (17:35 +0000)]
DO NOT MERGE omx: check buffer port before using
am:
719fd3c062 -s ours
Change-Id: I7448195d4fd5f32c1b35ca48479473e9c352fef6
Andy Hung [Tue, 21 Jun 2016 17:35:54 +0000 (17:35 +0000)]
Check effect command reply size in AudioFlinger
am:
110bc9547a
Change-Id: I9649715366450333fab28b4f2f1510edde63fb6a
Wonsik Kim [Tue, 21 Jun 2016 17:29:39 +0000 (17:29 +0000)]
Merge "DO NOT MERGE omx: check buffer port before using" into klp-dev