OSDN Git Service

android-x86/frameworks-av.git
8 years agoam 492bba08: am d18bb120: am 09f71c56: am dedaca6f: Limit allocations to avoid out...
Marco Nelissen [Sun, 23 Aug 2015 19:27:02 +0000 (19:27 +0000)]
am 492bba08: am d18bb120: am 09f71c56: am dedaca6f: Limit allocations to avoid out-of-memory

* commit '492bba08202a601e96a13b26422c85b3fb1a5ee0':
  Limit allocations to avoid out-of-memory

8 years agoam d18bb120: am 09f71c56: am dedaca6f: Limit allocations to avoid out-of-memory
Marco Nelissen [Sun, 23 Aug 2015 19:19:24 +0000 (19:19 +0000)]
am d18bb120: am 09f71c56: am dedaca6f: Limit allocations to avoid out-of-memory

* commit 'd18bb120442fcc04efe269e6a26f83265eea40c8':
  Limit allocations to avoid out-of-memory

8 years agoam 09f71c56: am dedaca6f: Limit allocations to avoid out-of-memory
Marco Nelissen [Sun, 23 Aug 2015 19:15:02 +0000 (19:15 +0000)]
am 09f71c56: am dedaca6f: Limit allocations to avoid out-of-memory

* commit '09f71c5621799e0f030b4a8058d2fb4df5977de0':
  Limit allocations to avoid out-of-memory

8 years agoam dedaca6f: Limit allocations to avoid out-of-memory
Marco Nelissen [Sun, 23 Aug 2015 19:08:25 +0000 (19:08 +0000)]
am dedaca6f: Limit allocations to avoid out-of-memory

* commit 'dedaca6f04ac9f95fabe3b64d44cd1a2050f079e':
  Limit allocations to avoid out-of-memory

8 years agoLimit allocations to avoid out-of-memory
Marco Nelissen [Thu, 4 Jun 2015 18:01:15 +0000 (11:01 -0700)]
Limit allocations to avoid out-of-memory

Corrupt files could cause very large allocations, limit them to something
more reasonable.

Bug: 17769851
Change-Id: Ib0f722fd6fddff873bd7a547aac456e608c34c84

8 years agoam 4c6556d1: am 8cf3564d: am eecc406f: am 3b42241a: Merge "Prevent integer issues...
Robert Shih [Sat, 22 Aug 2015 01:33:50 +0000 (01:33 +0000)]
am 4c6556d1: am 8cf3564d: am eecc406f: am 3b42241a: Merge "Prevent integer issues in ID3::Iterator::findFrame" into klp-dev

* commit '4c6556d17f4073ed0b4d11abf42df9c32c339291':
  Prevent integer issues in ID3::Iterator::findFrame

8 years agoam 8cf3564d: am eecc406f: am 3b42241a: Merge "Prevent integer issues in ID3::Iterator...
Robert Shih [Sat, 22 Aug 2015 01:25:05 +0000 (01:25 +0000)]
am 8cf3564d: am eecc406f: am 3b42241a: Merge "Prevent integer issues in ID3::Iterator::findFrame" into klp-dev

* commit '8cf3564d2dd522f7a707a8fd109d415dab3def47':
  Prevent integer issues in ID3::Iterator::findFrame

8 years agoam eecc406f: am 3b42241a: Merge "Prevent integer issues in ID3::Iterator::findFrame...
Robert Shih [Sat, 22 Aug 2015 01:18:32 +0000 (01:18 +0000)]
am eecc406f: am 3b42241a: Merge "Prevent integer issues in ID3::Iterator::findFrame" into klp-dev

* commit 'eecc406f462ef2b3a73cd6bf3c05f7cb45382276':
  Prevent integer issues in ID3::Iterator::findFrame

8 years agoam 3b42241a: Merge "Prevent integer issues in ID3::Iterator::findFrame" into klp-dev
Robert Shih [Sat, 22 Aug 2015 01:08:44 +0000 (01:08 +0000)]
am 3b42241a: Merge "Prevent integer issues in ID3::Iterator::findFrame" into klp-dev

* commit '3b42241aab5855964d1bd60268ae21c2d9cc6065':
  Prevent integer issues in ID3::Iterator::findFrame

8 years agoMerge "Prevent integer issues in ID3::Iterator::findFrame" into klp-dev
Robert Shih [Sat, 22 Aug 2015 00:54:32 +0000 (00:54 +0000)]
Merge "Prevent integer issues in ID3::Iterator::findFrame" into klp-dev

8 years agoPrevent integer issues in ID3::Iterator::findFrame
Joshua J. Drake [Sat, 15 Aug 2015 13:17:03 +0000 (08:17 -0500)]
Prevent integer issues in ID3::Iterator::findFrame

Integer overflows could occur a few places within findFrame. These can lead to
out-of-bounds reads and potentially infinite loops. Ensure that arithmetic does
not wrap around to prevent these behaviors.

Bug: 23285192
Change-Id: I72a61df7d5719d1d3f2bd0b37fba86f0f4bbedee

8 years agoam 323d22e7: am 8319fadb: am f814f84e: (-s ours) am d8816a13: DO NOT MERGE libstagefr...
Wei Jia [Fri, 21 Aug 2015 20:17:09 +0000 (20:17 +0000)]
am 323d22e7: am 8319fadb: am f814f84e: (-s ours) am d8816a13: DO NOT MERGE libstagefright: Fix crash in convertMetaDataToMessage

* commit '323d22e76e2d96306c5f67edb07bb4c2eef14188':
  DO NOT MERGE libstagefright: Fix crash in convertMetaDataToMessage

8 years agoam 8319fadb: am f814f84e: (-s ours) am d8816a13: DO NOT MERGE libstagefright: Fix...
Wei Jia [Fri, 21 Aug 2015 20:11:02 +0000 (20:11 +0000)]
am 8319fadb: am f814f84e: (-s ours) am d8816a13: DO NOT MERGE libstagefright: Fix crash in convertMetaDataToMessage

* commit '8319fadb99f5d862ed68d44a587b6f1fac2e0d2d':
  DO NOT MERGE libstagefright: Fix crash in convertMetaDataToMessage

8 years agoam f814f84e: (-s ours) am d8816a13: DO NOT MERGE libstagefright: Fix crash in convert...
Wei Jia [Fri, 21 Aug 2015 20:03:06 +0000 (20:03 +0000)]
am f814f84e: (-s ours) am d8816a13: DO NOT MERGE libstagefright: Fix crash in convertMetaDataToMessage

* commit 'f814f84e09191af23bbf8d307f02704e20cc887c':
  DO NOT MERGE libstagefright: Fix crash in convertMetaDataToMessage

8 years agoam d8816a13: DO NOT MERGE libstagefright: Fix crash in convertMetaDataToMessage
Wei Jia [Fri, 21 Aug 2015 19:57:30 +0000 (19:57 +0000)]
am d8816a13: DO NOT MERGE libstagefright: Fix crash in convertMetaDataToMessage

* commit 'd8816a13dbcafd5d61d26a8a6b2e892452bca1a7':
  DO NOT MERGE libstagefright: Fix crash in convertMetaDataToMessage

8 years agoDO NOT MERGE libstagefright: Fix crash in convertMetaDataToMessage
Wei Jia [Thu, 25 Jun 2015 18:46:54 +0000 (11:46 -0700)]
DO NOT MERGE libstagefright: Fix crash in convertMetaDataToMessage

- The ABuffer used for the Message has a preset value of 1024, if
  flattening the meta data exceeds this value, a check fails hence
  the crash.
- This change creates a new ABuffer if the buffer size would exceed
  the buffer capacity.

Bug: 22771132

CRs-Fixed: 857850

(cherry picked from commit 4bce636865bdf0e2a79fc9a5d9a69107649c850d)

Change-Id: Ia0a963e9872f646791e75b710ff9e227a66af4f9

8 years agoam 21b14554: am e4a9d859: am ca095ac2: (-s ours) am 8de6d690: Fix build break DO...
Jeff Tinker [Fri, 21 Aug 2015 19:13:44 +0000 (19:13 +0000)]
am 21b14554: am e4a9d859: am ca095ac2: (-s ours) am 8de6d690: Fix build break DO NOT MERGE

* commit '21b14554c2c74ff81a381de3ddf893d8ea411161':
  Fix build break DO NOT MERGE

8 years agoam e4a9d859: am ca095ac2: (-s ours) am 8de6d690: Fix build break DO NOT MERGE
Jeff Tinker [Fri, 21 Aug 2015 19:05:58 +0000 (19:05 +0000)]
am e4a9d859: am ca095ac2: (-s ours) am 8de6d690: Fix build break DO NOT MERGE

* commit 'e4a9d859e10930f187fc037e0a1cc8d1eb5c21c5':
  Fix build break DO NOT MERGE

8 years agoam ca095ac2: (-s ours) am 8de6d690: Fix build break DO NOT MERGE
Jeff Tinker [Fri, 21 Aug 2015 18:59:11 +0000 (18:59 +0000)]
am ca095ac2: (-s ours) am 8de6d690: Fix build break DO NOT MERGE

* commit 'ca095ac251ad02ad745d763f37ec3fcc5a8aa2ea':
  Fix build break DO NOT MERGE

8 years agoam 8de6d690: Fix build break DO NOT MERGE
Jeff Tinker [Fri, 21 Aug 2015 18:51:27 +0000 (18:51 +0000)]
am 8de6d690: Fix build break DO NOT MERGE

* commit '8de6d690ae5843bd8e005deedea571596f79bbd3':
  Fix build break DO NOT MERGE

8 years agoFix build break DO NOT MERGE
Jeff Tinker [Fri, 21 Aug 2015 16:58:12 +0000 (09:58 -0700)]
Fix build break DO NOT MERGE

related-to-bug: 23223325

Change-Id: I7b09712b5f18912abddd50b75f6edaf860e894c1

9 years agoam 9c9f8620: am f8bf4acb: am fd1d6df5: (-s ours) am c2153d0d: DO NOT MERGE Part of...
Jeff Tinker [Fri, 21 Aug 2015 16:40:45 +0000 (16:40 +0000)]
am 9c9f8620: am f8bf4acb: am fd1d6df5: (-s ours) am c2153d0d: DO NOT MERGE Part of fix for libmedia OOB write anywhere

* commit '9c9f862065c736bafdb9fc35dc126a59083d58b2':
  DO NOT MERGE Part of fix for libmedia OOB write anywhere

9 years agoam f8bf4acb: am fd1d6df5: (-s ours) am c2153d0d: DO NOT MERGE Part of fix for libmedi...
Jeff Tinker [Fri, 21 Aug 2015 16:36:44 +0000 (16:36 +0000)]
am f8bf4acb: am fd1d6df5: (-s ours) am c2153d0d: DO NOT MERGE Part of fix for libmedia OOB write anywhere

* commit 'f8bf4acb505d8058e75b8b6f19738ee2c9a4322e':
  DO NOT MERGE Part of fix for libmedia OOB write anywhere

9 years agoam fd1d6df5: (-s ours) am c2153d0d: DO NOT MERGE Part of fix for libmedia OOB write...
Jeff Tinker [Fri, 21 Aug 2015 16:27:33 +0000 (16:27 +0000)]
am fd1d6df5: (-s ours) am c2153d0d: DO NOT MERGE Part of fix for libmedia OOB write anywhere

* commit 'fd1d6df52f4c33f59d44abdbcdd0ec5b9a20f059':
  DO NOT MERGE Part of fix for libmedia OOB write anywhere

9 years agoam c2153d0d: DO NOT MERGE Part of fix for libmedia OOB write anywhere
Jeff Tinker [Fri, 21 Aug 2015 15:36:21 +0000 (15:36 +0000)]
am c2153d0d: DO NOT MERGE Part of fix for libmedia OOB write anywhere

* commit 'c2153d0dc800d0718788dccd0f2a2d29f4647c03':
  DO NOT MERGE Part of fix for libmedia OOB write anywhere

9 years agoam e93a33a8: am 8cc71bc8: Merge "DO NOT MERGE Part of fix for libmedia OOB write...
Abhishek Arya [Fri, 21 Aug 2015 15:34:50 +0000 (15:34 +0000)]
am e93a33a8: am 8cc71bc8: Merge "DO NOT MERGE Part of fix for libmedia OOB write anywhere" into lmp-dev

* commit 'e93a33a8f2706d3918634d17c33491f69060a62c':
  DO NOT MERGE Part of fix for libmedia OOB write anywhere

9 years agoam 8cc71bc8: Merge "DO NOT MERGE Part of fix for libmedia OOB write anywhere" into...
Abhishek Arya [Fri, 21 Aug 2015 15:28:55 +0000 (15:28 +0000)]
am 8cc71bc8: Merge "DO NOT MERGE Part of fix for libmedia OOB write anywhere" into lmp-dev

* commit '8cc71bc8f32ba85fc7e2b9dac0d7450147a4f3db':
  DO NOT MERGE Part of fix for libmedia OOB write anywhere

9 years agoMerge "DO NOT MERGE Part of fix for libmedia OOB write anywhere" into lmp-dev
Abhishek Arya [Fri, 21 Aug 2015 15:22:37 +0000 (15:22 +0000)]
Merge "DO NOT MERGE Part of fix for libmedia OOB write anywhere" into lmp-dev

9 years agoDO NOT MERGE Part of fix for libmedia OOB write anywhere
Jeff Tinker [Tue, 18 Aug 2015 00:57:47 +0000 (17:57 -0700)]
DO NOT MERGE Part of fix for libmedia OOB write anywhere

Clarify that decrypt destination is not a pointer for
secure case.

b/23223325

Change-Id: I642dcf790a9eb9e32175f3e0d8f040c82228e3ac
(cherry picked from commit ed555d70d80964f40563d89a4e6d6a80f83f4b89)

9 years agoam e534b0e8: am 00880781: am f839b2a3: (-s ours) am 5aa887ef: am 59bfb7aa: (-s ours...
Marco Nelissen [Thu, 20 Aug 2015 20:56:36 +0000 (20:56 +0000)]
am e534b0e8: am 00880781: am f839b2a3: (-s ours) am 5aa887ef: am 59bfb7aa: (-s ours) am 18a8124f: am da0a48d2: (-s ours) am 6020f066: am b294a97a: am 6cba5819: am 51bfaf6c: am 1afea551: am ce73af07: DO NOT MERGE Fail more gracefully on allocation failure

* commit 'e534b0e898e4a97f392b4132c8c6a571f2bdcb6f':
  DO NOT MERGE Fail more gracefully on allocation failure

9 years agoam 00880781: am f839b2a3: (-s ours) am 5aa887ef: am 59bfb7aa: (-s ours) am 18a8124f...
Marco Nelissen [Thu, 20 Aug 2015 20:47:41 +0000 (20:47 +0000)]
am 00880781: am f839b2a3: (-s ours) am 5aa887ef: am 59bfb7aa: (-s ours) am 18a8124f: am da0a48d2: (-s ours) am 6020f066: am b294a97a: am 6cba5819: am 51bfaf6c: am 1afea551: am ce73af07: DO NOT MERGE Fail more gracefully on allocation failure

* commit '008807813e8fd703f89bf84c8f2c725bb19a434f':
  DO NOT MERGE Fail more gracefully on allocation failure

9 years agoam f839b2a3: (-s ours) am 5aa887ef: am 59bfb7aa: (-s ours) am 18a8124f: am da0a48d2...
Marco Nelissen [Thu, 20 Aug 2015 20:39:14 +0000 (20:39 +0000)]
am f839b2a3: (-s ours) am 5aa887ef: am 59bfb7aa: (-s ours) am 18a8124f: am da0a48d2: (-s ours) am 6020f066: am b294a97a: am 6cba5819: am 51bfaf6c: am 1afea551: am ce73af07: DO NOT MERGE Fail more gracefully on allocation failure

* commit 'f839b2a33c46f3520684f0a839760cca36a6b4c7':
  DO NOT MERGE Fail more gracefully on allocation failure

9 years agoam 5aa887ef: am 59bfb7aa: (-s ours) am 18a8124f: am da0a48d2: (-s ours) am 6020f066...
Marco Nelissen [Thu, 20 Aug 2015 20:30:04 +0000 (20:30 +0000)]
am 5aa887ef: am 59bfb7aa: (-s ours) am 18a8124f: am da0a48d2: (-s ours) am 6020f066: am b294a97a: am 6cba5819: am 51bfaf6c: am 1afea551: am ce73af07: DO NOT MERGE Fail more gracefully on allocation failure

* commit '5aa887ef44238e9a727564fe9051933f8b42e399':
  DO NOT MERGE Fail more gracefully on allocation failure

9 years agoam 59bfb7aa: (-s ours) am 18a8124f: am da0a48d2: (-s ours) am 6020f066: am b294a97a...
Marco Nelissen [Thu, 20 Aug 2015 20:17:34 +0000 (20:17 +0000)]
am 59bfb7aa: (-s ours) am 18a8124f: am da0a48d2: (-s ours) am 6020f066: am b294a97a: am 6cba5819: am 51bfaf6c: am 1afea551: am ce73af07: DO NOT MERGE Fail more gracefully on allocation failure

* commit '59bfb7aa42ce2404da2547e7852e1a1215c6af22':
  DO NOT MERGE Fail more gracefully on allocation failure

9 years agoDO NOT MERGE Part of fix for libmedia OOB write anywhere
Jeff Tinker [Tue, 18 Aug 2015 00:57:47 +0000 (17:57 -0700)]
DO NOT MERGE Part of fix for libmedia OOB write anywhere

Clarify that decrypt destination is not a pointer for
secure case.

b/23223325

Change-Id: I642dcf790a9eb9e32175f3e0d8f040c82228e3ac
(cherry picked from commit ed555d70d80964f40563d89a4e6d6a80f83f4b89)

9 years agoam 18a8124f: am da0a48d2: (-s ours) am 6020f066: am b294a97a: am 6cba5819: am 51bfaf6...
Marco Nelissen [Thu, 20 Aug 2015 20:11:03 +0000 (20:11 +0000)]
am 18a8124f: am da0a48d2: (-s ours) am 6020f066: am b294a97a: am 6cba5819: am 51bfaf6c: am 1afea551: am ce73af07: DO NOT MERGE Fail more gracefully on allocation failure

* commit '18a8124f582e9d763670e3bcc6ef6b2b00c4d394':
  DO NOT MERGE Fail more gracefully on allocation failure

9 years agoam da0a48d2: (-s ours) am 6020f066: am b294a97a: am 6cba5819: am 51bfaf6c: am 1afea55...
Marco Nelissen [Thu, 20 Aug 2015 19:53:55 +0000 (19:53 +0000)]
am da0a48d2: (-s ours) am 6020f066: am b294a97a: am 6cba5819: am 51bfaf6c: am 1afea551: am ce73af07: DO NOT MERGE Fail more gracefully on allocation failure

* commit 'da0a48d2704b231f13dbdb28cc4c4d12b08e3faf':
  DO NOT MERGE Fail more gracefully on allocation failure

9 years agoam 6020f066: am b294a97a: am 6cba5819: am 51bfaf6c: am 1afea551: am ce73af07: DO...
Marco Nelissen [Thu, 20 Aug 2015 19:46:41 +0000 (19:46 +0000)]
am 6020f066: am b294a97a: am 6cba5819: am 51bfaf6c: am 1afea551: am ce73af07: DO NOT MERGE Fail more gracefully on allocation failure

* commit '6020f06633f8cac09f47e561cc389c5b9b152464':
  DO NOT MERGE Fail more gracefully on allocation failure

9 years agoam b294a97a: am 6cba5819: am 51bfaf6c: am 1afea551: am ce73af07: DO NOT MERGE Fail...
Marco Nelissen [Thu, 20 Aug 2015 19:41:14 +0000 (19:41 +0000)]
am b294a97a: am 6cba5819: am 51bfaf6c: am 1afea551: am ce73af07: DO NOT MERGE Fail more gracefully on allocation failure

* commit 'b294a97a6fed15d379ce11084166780e7d9dd883':
  DO NOT MERGE Fail more gracefully on allocation failure

9 years agoam 6cba5819: am 51bfaf6c: am 1afea551: am ce73af07: DO NOT MERGE Fail more gracefully...
Marco Nelissen [Thu, 20 Aug 2015 19:32:06 +0000 (19:32 +0000)]
am 6cba5819: am 51bfaf6c: am 1afea551: am ce73af07: DO NOT MERGE Fail more gracefully on allocation failure

* commit '6cba5819ab84cc58a8273428dcf9ae98c0c9bc42':
  DO NOT MERGE Fail more gracefully on allocation failure

9 years agoam 51bfaf6c: am 1afea551: am ce73af07: DO NOT MERGE Fail more gracefully on allocatio...
Marco Nelissen [Thu, 20 Aug 2015 19:25:42 +0000 (19:25 +0000)]
am 51bfaf6c: am 1afea551: am ce73af07: DO NOT MERGE Fail more gracefully on allocation failure

* commit '51bfaf6cf74498f92cd400e4d5b3d55b04fc7a06':
  DO NOT MERGE Fail more gracefully on allocation failure

9 years agoam 1afea551: am ce73af07: DO NOT MERGE Fail more gracefully on allocation failure
Marco Nelissen [Thu, 20 Aug 2015 19:18:30 +0000 (19:18 +0000)]
am 1afea551: am ce73af07: DO NOT MERGE Fail more gracefully on allocation failure

* commit '1afea5517477554f452396c29db375e34d108f89':
  DO NOT MERGE Fail more gracefully on allocation failure

9 years agoam ce73af07: DO NOT MERGE Fail more gracefully on allocation failure
Marco Nelissen [Thu, 20 Aug 2015 19:12:29 +0000 (19:12 +0000)]
am ce73af07: DO NOT MERGE Fail more gracefully on allocation failure

* commit 'ce73af077199122e0e5a80b019f949d0f181410f':
  DO NOT MERGE Fail more gracefully on allocation failure

9 years agoam a3cc3272: am d4f0d88e: resolved conflicts for merge of eb10ccbc to lmp-dev
Marco Nelissen [Thu, 20 Aug 2015 19:09:38 +0000 (19:09 +0000)]
am a3cc3272: am d4f0d88e: resolved conflicts for merge of eb10ccbc to lmp-dev

* commit 'a3cc32723905e35be68594843464f6fcceb7ee73':
  Fail more gracefully on allocation failure

9 years agoam d4f0d88e: resolved conflicts for merge of eb10ccbc to lmp-dev
Marco Nelissen [Thu, 20 Aug 2015 19:01:36 +0000 (19:01 +0000)]
am d4f0d88e: resolved conflicts for merge of eb10ccbc to lmp-dev

* commit 'd4f0d88e701f5323621bd352cf4cbcd14bc349c4':
  Fail more gracefully on allocation failure

9 years agoresolved conflicts for merge of eb10ccbc to lmp-dev
Marco Nelissen [Thu, 20 Aug 2015 18:45:19 +0000 (11:45 -0700)]
resolved conflicts for merge of eb10ccbc to lmp-dev

Change-Id: I1d3220bcfe53ab6ad9dba87ef8e41b52f3bb1f30

9 years agoresolved conflicts for merge of 8a064aa8 to klp-modular-dev
Marco Nelissen [Thu, 20 Aug 2015 18:29:58 +0000 (11:29 -0700)]
resolved conflicts for merge of 8a064aa8 to klp-modular-dev

Change-Id: If031955c9edca657401831fbfa5a128f0b4c6d86

9 years agoam b8a84e59: am ef87594b: Merge "libstagefright: Fix crash in convertMetaDataToMessag...
Nick Kralevich [Thu, 20 Aug 2015 18:26:34 +0000 (18:26 +0000)]
am b8a84e59: am ef87594b: Merge "libstagefright: Fix crash in convertMetaDataToMessage" into lmp-dev

* commit 'b8a84e59ed3724a2e220dbda49dc5478334e9bad':
  libstagefright: Fix crash in convertMetaDataToMessage

9 years agoam ef87594b: Merge "libstagefright: Fix crash in convertMetaDataToMessage" into lmp-dev
Nick Kralevich [Thu, 20 Aug 2015 18:18:58 +0000 (18:18 +0000)]
am ef87594b: Merge "libstagefright: Fix crash in convertMetaDataToMessage" into lmp-dev

* commit 'ef87594bd821520cdc46e30036c16ee2eb5becb3':
  libstagefright: Fix crash in convertMetaDataToMessage

9 years agoMerge "libstagefright: Fix crash in convertMetaDataToMessage" into lmp-dev
Nick Kralevich [Thu, 20 Aug 2015 18:09:48 +0000 (18:09 +0000)]
Merge "libstagefright: Fix crash in convertMetaDataToMessage" into lmp-dev

9 years agoam bd96da22: am b53cdf49: am d7c205fe: am 522019f1: Merge "libstagefright: fix handli...
Wei Jia [Thu, 20 Aug 2015 18:07:01 +0000 (18:07 +0000)]
am bd96da22: am b53cdf49: am d7c205fe: am 522019f1: Merge "libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable." into klp-dev

* commit 'bd96da22ca079e68c8efe3b6dcec56a0fe9a7cf7':
  libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable.

9 years agoam a27fe8d7: am 2fd79fa3: am cb2acbfe: am 635d38a8: Merge "Check RTSP payload length...
Abhishek Arya [Thu, 20 Aug 2015 18:07:00 +0000 (18:07 +0000)]
am a27fe8d7: am 2fd79fa3: am cb2acbfe: am 635d38a8: Merge "Check RTSP payload length" into klp-dev

* commit 'a27fe8d7cc1413041e38f8c74f1f6510bdc44627':
  Check RTSP payload length

9 years agoMerge "Fail more gracefully on allocation failure" into klp-dev
Marco Nelissen [Thu, 20 Aug 2015 18:05:08 +0000 (18:05 +0000)]
Merge "Fail more gracefully on allocation failure" into klp-dev

9 years agoDO NOT MERGE Fail more gracefully on allocation failure
Marco Nelissen [Fri, 13 Jun 2014 21:13:44 +0000 (14:13 -0700)]
DO NOT MERGE Fail more gracefully on allocation failure

Check allocations when the size is read from a file and might therefore
be invalid.

b/14388161

Change-Id: Ia08cc0a6107f275a70e793ef3b50c0ce16ceeee0

9 years agoam 776bfd80: am 8a55bcb6: resolved conflicts for merge of ced2dd3c to lmp-dev
Marco Nelissen [Thu, 20 Aug 2015 17:59:10 +0000 (17:59 +0000)]
am 776bfd80: am 8a55bcb6: resolved conflicts for merge of ced2dd3c to lmp-dev

* commit '776bfd806a1619ac0944d4ea36330c4cde4d665d':
  Sanity check padding/delay values for gapless playback

9 years agoam b53cdf49: am d7c205fe: am 522019f1: Merge "libstagefright: fix handling of mSample...
Wei Jia [Thu, 20 Aug 2015 17:58:53 +0000 (17:58 +0000)]
am b53cdf49: am d7c205fe: am 522019f1: Merge "libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable." into klp-dev

* commit 'b53cdf492fafd31763631c9664874f10325b6ff7':
  libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable.

9 years agoam 2fd79fa3: am cb2acbfe: am 635d38a8: Merge "Check RTSP payload length" into klp-dev
Abhishek Arya [Thu, 20 Aug 2015 17:58:52 +0000 (17:58 +0000)]
am 2fd79fa3: am cb2acbfe: am 635d38a8: Merge "Check RTSP payload length" into klp-dev

* commit '2fd79fa39a0ec347a80ceb5b056ed5053002f59e':
  Check RTSP payload length

9 years agoam 8a55bcb6: resolved conflicts for merge of ced2dd3c to lmp-dev
Marco Nelissen [Thu, 20 Aug 2015 17:54:22 +0000 (17:54 +0000)]
am 8a55bcb6: resolved conflicts for merge of ced2dd3c to lmp-dev

* commit '8a55bcb640c8842348eb41495fdb8fe82cb0465d':
  Sanity check padding/delay values for gapless playback

9 years agoam d7c205fe: am 522019f1: Merge "libstagefright: fix handling of mSampleTimeEntries...
Wei Jia [Thu, 20 Aug 2015 17:51:08 +0000 (17:51 +0000)]
am d7c205fe: am 522019f1: Merge "libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable." into klp-dev

* commit 'd7c205fe1f7cda2cdcb3062b548c0777402bab38':
  libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable.

9 years agoam cb2acbfe: am 635d38a8: Merge "Check RTSP payload length" into klp-dev
Abhishek Arya [Thu, 20 Aug 2015 17:51:05 +0000 (17:51 +0000)]
am cb2acbfe: am 635d38a8: Merge "Check RTSP payload length" into klp-dev

* commit 'cb2acbfed69d18aa4693c03d8a77cd45daf8af8d':
  Check RTSP payload length

9 years agoresolved conflicts for merge of ced2dd3c to lmp-dev
Marco Nelissen [Thu, 20 Aug 2015 17:26:33 +0000 (10:26 -0700)]
resolved conflicts for merge of ced2dd3c to lmp-dev

Change-Id: I5dbb4f7d6c38c75a54c59d5e59305657bc50ab10

9 years agoam 0af43510: am 2562495d: am a590baca: Merge commit \'6ae815e0\' into HEAD
Wei Jia [Thu, 20 Aug 2015 17:07:14 +0000 (17:07 +0000)]
am 0af43510: am 2562495d: am a590baca: Merge commit \'6ae815e0\' into HEAD

* commit '0af43510cc45373614cdfce7d014283100e96cb9':
  libstagefright: fix overflow in MPEG4Source::parseSampleAuxiliaryInformationOffsets.

9 years agoam 522019f1: Merge "libstagefright: fix handling of mSampleTimeEntries and mNumSample...
Wei Jia [Thu, 20 Aug 2015 17:04:07 +0000 (17:04 +0000)]
am 522019f1: Merge "libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable." into klp-dev

* commit '522019f15b3c191b73d1a0ddb56aeb3dd6b7ce31':
  libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable.

9 years agoam 635d38a8: Merge "Check RTSP payload length" into klp-dev
Abhishek Arya [Thu, 20 Aug 2015 17:04:06 +0000 (17:04 +0000)]
am 635d38a8: Merge "Check RTSP payload length" into klp-dev

* commit '635d38a84414e26aaf6c4b5df7859fde196adeaf':
  Check RTSP payload length

9 years agoam 2c880dde: Merge "Sanity check padding/delay values for gapless playback" into...
Abhishek Arya [Thu, 20 Aug 2015 17:04:05 +0000 (17:04 +0000)]
am 2c880dde: Merge "Sanity check padding/delay values for gapless playback" into klp-dev

* commit '2c880dde90e4303f9201f46124ee879325c57ba0':
  Sanity check padding/delay values for gapless playback

9 years agoam 2562495d: am a590baca: Merge commit \'6ae815e0\' into HEAD
Wei Jia [Thu, 20 Aug 2015 16:59:43 +0000 (16:59 +0000)]
am 2562495d: am a590baca: Merge commit \'6ae815e0\' into HEAD

* commit '2562495de9338e14ca3a3ef74ce07a7b310cd1fb':
  libstagefright: fix overflow in MPEG4Source::parseSampleAuxiliaryInformationOffsets.

9 years agoam a590baca: Merge commit \'6ae815e0\' into HEAD
Wei Jia [Thu, 20 Aug 2015 16:53:41 +0000 (16:53 +0000)]
am a590baca: Merge commit \'6ae815e0\' into HEAD

* commit 'a590baca031199327f6382347625dd232de2c95c':
  libstagefright: fix overflow in MPEG4Source::parseSampleAuxiliaryInformationOffsets.

9 years agoMerge commit '6ae815e0' into HEAD
Wei Jia [Thu, 20 Aug 2015 16:42:08 +0000 (09:42 -0700)]
Merge commit '6ae815e0' into HEAD

libstagefright: fix overflow in MPEG4Source::parseSampleAuxiliaryInformationOffsets.

Bug: 23270724
(cherry picked from commit c51ab7dd82bf4e24666fc72a55e03e2f530204d5)

Change-Id: I44c642548ee6ba3745fb1f46d8645bece231035a

9 years agoam e3cb2507: am 4b995f73: Merge "libstagefright: fix handling of mSampleTimeEntries...
Wei Jia [Thu, 20 Aug 2015 04:36:50 +0000 (04:36 +0000)]
am e3cb2507: am 4b995f73: Merge "libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable." into lmp-dev

* commit 'e3cb25078b814b40f8e1506514bd17066935a51f':
  libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable.

9 years agoam 4b995f73: Merge "libstagefright: fix handling of mSampleTimeEntries and mNumSample...
Wei Jia [Thu, 20 Aug 2015 04:31:45 +0000 (04:31 +0000)]
am 4b995f73: Merge "libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable." into lmp-dev

* commit '4b995f73b581ce0705b537317f32ad76bddb55fa':
  libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable.

9 years agoMerge "libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in...
Wei Jia [Thu, 20 Aug 2015 04:27:23 +0000 (04:27 +0000)]
Merge "libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable." into klp-dev

9 years agoMerge "libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in...
Wei Jia [Thu, 20 Aug 2015 04:25:47 +0000 (04:25 +0000)]
Merge "libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable." into lmp-dev

9 years agoam 84a4221e: am a9b3cd3c: am 5221133b: am b2ae4351: libstagefright: fix overflow...
Wei Jia [Thu, 20 Aug 2015 04:23:14 +0000 (04:23 +0000)]
am 84a4221e: am a9b3cd3c: am 5221133b: am b2ae4351: libstagefright: fix overflow in pvdec_api.cpp.

* commit '84a4221e305847fb0c8846122fe8f2bc7c2fda0a':
  libstagefright: fix overflow in pvdec_api.cpp.

9 years agoam a9b3cd3c: am 5221133b: am b2ae4351: libstagefright: fix overflow in pvdec_api...
Wei Jia [Thu, 20 Aug 2015 04:16:58 +0000 (04:16 +0000)]
am a9b3cd3c: am 5221133b: am b2ae4351: libstagefright: fix overflow in pvdec_api.cpp.

* commit 'a9b3cd3c101b68522a3d8492cb3a19d8b5409329':
  libstagefright: fix overflow in pvdec_api.cpp.

9 years agoam 5221133b: am b2ae4351: libstagefright: fix overflow in pvdec_api.cpp.
Wei Jia [Thu, 20 Aug 2015 04:10:56 +0000 (04:10 +0000)]
am 5221133b: am b2ae4351: libstagefright: fix overflow in pvdec_api.cpp.

* commit '5221133bfa1585b4488b01cad165627b1cd17077':
  libstagefright: fix overflow in pvdec_api.cpp.

9 years agoMerge "Check RTSP payload length" into klp-dev
Abhishek Arya [Thu, 20 Aug 2015 04:10:51 +0000 (04:10 +0000)]
Merge "Check RTSP payload length" into klp-dev

9 years agoMerge "Sanity check padding/delay values for gapless playback" into klp-dev
Abhishek Arya [Thu, 20 Aug 2015 04:06:25 +0000 (04:06 +0000)]
Merge "Sanity check padding/delay values for gapless playback" into klp-dev

9 years agoam b2ae4351: libstagefright: fix overflow in pvdec_api.cpp.
Wei Jia [Thu, 20 Aug 2015 04:04:08 +0000 (04:04 +0000)]
am b2ae4351: libstagefright: fix overflow in pvdec_api.cpp.

* commit 'b2ae4351539de9aa4667fcb3e02ba40d9c6bd094':
  libstagefright: fix overflow in pvdec_api.cpp.

9 years agoMerge "libstagefright: fix overflow in MPEG4Source::parseSampleAuxiliaryInformationOf...
Wei Jia [Thu, 20 Aug 2015 04:01:18 +0000 (04:01 +0000)]
Merge "libstagefright: fix overflow in MPEG4Source::parseSampleAuxiliaryInformationOffsets." into klp-dev

9 years agolibstagefright: fix overflow in MPEG4Source::parseSampleAuxiliaryInformationOffsets.
Wei Jia [Tue, 18 Aug 2015 21:32:16 +0000 (14:32 -0700)]
libstagefright: fix overflow in MPEG4Source::parseSampleAuxiliaryInformationOffsets.

Bug: 23270724
Change-Id: Id7ba55c7bf6860fbfc892bbb6378aac644c82da4
(cherry picked from commit c51ab7dd82bf4e24666fc72a55e03e2f530204d5)

9 years agolibstagefright: fix overflow in pvdec_api.cpp.
Wei Jia [Thu, 20 Aug 2015 00:31:51 +0000 (17:31 -0700)]
libstagefright: fix overflow in pvdec_api.cpp.

Bug: 20674086
Change-Id: Ie2c711865c3b92f3fa2f3c7a436fa0e3687eb8b3
(cherry picked from commit d7bb1cd786e5ea4ac61119cc1a08082474f7787b)

9 years agoCheck RTSP payload length
Marco Nelissen [Wed, 19 Aug 2015 22:36:12 +0000 (15:36 -0700)]
Check RTSP payload length

Bug: 23346388
Change-Id: Ifd918cefc90527c2f52177c3ce0da7a13259ad08

9 years agolibstagefright: Fix crash in convertMetaDataToMessage
Wei Jia [Thu, 25 Jun 2015 18:46:54 +0000 (11:46 -0700)]
libstagefright: Fix crash in convertMetaDataToMessage

- The ABuffer used for the Message has a preset value of 1024, if
  flattening the meta data exceeds this value, a check fails hence
  the crash.
- This change creates a new ABuffer if the buffer size would exceed
  the buffer capacity.

Bug: 22771132

CRs-Fixed: 857850

(cherry picked from commit 9c170c076382096b9e767da0e3f9f37dafa76546)

Change-Id: I056ade2f95bc8d82dfe092de7ecddba588cc5b72

9 years agolibstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable.
Wei Jia [Tue, 18 Aug 2015 18:17:24 +0000 (11:17 -0700)]
libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable.

Bug: 23247055
Change-Id: I29ef59c7ff09248063714e5013f7c33f66c5eebd
(cherry picked from commit 3564c4562f46bede6ef1ea716c4fd4f77e470ae8)
(cherry picked from commit 108cd2dc8df55f3f2ecdfbb4bb0ae981a74b6860)

9 years agolibstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable.
Wei Jia [Tue, 18 Aug 2015 18:17:24 +0000 (11:17 -0700)]
libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable.

Bug: 23247055
Change-Id: I29ef59c7ff09248063714e5013f7c33f66c5eebd
(cherry picked from commit 3564c4562f46bede6ef1ea716c4fd4f77e470ae8)

9 years agoFail more gracefully on allocation failure
Marco Nelissen [Fri, 13 Jun 2014 21:13:44 +0000 (14:13 -0700)]
Fail more gracefully on allocation failure

Check allocations when the size is read from a file and might therefore
be invalid.

b/14388161

Change-Id: Ia08cc0a6107f275a70e793ef3b50c0ce16ceeee0

9 years agoam 096a931e: am fd5942b3: am 6b52d191: (-s ours) am 916a9684: Merge "DO NOT MERGE...
Eric Laurent [Wed, 19 Aug 2015 02:19:47 +0000 (02:19 +0000)]
am 096a931e: am fd5942b3: am 6b52d191: (-s ours) am 916a9684: Merge "DO NOT MERGE - audio flinger: fix fuzz test crash" into klp-dev

* commit '096a931e5a0d5f45c3546b09046912b4d54136c8':
  DO NOT MERGE - audio flinger: fix fuzz test crash

9 years agoresolved conflicts for merge of 84fb58bd to lmp-mr1-dev
Eric Laurent [Wed, 19 Aug 2015 01:27:54 +0000 (18:27 -0700)]
resolved conflicts for merge of 84fb58bd to lmp-mr1-dev

Change-Id: I9b2b1ff690d35e0da644bdb52c8c42a72e5fd4f6

9 years agoam fd5942b3: am 6b52d191: (-s ours) am 916a9684: Merge "DO NOT MERGE - audio flinger...
Eric Laurent [Tue, 18 Aug 2015 21:58:54 +0000 (21:58 +0000)]
am fd5942b3: am 6b52d191: (-s ours) am 916a9684: Merge "DO NOT MERGE - audio flinger: fix fuzz test crash" into klp-dev

* commit 'fd5942b332c5f6e4dc50f50181344957334854e1':
  DO NOT MERGE - audio flinger: fix fuzz test crash

9 years agoam bdb5e497: Merge "DO NOT MERGE - audio flinger: fix fuzz test crash" into lmp-dev
Eric Laurent [Tue, 18 Aug 2015 21:52:31 +0000 (21:52 +0000)]
am bdb5e497: Merge "DO NOT MERGE - audio flinger: fix fuzz test crash" into lmp-dev

* commit 'bdb5e49787dcb56fec68a2410a0985bfe388cd14':
  DO NOT MERGE - audio flinger: fix fuzz test crash

9 years agoam 6b52d191: (-s ours) am 916a9684: Merge "DO NOT MERGE - audio flinger: fix fuzz...
Eric Laurent [Tue, 18 Aug 2015 21:51:55 +0000 (21:51 +0000)]
am 6b52d191: (-s ours) am 916a9684: Merge "DO NOT MERGE - audio flinger: fix fuzz test crash" into klp-dev

* commit '6b52d191f96c611b768318eec74d25908da76d03':
  DO NOT MERGE - audio flinger: fix fuzz test crash

9 years agoam 916a9684: Merge "DO NOT MERGE - audio flinger: fix fuzz test crash" into klp-dev
Eric Laurent [Tue, 18 Aug 2015 21:45:18 +0000 (21:45 +0000)]
am 916a9684: Merge "DO NOT MERGE - audio flinger: fix fuzz test crash" into klp-dev

* commit '916a9684295fb578f4b3c6c16b621ef201a49964':
  DO NOT MERGE - audio flinger: fix fuzz test crash

9 years agoMerge "DO NOT MERGE - audio flinger: fix fuzz test crash" into lmp-dev
Eric Laurent [Tue, 18 Aug 2015 21:44:50 +0000 (21:44 +0000)]
Merge "DO NOT MERGE - audio flinger: fix fuzz test crash" into lmp-dev

9 years agoMerge "DO NOT MERGE - audio flinger: fix fuzz test crash" into klp-dev
Eric Laurent [Tue, 18 Aug 2015 21:33:46 +0000 (21:33 +0000)]
Merge "DO NOT MERGE - audio flinger: fix fuzz test crash" into klp-dev

9 years agoam 25c00122: am 4ce86e78: am 5d7a381b: am 877c76ac: Merge "stagefright: check IMemory...
Chong Zhang [Tue, 18 Aug 2015 18:31:22 +0000 (18:31 +0000)]
am 25c00122: am 4ce86e78: am 5d7a381b: am 877c76ac: Merge "stagefright: check IMemory::pointer() before using the allocation" into klp-dev

* commit '25c00122a640ee311e6e72df401c362ec798617d':
  stagefright: check IMemory::pointer() before using the allocation

9 years agoam 3e9ed500: am 8a1a5d17: am 9707195b: am f97b6bee: Merge "Check integer overflow...
Jon Larimer [Tue, 18 Aug 2015 18:31:21 +0000 (18:31 +0000)]
am 3e9ed500: am 8a1a5d17: am 9707195b: am f97b6bee: Merge "Check integer overflow to prevent memory corruption" into klp-dev

* commit '3e9ed500718386db2d70d555098fa1e931e75d28':
  Check integer overflow to prevent memory corruption

9 years agoam fc26577c: am 698ff79c: am 27362395: (-s ours) am 2ed42aea: Merge "do not dequeue...
Jon Larimer [Tue, 18 Aug 2015 18:31:21 +0000 (18:31 +0000)]
am fc26577c: am 698ff79c: am 27362395: (-s ours) am 2ed42aea: Merge "do not dequeue from native window after we hit fatal error -- DO NOT MERGE" into klp-dev

* commit 'fc26577c6023ac6861c1875e6ae02f23ce53afc0':
  do not dequeue from native window after we hit fatal error -- DO NOT MERGE

9 years agoam 4b153ff9: am 2f3c04a4: resolved conflicts for merge of 6035c811 to lmp-dev
Nick Kralevich [Tue, 18 Aug 2015 18:31:20 +0000 (18:31 +0000)]
am 4b153ff9: am 2f3c04a4: resolved conflicts for merge of 6035c811 to lmp-dev

* commit '4b153ff9b5c979684ed0a53d52a3ad90ec7f7d22':
  MPEG4Source::fragmentedRead: check range before writing into buffers

9 years agoDO NOT MERGE - audio flinger: fix fuzz test crash
Eric Laurent [Fri, 8 May 2015 17:50:03 +0000 (10:50 -0700)]
DO NOT MERGE - audio flinger: fix fuzz test crash

Clear output stream pointer in duplicating thread
when the main output to which it is attached is closed.

Also do not forward master mute and volume commands to
duplicating threads as this is not applicable.

Also fix logic in AudioFlinger::primaryPlaybackThread_l()
that could accidentally return a duplicating thread.
This never happens because the primary thread is always
first in the list.

Bug: 20731946.
Change-Id: Ic8869699836920351b23d09544c50a258d3fb585
(cherry picked from commit f6870aefc5e31d4220f3778c4e79ff34a61f48ad)

9 years agoam 4ce86e78: am 5d7a381b: am 877c76ac: Merge "stagefright: check IMemory::pointer...
Chong Zhang [Tue, 18 Aug 2015 18:23:44 +0000 (18:23 +0000)]
am 4ce86e78: am 5d7a381b: am 877c76ac: Merge "stagefright: check IMemory::pointer() before using the allocation" into klp-dev

* commit '4ce86e781bf5ac7ef047cdb81db858fae12fd334':
  stagefright: check IMemory::pointer() before using the allocation