OSDN Git Service

android-x86/frameworks-av.git
7 years agoDO NOT MERGE - Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636e...
Pawin Vongmasa [Fri, 19 Aug 2016 16:54:03 +0000 (16:54 +0000)]
DO NOT MERGE - Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636ecc456d.
am: ad929db743

Change-Id: Ib2ef17356334d2340a5aa0250a4b5ffbdd9c4dd0

7 years agoDO NOT MERGE - Fix build breakage caused by commit
Pawin Vongmasa [Fri, 19 Aug 2016 08:45:39 +0000 (01:45 -0700)]
DO NOT MERGE - Fix build breakage caused by commit
940829f69b52d6038db66a9c727534636ecc456d.

Change-Id: Ic55a9ab25ddb57f270c21d78ffcb556f3e11dd5d

7 years agoDO NOT MERGE - SoftMPEG4: Check the buffer size before writing the reference frame.
Pawin Vongmasa [Fri, 19 Aug 2016 02:40:37 +0000 (02:40 +0000)]
DO NOT MERGE - SoftMPEG4: Check the buffer size before writing the reference frame.
am: 940829f69b

Change-Id: I3df8797998bac785ad198cb4fb2401779a3947ff

7 years agoDO NOT MERGE - SoftMPEG4: Check the buffer size before writing the reference frame.
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)

7 years agoDO NOT MERGE - stagefright: fix integer overflow error
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

7 years agoDO NOT MERGE - stagefright: fix integer overflow error
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)

8 years agoomx: prevent input port enable/disable for software codecs
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

8 years agoomx: prevent input port enable/disable for software codecs
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

8 years agoDO NOT MERGE - Fix build
Robert Shih [Thu, 14 Jul 2016 22:58:30 +0000 (22:58 +0000)]
DO NOT MERGE - Fix build
am: bf835e4525

Change-Id: Idd0b7779345c8b4c595681de7431c3339b44129e

8 years agoDO NOT MERGE - Fix build
Robert Shih [Thu, 14 Jul 2016 22:32:08 +0000 (15:32 -0700)]
DO NOT MERGE - Fix build

Change-Id: Iff47bb735778fb275abeee573c636856b839feb5

8 years agoMerge \"DO NOT MERGE - SoftMP3: memset safely\" into klp-dev
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

8 years agoMerge "DO NOT MERGE - SoftMP3: memset safely" into klp-dev
Robert Shih [Thu, 14 Jul 2016 01:26:14 +0000 (01:26 +0000)]
Merge "DO NOT MERGE - SoftMP3: memset safely" into klp-dev

8 years agoMerge \"DO NOT MERGE - SoftVPX: fix nFilledLen overflow\" into klp-dev
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

8 years agoMerge \"OMXCodec: check IMemory::pointer() before using allocation\" into klp-dev
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

8 years agoMerge "DO NOT MERGE - SoftVPX: fix nFilledLen overflow" into klp-dev
Robert Shih [Thu, 14 Jul 2016 01:18:10 +0000 (01:18 +0000)]
Merge "DO NOT MERGE - SoftVPX: fix nFilledLen overflow" into klp-dev

8 years agoMerge "OMXCodec: check IMemory::pointer() before using allocation" 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

8 years agoDO NOT MERGE - SoftMP3: memset safely
Robert Shih [Mon, 27 Jun 2016 20:55:14 +0000 (13:55 -0700)]
DO NOT MERGE - SoftMP3: memset safely

Bug: 29422022
Change-Id: I70c9e33269d16bf8c163815706ac24e18e34fe97

8 years agoDO NOT MERGE - SoftVPX: fix nFilledLen overflow
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

8 years agoMerge \"Fix corruption via buffer overflow in mediaserver\" into klp-dev
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

8 years agoMerge "Fix corruption via buffer overflow in mediaserver" into klp-dev
Ray Essick [Wed, 13 Jul 2016 22:12:57 +0000 (22:12 +0000)]
Merge "Fix corruption via buffer overflow in mediaserver" into klp-dev

8 years agoMerge \"DO NOT MERGE stagefright: fix possible stack overflow in AVCC reassemble...
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

8 years agoMerge "DO NOT MERGE stagefright: fix possible stack overflow in AVCC reassemble"...
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

8 years agoOMXCodec: check IMemory::pointer() before using allocation
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

8 years agoImpose a size bound for dynamically allocated tables in stbl.
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

8 years agoFix corruption via buffer overflow in mediaserver
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

8 years agoDO NOT MERGE stagefright: fix possible stack overflow in AVCC reassemble
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

8 years agoImpose a size bound for dynamically allocated tables in stbl.
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

8 years agoMerge \"Revert \"Impose a size bound for dynamically allocated tables in stbl.\"...
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

8 years agoMerge "Revert "Impose a size bound for dynamically allocated tables in stbl."" into...
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

8 years agoRevert "Impose a size bound for dynamically allocated tables in stbl."
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

8 years agoMerge \"Impose a size bound for dynamically allocated tables in stbl.\" into klp-dev
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

8 years agoMerge "Impose a size bound for dynamically allocated tables in stbl." into klp-dev
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

8 years agoImpose a size bound for dynamically allocated tables in stbl.
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

8 years agoMerge \"DO NOT MERGE: Camera: Adjust pointers to ANW buffers to avoid infoleak\"...
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

8 years agoMerge "DO NOT MERGE: Camera: Adjust pointers to ANW buffers to avoid infoleak" into...
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

8 years agoMerge \"DO NOT MERGE omx: check buffer port before using\" into klp-dev
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

8 years agoCheck effect command reply size in AudioFlinger
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

8 years agoMerge "DO NOT MERGE omx: check buffer port before using" into klp-dev
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

8 years agoDO NOT MERGE: Camera: Adjust pointers to ANW buffers to avoid infoleak
Eino-Ville Talvala [Tue, 21 Jun 2016 00:00:14 +0000 (17:00 -0700)]
DO NOT MERGE: Camera: Adjust pointers to ANW buffers to avoid infoleak

Subtract address of a random static object from pointers being routed
through app process.

Bug: 28466701
Change-Id: Idcbfe81e9507433769672f3dc6d67db5eeed4e04

8 years agoDO NOT MERGE omx: check buffer port before using
Wonsik Kim [Wed, 25 May 2016 07:54:08 +0000 (16:54 +0900)]
DO NOT MERGE omx: check buffer port before using

Bug: 28816827
Change-Id: I3d5bad4a1ef96dec544b05bb31cc6f7109aae0a5

8 years agoCheck effect command reply size in AudioFlinger
Andy Hung [Mon, 20 Jun 2016 22:22:52 +0000 (15:22 -0700)]
Check effect command reply size in AudioFlinger

Bug: 29251553
Change-Id: I1bcc1281f1f0542bb645f6358ce31631f2a8ffbf

8 years agoMerge \"DO NOT MERGE SoftAAC2: fix crash on all-zero adts buffer\" into klp-dev
Marco Nelissen [Fri, 10 Jun 2016 23:12:17 +0000 (23:12 +0000)]
Merge \"DO NOT MERGE SoftAAC2: fix crash on all-zero adts buffer\" into klp-dev
am: dc7357d201

Change-Id: Ib491eb596eca7011d82bf91338d6d56f1275222c

8 years agoMerge "DO NOT MERGE SoftAAC2: fix crash on all-zero adts buffer" into klp-dev
Marco Nelissen [Fri, 10 Jun 2016 23:02:40 +0000 (23:02 +0000)]
Merge "DO NOT MERGE SoftAAC2: fix crash on all-zero adts buffer" into klp-dev

8 years agoMerge \"Don\'t use sp<>&\" into klp-dev
Marco Nelissen [Wed, 8 Jun 2016 23:11:32 +0000 (23:11 +0000)]
Merge \"Don\'t use sp<>&\" into klp-dev
am: 598f8d3218

Change-Id: I25294fc199e7242dbb2a9700303e713734bbb37d

8 years agoFix potential overflow
Marco Nelissen [Wed, 8 Jun 2016 23:11:31 +0000 (23:11 +0000)]
Fix potential overflow
am: d0090759e7

Change-Id: I261e67806c6e0e6b39cdce99883574024a266c13

8 years agoMerge "Don't use sp<>&" into klp-dev
Marco Nelissen [Wed, 8 Jun 2016 22:56:35 +0000 (22:56 +0000)]
Merge "Don't use sp<>&" into klp-dev

8 years agoDO NOT MERGE SoftAAC2: fix crash on all-zero adts buffer
Marco Nelissen [Wed, 8 Jun 2016 22:00:08 +0000 (15:00 -0700)]
DO NOT MERGE SoftAAC2: fix crash on all-zero adts buffer

Bug: 29153599
Change-Id: Ieb70a90cf31927165de7a840bfdd3ee2c76f4cbd

8 years agoFix potential overflow
Marco Nelissen [Tue, 7 Jun 2016 22:48:07 +0000 (15:48 -0700)]
Fix potential overflow

Bug: 28533562
Change-Id: I798ab24caa4c81f3ba564cad7c9ee019284fb702

8 years agoDon't use sp<>&
Marco Nelissen [Tue, 7 Jun 2016 19:26:43 +0000 (12:26 -0700)]
Don't use sp<>&

because they may end up pointing to NULL after a NULL check was performed.

Bug: 28166152
Change-Id: Iab2ea30395b620628cc6f3d067dd4f6fcda824fe

8 years agoDO NOT MERGE MPEG4Extractor: ensure kKeyTrackID exists before creating an MPEG4Source...
Wei Jia [Wed, 25 May 2016 18:29:43 +0000 (18:29 +0000)]
DO NOT MERGE MPEG4Extractor: ensure kKeyTrackID exists before creating an MPEG4Source as track.
am: b016207fc2

* commit 'b016207fc2442420e8d3a8633575ffe4fc29fef3':
  DO NOT MERGE MPEG4Extractor: ensure kKeyTrackID exists before creating an MPEG4Source as track.

Change-Id: I81cdae1a917cfcd712e800cf3edfd168b1c89c32

8 years agoDO NOT MERGE MPEG4Extractor: ensure kKeyTrackID exists before creating an MPEG4Source...
Wei Jia [Fri, 28 Aug 2015 17:35:35 +0000 (10:35 -0700)]
DO NOT MERGE MPEG4Extractor: ensure kKeyTrackID exists before creating an MPEG4Source as track.

GenericSource: return error when no track exists.

SampleIterator: make sure mSamplesPerChunk is not zero before using it as divisor.

Bug: 21657957
Bug: 23705695
Bug: 22802344
Bug: 28799341
Change-Id: I7664992ade90b935d3f255dcd43ecc2898f30b04
(cherry picked from commit 0386c91b8a910a134e5898ffa924c1b6c7560b13)

8 years agoMerge "DO NOT MERGE limit mediaserver memory" into klp-dev
Marco Nelissen [Mon, 23 May 2016 22:46:23 +0000 (22:46 +0000)]
Merge "DO NOT MERGE limit mediaserver memory" into klp-dev
am: f8429c0c14

* commit 'f8429c0c147b081ff6f06f55f8fa2f36fc60063e':
  DO NOT MERGE limit mediaserver memory

Change-Id: Ia88648ff82be88a90c98ded3061a6f04db74c03b

8 years agoMerge "DO NOT MERGE limit mediaserver memory" into klp-dev
Marco Nelissen [Mon, 23 May 2016 22:35:11 +0000 (22:35 +0000)]
Merge "DO NOT MERGE limit mediaserver memory" into klp-dev

8 years agoDO NOT MERGE limit mediaserver memory
Marco Nelissen [Fri, 13 May 2016 17:43:19 +0000 (10:43 -0700)]
DO NOT MERGE limit mediaserver memory

Limit mediaserver using rlimit, to prevent it from bringing down the system
via the low memory killer.
Default max is 65% of total RAM, but can be customized via system property.

Bug: 28471206
Bug: 28615448
Change-Id: I14fac1e12b5f3983be08a21bfbfc54feedbf3f16

8 years agoMerge "DO NOT MERGE Check malloc result to avoid NPD" into klp-dev
Marco Nelissen [Mon, 23 May 2016 14:37:29 +0000 (14:37 +0000)]
Merge "DO NOT MERGE Check malloc result to avoid NPD" into klp-dev
am: fddbb1a791

* commit 'fddbb1a791975adfa1323377b09606ad44122ff2':
  DO NOT MERGE Check malloc result to avoid NPD

Change-Id: Idf65c8e5520e1c2a4571ea434f0114ae13334e7b

8 years agoMerge "DO NOT MERGE Check malloc result to avoid NPD" into klp-dev
Marco Nelissen [Mon, 23 May 2016 14:32:45 +0000 (14:32 +0000)]
Merge "DO NOT MERGE Check malloc result to avoid NPD" into klp-dev

8 years agoMerge "Fix security vulnerability in libstagefright" into klp-dev
Jeff Tinker [Fri, 13 May 2016 21:14:44 +0000 (21:14 +0000)]
Merge "Fix security vulnerability in libstagefright" into klp-dev
am: eb37c37c59

* commit 'eb37c37c594604d0e6acbf14be6e04e065fab226':
  Fix security vulnerability in libstagefright

Change-Id: Icaecc46c13c06e6eff0167bbc1af4c580d161f62

8 years agoMerge "Fix security vulnerability in libstagefright" into klp-dev
Jeff Tinker [Fri, 13 May 2016 21:08:15 +0000 (21:08 +0000)]
Merge "Fix security vulnerability in libstagefright" into klp-dev

8 years agoDO NOT MERGE Check malloc result to avoid NPD
Marco Nelissen [Wed, 11 May 2016 18:11:20 +0000 (11:11 -0700)]
DO NOT MERGE Check malloc result to avoid NPD

Bug: 28471206
Change-Id: Id5d055d76893d6f53a2e524ff5f282d1ddca3345

8 years agoh264bsdActivateParamSets: Prevent multiplication overflow.
Pawin Vongmasa [Fri, 13 May 2016 19:43:42 +0000 (19:43 +0000)]
h264bsdActivateParamSets: Prevent multiplication overflow.
am: 87277aac64

* commit '87277aac64a21461b657298dcdcb809737347980':
  h264bsdActivateParamSets: Prevent multiplication overflow.

Change-Id: I87166daa0493721d44a10531466b59080b65f153

8 years agoFix security vulnerability in libstagefright
Jeff Tinker [Fri, 13 May 2016 18:48:11 +0000 (11:48 -0700)]
Fix security vulnerability in libstagefright

bug: 28175045
Change-Id: Icee6c7eb5b761da4aa3e412fb71825508d74d38f

8 years agoh264bsdActivateParamSets: Prevent multiplication overflow.
Pawin Vongmasa [Wed, 11 May 2016 23:08:21 +0000 (16:08 -0700)]
h264bsdActivateParamSets: Prevent multiplication overflow.

Report MEMORY_ALLOCATION_ERROR if pStorage->picSizeInMbs would
exceed UINT32_MAX bytes.

Bug: 28532266
Change-Id: Ia6f11efb18818afcdb5fa2a38a14f2a2d8c8447a

8 years agoMerge "Clear unused pointer field when sending across binder" into klp-dev
Marco Nelissen [Tue, 3 May 2016 23:20:38 +0000 (23:20 +0000)]
Merge "Clear unused pointer field when sending across binder" into klp-dev
am: 71095f174e

* commit '71095f174e8b88e008623b4cacd4ec0581b9015c':
  Clear unused pointer field when sending across binder

Change-Id: I5d6dee2901dca6c63ed41abf5d1165ac85a69d7e

8 years agoMerge "Clear unused pointer field when sending across binder" into klp-dev
Marco Nelissen [Tue, 3 May 2016 23:15:43 +0000 (23:15 +0000)]
Merge "Clear unused pointer field when sending across binder" into klp-dev

8 years agoClear unused pointer field when sending across binder
Marco Nelissen [Mon, 2 May 2016 21:12:34 +0000 (14:12 -0700)]
Clear unused pointer field when sending across binder

Bug: 28377502
Change-Id: Iad5ebfb0a9ef89f09755bb332579dbd3534f9c98

8 years agoMerge "DO NOT MERGE More OMX struct checking" into klp-dev
Marco Nelissen [Fri, 22 Apr 2016 18:12:58 +0000 (18:12 +0000)]
Merge "DO NOT MERGE More OMX struct checking" into klp-dev
am: c002126cb0

* commit 'c002126cb05b1d640c0a0b51bc0de810a62ab2b1':
  DO NOT MERGE More OMX struct checking

Change-Id: I206ad72ac3ed1da96b417dd9cbe170e0a0dd1d66

8 years agoMerge "DO NOT MERGE More OMX struct checking" into klp-dev
Marco Nelissen [Fri, 22 Apr 2016 17:45:56 +0000 (17:45 +0000)]
Merge "DO NOT MERGE More OMX struct checking" into klp-dev

8 years agoDO NOT MERGE More OMX struct checking
Marco Nelissen [Fri, 22 Apr 2016 14:54:04 +0000 (07:54 -0700)]
DO NOT MERGE More OMX struct checking

These were lost due to bad merges.

Bug: 27207275
Change-Id: Ia0f403d7aef79a8e0ac618eb49b34dbf9faa25c2

8 years agoSampleTable.cpp: Fixed a regression caused by a fix for bug 28076789.
Pawin Vongmasa [Thu, 21 Apr 2016 18:55:02 +0000 (18:55 +0000)]
SampleTable.cpp: Fixed a regression caused by a fix for bug 28076789.
am: 70dec4dc7d

* commit '70dec4dc7d1d813afaff58fb26b0fd7127e897bf':
  SampleTable.cpp: Fixed a regression caused by a fix for bug 28076789.

Change-Id: Ie3a265ed0dc34c544b0793dce06434ec64f9bacf

8 years agoSampleTable.cpp: Fixed a regression caused by a fix for bug
Pawin Vongmasa [Wed, 20 Apr 2016 22:51:48 +0000 (15:51 -0700)]
SampleTable.cpp: Fixed a regression caused by a fix for bug
28076789.

Detail: Before the original fix
(Id207f369ab7b27787d83f5d8fc48dc53ed9fcdc9) for 28076789, the
code allowed a time-to-sample table size to be 0. The change
made in that fix disallowed such situation, which in fact should
be allowed. This current patch allows it again while maintaining
the security of the previous fix.

Bug: 28288202
Bug: 28076789
Change-Id: I1c9a60c7f0cfcbd3d908f24998dde15d5136a295

8 years agoMerge "DO NOT MERGE codecs: check OMX buffer size before use in (gsm|g711)dec" into...
Wonsik Kim [Mon, 18 Apr 2016 04:52:07 +0000 (04:52 +0000)]
Merge "DO NOT MERGE codecs: check OMX buffer size before use in (gsm|g711)dec" into klp-dev
am: 7cab953

* commit '7cab953629b615cfe5fec8f56266996bc17307b5':
  DO NOT MERGE codecs: check OMX buffer size before use in (gsm|g711)dec

Change-Id: Icbd07fb9f62bb4f1381f6573188d32c8f126dc90

8 years agoMerge "DO NOT MERGE codecs: check OMX buffer size before use in (gsm|g711)dec" into...
Wonsik Kim [Mon, 18 Apr 2016 04:39:54 +0000 (04:39 +0000)]
Merge "DO NOT MERGE codecs: check OMX buffer size before use in (gsm|g711)dec" into klp-dev

8 years agoMerge "SampleTable.cpp: Prevent corrupted stts block from causing excessive memory...
Pawin Vongmasa [Sat, 16 Apr 2016 00:06:36 +0000 (00:06 +0000)]
Merge "SampleTable.cpp: Prevent corrupted stts block from causing excessive memory allocation." into klp-dev
am: 5964527

* commit '59645279f48b3ae83ab42445148ea236c5dc72c4':
  SampleTable.cpp: Prevent corrupted stts block from causing excessive memory allocation.

Change-Id: I37ea7cd16f1e0fcf2ce14d6687de080a7c0931c1

8 years agoMerge "SampleTable.cpp: Prevent corrupted stts block from causing excessive memory...
Pawin Vongmasa [Sat, 16 Apr 2016 00:01:22 +0000 (00:01 +0000)]
Merge "SampleTable.cpp: Prevent corrupted stts block from causing excessive memory allocation." into klp-dev

8 years agoSampleTable.cpp: Prevent corrupted stts block from causing
Pawin Vongmasa [Wed, 13 Apr 2016 23:25:12 +0000 (16:25 -0700)]
SampleTable.cpp: Prevent corrupted stts block from causing
excessive memory allocation.

Details:

DataSource.h
- Added function getVector() for reading from a data source into
  a Vector object, whose capacity grows only as much as needed
  (in case of EOS or reading error).
SampleTable.h
- Changed the type of mTimeToSample from uint32_t* to
  Vector<uint32_t>.
SampleTable.cpp
- In setTimeToSample, modified the code to use getVector()
  instead of readAt(). If the input source has a corrupt
  time-to-sample table size that is too big, EOS will be reached
  before the whole table is read, and the return value from
  getVector() will be false.
- Also, tightened the bound for the provided time-to-sample table
  size to guarantee that the table does not take more than
  UINT_MAX32 bytes in memory.

Bug: 28076789
Change-Id: Id207f369ab7b27787d83f5d8fc48dc53ed9fcdc9

8 years agoh264dec: check for overflows when calculating allocation size.
Marco Nelissen [Wed, 13 Apr 2016 22:17:37 +0000 (22:17 +0000)]
h264dec: check for overflows when calculating allocation size.
am: a3dd713

* commit 'a3dd713893658baf50df88b261aba83bb0c40687':
  h264dec: check for overflows when calculating allocation size.

Change-Id: Ie1acdd0ddaddce72f9072abf288db29ab3d75fc1

8 years agoh264dec: check for overflows when calculating allocation size.
Marco Nelissen [Fri, 8 Apr 2016 17:04:48 +0000 (10:04 -0700)]
h264dec: check for overflows when calculating allocation size.

Bug: 27855419
Change-Id: Idabedca52913ec31ea5cb6a6109ab94e3fb2badd

8 years agoMerge "DO NOT MERGE codecs: check OMX buffer size before use in vorbisdec" into klp-dev
Wonsik Kim [Fri, 8 Apr 2016 01:13:27 +0000 (01:13 +0000)]
Merge "DO NOT MERGE codecs: check OMX buffer size before use in vorbisdec" into klp-dev
am: 52636f8

* commit '52636f8462b2a24f77524ca912e3579c33ac113e':
  DO NOT MERGE codecs: check OMX buffer size before use in vorbisdec

Change-Id: I63431cdcbe2903ca51b43ce4cddc13a0c62f6bae

8 years agoMerge "DO NOT MERGE codecs: check OMX buffer size before use in (h263|h264)dec" into...
Wonsik Kim [Fri, 8 Apr 2016 01:13:26 +0000 (01:13 +0000)]
Merge "DO NOT MERGE codecs: check OMX buffer size before use in (h263|h264)dec" into klp-dev
am: f81eab3

* commit 'f81eab31874a6cf40e1f265b0c47cbe6b137d407':
  DO NOT MERGE codecs: check OMX buffer size before use in (h263|h264)dec

Change-Id: Ie9c95c1847cc3e2a1a9ef3aeafbeb0aedf262a42

8 years agoMerge "DO NOT MERGE codecs: check OMX buffer size before use in vorbisdec" into klp-dev
Wonsik Kim [Fri, 8 Apr 2016 01:05:03 +0000 (01:05 +0000)]
Merge "DO NOT MERGE codecs: check OMX buffer size before use in vorbisdec" into klp-dev

8 years agoMerge "DO NOT MERGE codecs: check OMX buffer size before use in (h263|h264)dec" into...
Wonsik Kim [Fri, 8 Apr 2016 01:03:55 +0000 (01:03 +0000)]
Merge "DO NOT MERGE codecs: check OMX buffer size before use in (h263|h264)dec" into klp-dev

8 years agoDO NOT MERGE codecs: check OMX buffer size before use in (gsm|g711)dec
Wonsik Kim [Thu, 7 Apr 2016 08:45:02 +0000 (17:45 +0900)]
DO NOT MERGE codecs: check OMX buffer size before use in (gsm|g711)dec

Bug: 27793163
Bug: 27793367
Change-Id: Iec3de8a237ee2379d87a8371c13e543878c6652c

8 years agoMerge "Check mp3 output buffer size" into klp-dev
Marco Nelissen [Thu, 7 Apr 2016 21:30:22 +0000 (21:30 +0000)]
Merge "Check mp3 output buffer size" into klp-dev
am: bc736f6

* commit 'bc736f650daeacce241c1f1e9c1b3ac28b5befe1':
  Check mp3 output buffer size

Change-Id: Iecf266fb05e72b245db1acf3bdc380c771ccabf8

8 years agoMerge "Check mp3 output buffer size" into klp-dev
Marco Nelissen [Thu, 7 Apr 2016 21:24:52 +0000 (21:24 +0000)]
Merge "Check mp3 output buffer size" into klp-dev

8 years agoAudioSource: initialize variables
Marco Nelissen [Thu, 7 Apr 2016 20:28:42 +0000 (20:28 +0000)]
AudioSource: initialize variables
am: a2f5b80

* commit 'a2f5b80a54ac3cd0f7dcfbb4d87eaf2f5ab99557':
  AudioSource: initialize variables

Change-Id: I8038fc4d98c868070139d8d26832cbc32af7144a

8 years agoAudioSource: initialize variables
Marco Nelissen [Tue, 5 Apr 2016 21:20:11 +0000 (14:20 -0700)]
AudioSource: initialize variables

to prevent info leak

Bug: 27855172
Change-Id: I3d33e0a9cc5cf8a758d7b0794590b09c43a24561

8 years agoCheck mp3 output buffer size
Marco Nelissen [Wed, 23 Mar 2016 22:36:36 +0000 (15:36 -0700)]
Check mp3 output buffer size

Bug: 27793371
Change-Id: I0fe40a4cfd0a5b488f93d3f3ba6f9495235926ac

8 years agoDO NOT MERGE codecs: check OMX buffer size before use in (h263|h264)dec
Wonsik Kim [Sun, 20 Mar 2016 01:44:44 +0000 (10:44 +0900)]
DO NOT MERGE codecs: check OMX buffer size before use in (h263|h264)dec

Bug: 27833616
Change-Id: I0fd599b3da431425d89236ffdd9df423c11947c0

8 years agoDO NOT MERGE codecs: check OMX buffer size before use in vorbisdec
Wonsik Kim [Wed, 30 Mar 2016 08:13:00 +0000 (17:13 +0900)]
DO NOT MERGE codecs: check OMX buffer size before use in vorbisdec

Bug: 27833616
Change-Id: I1ccdd16a00741da072527a6d13e87fd7c7fe8c54

8 years agoMerge "SampleTable: reduce unnecessary logging message." into klp-dev
Wei Jia [Fri, 25 Mar 2016 21:22:40 +0000 (21:22 +0000)]
Merge "SampleTable: reduce unnecessary logging message." into klp-dev

8 years agoFix AMR decoder
Marco Nelissen [Fri, 25 Mar 2016 15:26:18 +0000 (08:26 -0700)]
Fix AMR decoder

Previous change caused EOS to be ignored.

Bug: 27843673
Related-to-bug: 27662364
Change-Id: Ia148a88abc861a9b393f42bc7cd63d8d3ae349bc

8 years agoSampleTable: reduce unnecessary logging message.
Wei Jia [Thu, 24 Mar 2016 17:58:04 +0000 (10:58 -0700)]
SampleTable: reduce unnecessary logging message.

Bug: 23247055
Change-Id: Ida0021160532623c6e72bd5bb0bb2a24332d1c34

8 years agoSampleTable: add logging.
Wei Jia [Thu, 24 Mar 2016 16:41:24 +0000 (09:41 -0700)]
SampleTable: add logging.

Bug: 23247055
Change-Id: Id45f9815c1b3cdfaae664508204a6ce1c1da4532

8 years agoMerge "DO NOT MERGE codecs: check OMX buffer size before use in VP8 encoder." into...
Wonsik Kim [Tue, 22 Mar 2016 22:31:01 +0000 (22:31 +0000)]
Merge "DO NOT MERGE codecs: check OMX buffer size before use in VP8 encoder." into klp-dev

8 years agoMerge "NuPlayerStreamListener: NULL and bounds check before memcpy" into klp-dev
Marco Nelissen [Tue, 22 Mar 2016 20:43:54 +0000 (20:43 +0000)]
Merge "NuPlayerStreamListener: NULL and bounds check before memcpy" into klp-dev

8 years agoSoftAMR: check input buffer size to avoid overflow.
Wei Jia [Sat, 19 Mar 2016 01:17:14 +0000 (18:17 -0700)]
SoftAMR: check input buffer size to avoid overflow.

Bug: 27662364
Change-Id: I47380545ea7d85845e141e722b0d84f498d27145

8 years agoSoftAMR: check output buffer size to avoid overflow.
Wei Jia [Thu, 17 Mar 2016 18:15:02 +0000 (11:15 -0700)]
SoftAMR: check output buffer size to avoid overflow.

Bug: 27662364
Change-Id: I7b26892c41d6f2e690e77478ab855c2fed1ff6b0

8 years agoDO NOT MERGE codecs: check OMX buffer size before use in VP8 encoder.
Wonsik Kim [Sun, 20 Mar 2016 01:44:44 +0000 (10:44 +0900)]
DO NOT MERGE codecs: check OMX buffer size before use in VP8 encoder.

Bug: 27569635
Change-Id: I469573f40e21dc9f4c200749d4f220e3a2d31761

8 years agoMerge "Camera3Device: Validate template ID" into klp-dev
Chien-Yu Chen [Mon, 21 Mar 2016 18:15:07 +0000 (18:15 +0000)]
Merge "Camera3Device: Validate template ID" into klp-dev

8 years agoNuPlayerStreamListener: NULL and bounds check before memcpy
Robert Shih [Fri, 18 Mar 2016 21:34:57 +0000 (14:34 -0700)]
NuPlayerStreamListener: NULL and bounds check before memcpy

Bug: 27533704
Change-Id: I992a7709b92b1cbc3114c97bec48a3fc5b22ba6e