OSDN Git Service

android-x86/frameworks-av.git
7 years agoDO NOT MERGE -- NuPlayerDecoder: fail gracefully when input data can't be held in...
Wei Jia [Wed, 7 Jun 2017 18:06:10 +0000 (18:06 +0000)]
DO NOT MERGE -- NuPlayerDecoder: fail gracefully when input data can't be held in allocated buffer. am: 8818bf1fbb  -s ours am: b91cfc3589 am: ed429f11e0  -s ours
am: 7c86ed20b2

Change-Id: I8fc5b501fdc8efb1ee0417c0c5eb572e3fcea75d

7 years agoDO NOT MERGE -- NuPlayerDecoder: fail gracefully when input data can't be held in...
Wei Jia [Wed, 7 Jun 2017 18:01:33 +0000 (18:01 +0000)]
DO NOT MERGE -- NuPlayerDecoder: fail gracefully when input data can't be held in allocated buffer. am: 8818bf1fbb  -s ours am: b91cfc3589
am: ed429f11e0  -s ours

Change-Id: Iae4fac75f4798261dcd1d6e5f1fabe223a38efc1

7 years agoDO NOT MERGE -- NuPlayerDecoder: fail gracefully when input data can't be held in...
Wei Jia [Wed, 7 Jun 2017 17:57:32 +0000 (17:57 +0000)]
DO NOT MERGE -- NuPlayerDecoder: fail gracefully when input data can't be held in allocated buffer. am: 8818bf1fbb  -s ours
am: b91cfc3589

Change-Id: I3c1f4067a7c0d505790fe0232a362bd8220762af

7 years agoDO NOT MERGE -- NuPlayerDecoder: fail gracefully when input data can't be held in...
Wei Jia [Wed, 7 Jun 2017 17:54:02 +0000 (17:54 +0000)]
DO NOT MERGE -- NuPlayerDecoder: fail gracefully when input data can't be held in allocated buffer.
am: 8818bf1fbb  -s ours

Change-Id: If42ca4975b0069a972e980524cbe2e7c9f0bad6f

7 years agoDO NOT MERGE -- NuPlayerDecoder: fail gracefully when input data can't be held in...
Wei Jia [Fri, 8 Jan 2016 00:03:03 +0000 (16:03 -0800)]
DO NOT MERGE -- NuPlayerDecoder: fail gracefully when input data can't be held in allocated buffer.

Bug: 38391487
Bug: 24145279
Change-Id: I6b99ee2dc63063557f4ee2c5856f7c848e969752
(cherry picked from commit 56097a8ecc31ec308a1caa38f92b69f99324eada)

7 years agoMerge "Fix security vulnerability: Equalizer setParameter memory overflow" into klp...
Ricardo Garcia [Wed, 7 Jun 2017 13:41:14 +0000 (13:41 +0000)]
Merge "Fix security vulnerability: Equalizer setParameter memory overflow" into klp-dev am: ef3a4aead0 am: 0ef6d9c121 am: 966e572c69 am: 1f7d80772c am: a7e658fcca am: 6d2092f734
am: 6447404db3

Change-Id: Ia434e713d3571890388e3560fef74c5f6594bed5

7 years agoMerge "Fix security vulnerability: Equalizer setParameter memory overflow" into klp...
Ricardo Garcia [Wed, 7 Jun 2017 13:38:44 +0000 (13:38 +0000)]
Merge "Fix security vulnerability: Equalizer setParameter memory overflow" into klp-dev am: ef3a4aead0 am: 0ef6d9c121 am: 966e572c69 am: 1f7d80772c am: a7e658fcca
am: 6d2092f734

Change-Id: Ic8ace5d6ed81df5d8298d9031e635501ecf2b590

7 years agoMerge "Fix security vulnerability: Equalizer setParameter memory overflow" into klp...
Ricardo Garcia [Wed, 7 Jun 2017 13:35:43 +0000 (13:35 +0000)]
Merge "Fix security vulnerability: Equalizer setParameter memory overflow" into klp-dev am: ef3a4aead0 am: 0ef6d9c121 am: 966e572c69 am: 1f7d80772c
am: a7e658fcca

Change-Id: I4070499668b42017c46e2556246fc973f7e638a4

7 years agoMerge "Fix security vulnerability: Equalizer setParameter memory overflow" into klp...
Ricardo Garcia [Wed, 7 Jun 2017 13:32:43 +0000 (13:32 +0000)]
Merge "Fix security vulnerability: Equalizer setParameter memory overflow" into klp-dev am: ef3a4aead0 am: 0ef6d9c121 am: 966e572c69
am: 1f7d80772c

Change-Id: I7a978b70b1330b619ac0ed46f3c191912ce0ffd1

7 years agoMerge "Fix security vulnerability: Equalizer setParameter memory overflow" into klp...
Ricardo Garcia [Wed, 7 Jun 2017 13:30:13 +0000 (13:30 +0000)]
Merge "Fix security vulnerability: Equalizer setParameter memory overflow" into klp-dev am: ef3a4aead0 am: 0ef6d9c121
am: 966e572c69

Change-Id: Ida849f8cad82a997a108ad472b150c7be29baf42

7 years agoMerge "Fix security vulnerability: Equalizer setParameter memory overflow" into klp...
Ricardo Garcia [Wed, 7 Jun 2017 13:27:12 +0000 (13:27 +0000)]
Merge "Fix security vulnerability: Equalizer setParameter memory overflow" into klp-dev am: ef3a4aead0
am: 0ef6d9c121

Change-Id: I420ab9888c2b542ca66fbb65fd2bf7ea7ff3bb16

7 years agoMerge "Fix security vulnerability: Equalizer setParameter memory overflow" into klp-dev
Ricardo Garcia [Wed, 7 Jun 2017 13:24:12 +0000 (13:24 +0000)]
Merge "Fix security vulnerability: Equalizer setParameter memory overflow" into klp-dev
am: ef3a4aead0

Change-Id: I31e26961aaf4ca49c8c4bfa3c4dccd03bab63286

7 years agoMerge "Fix security vulnerability: Equalizer setParameter memory overflow" into klp-dev
Ricardo Garcia [Wed, 7 Jun 2017 13:19:48 +0000 (13:19 +0000)]
Merge "Fix security vulnerability: Equalizer setParameter memory overflow" into klp-dev

7 years agoMerge "Check the buffer index from acquireBuffer" into klp-dev am: d050902155 am...
Pawin Vongmasa [Wed, 7 Jun 2017 05:11:39 +0000 (05:11 +0000)]
Merge "Check the buffer index from acquireBuffer" into klp-dev am: d050902155 am: 668b7f4b8f am: 54f81e8fe7 am: 8cb7994cbf am: fa0b15cf8f am: d158da44d5  -s ours
am: eb7c508001  -s ours

Change-Id: I42bfc18d2ee72c2c0e423404521b35c125a8fe19

7 years agoMerge "Check the buffer index from acquireBuffer" into klp-dev am: d050902155 am...
Pawin Vongmasa [Wed, 7 Jun 2017 05:09:08 +0000 (05:09 +0000)]
Merge "Check the buffer index from acquireBuffer" into klp-dev am: d050902155 am: 668b7f4b8f am: 54f81e8fe7 am: 8cb7994cbf am: fa0b15cf8f
am: d158da44d5  -s ours

Change-Id: Id6a31d4db40a4ce7a51a0b3832b821406f112d02

7 years agoMerge "Check the buffer index from acquireBuffer" into klp-dev am: d050902155 am...
Pawin Vongmasa [Wed, 7 Jun 2017 05:06:39 +0000 (05:06 +0000)]
Merge "Check the buffer index from acquireBuffer" into klp-dev am: d050902155 am: 668b7f4b8f am: 54f81e8fe7 am: 8cb7994cbf
am: fa0b15cf8f

Change-Id: I13e12ece1adb4babeea580a53a094a305e3819f3

7 years agoMerge "Check the buffer index from acquireBuffer" into klp-dev am: d050902155 am...
Pawin Vongmasa [Wed, 7 Jun 2017 05:04:08 +0000 (05:04 +0000)]
Merge "Check the buffer index from acquireBuffer" into klp-dev am: d050902155 am: 668b7f4b8f am: 54f81e8fe7
am: 8cb7994cbf

Change-Id: Ibf23434ea242faa85098c73747d1dc42ad5c85ba

7 years agoMerge "Check the buffer index from acquireBuffer" into klp-dev am: d050902155 am...
Pawin Vongmasa [Wed, 7 Jun 2017 05:01:37 +0000 (05:01 +0000)]
Merge "Check the buffer index from acquireBuffer" into klp-dev am: d050902155 am: 668b7f4b8f
am: 54f81e8fe7

Change-Id: Ic1ee69858d27b8d695f075bd436faa04795f058f

7 years agoMerge "Check the buffer index from acquireBuffer" into klp-dev am: d050902155
Pawin Vongmasa [Wed, 7 Jun 2017 04:59:38 +0000 (04:59 +0000)]
Merge "Check the buffer index from acquireBuffer" into klp-dev am: d050902155
am: 668b7f4b8f

Change-Id: I9d59a91f2a63115978bc48087a721cd7e6d8facb

7 years agoMerge "Check the buffer index from acquireBuffer" into klp-dev
Pawin Vongmasa [Wed, 7 Jun 2017 04:56:39 +0000 (04:56 +0000)]
Merge "Check the buffer index from acquireBuffer" into klp-dev
am: d050902155

Change-Id: I45700eef5e0a9eec1bcfdc4d810f20d2a5668531

7 years agoMerge "Check the buffer index from acquireBuffer" into klp-dev
TreeHugger Robot [Wed, 7 Jun 2017 04:51:35 +0000 (04:51 +0000)]
Merge "Check the buffer index from acquireBuffer" into klp-dev

7 years agoMerge "Check the buffer index from acquireBuffer" into mnc-dev
Pawin Vongmasa [Wed, 7 Jun 2017 02:11:25 +0000 (02:11 +0000)]
Merge "Check the buffer index from acquireBuffer" into mnc-dev
am: ec2549aa62

Change-Id: Ifa4eeaf32cd5a7d5ab77c0e20d3ab5d5b811def5

7 years agoMerge "Check the buffer index from acquireBuffer" into mnc-dev
TreeHugger Robot [Wed, 7 Jun 2017 02:05:17 +0000 (02:05 +0000)]
Merge "Check the buffer index from acquireBuffer" into mnc-dev

7 years agoFix security vulnerability: Equalizer setParameter memory overflow
rago [Mon, 5 Jun 2017 19:15:05 +0000 (12:15 -0700)]
Fix security vulnerability: Equalizer setParameter memory overflow

Bug: 37563371

Test: use POC on bug or cts security test
Change-Id: I9c9453a222b53fd5ef821330a34cb9e938e4d9c5

7 years agoMerge "EffectBundle: Check value size for get preset name" into klp-dev am: f5d6e9899...
Andy Hung [Tue, 6 Jun 2017 21:06:26 +0000 (21:06 +0000)]
Merge "EffectBundle: Check value size for get preset name" into klp-dev am: f5d6e98996 am: b401a3bf44 am: 1f44782e92 am: ea83248dfb am: 716d258db4 am: f043bb5da6
am: 4d76e5bcd6

Change-Id: If11f64ffbed4b890772eb2be984bb65c877199e4

7 years agoMerge "EffectBundle: Check value size for get preset name" into klp-dev am: f5d6e9899...
Andy Hung [Tue, 6 Jun 2017 21:04:22 +0000 (21:04 +0000)]
Merge "EffectBundle: Check value size for get preset name" into klp-dev am: f5d6e98996 am: b401a3bf44 am: 1f44782e92 am: ea83248dfb am: 716d258db4
am: f043bb5da6

Change-Id: I2a3a4486ade55675ce06ad9b6e3a4c01d1a4647d

7 years agoMerge "EffectBundle: Check value size for get preset name" into klp-dev am: f5d6e9899...
Andy Hung [Tue, 6 Jun 2017 21:02:53 +0000 (21:02 +0000)]
Merge "EffectBundle: Check value size for get preset name" into klp-dev am: f5d6e98996 am: b401a3bf44 am: 1f44782e92 am: ea83248dfb
am: 716d258db4

Change-Id: I30639642fdcb0f4724925f72533dcd17f6881714

7 years agoMerge "EffectBundle: Check value size for get preset name" into klp-dev am: f5d6e9899...
Andy Hung [Tue, 6 Jun 2017 21:00:54 +0000 (21:00 +0000)]
Merge "EffectBundle: Check value size for get preset name" into klp-dev am: f5d6e98996 am: b401a3bf44 am: 1f44782e92
am: ea83248dfb

Change-Id: I0ceea1282ab530f228b8e6f54678edf3bb2f9d69

7 years agoMerge "EffectBundle: Check value size for get preset name" into klp-dev am: f5d6e9899...
Andy Hung [Tue, 6 Jun 2017 20:58:23 +0000 (20:58 +0000)]
Merge "EffectBundle: Check value size for get preset name" into klp-dev am: f5d6e98996 am: b401a3bf44
am: 1f44782e92

Change-Id: Idc429c80c4058fcd2232209afd5da70128cca837

7 years agoMerge "EffectBundle: Check value size for get preset name" into klp-dev am: f5d6e98996
Andy Hung [Tue, 6 Jun 2017 20:56:51 +0000 (20:56 +0000)]
Merge "EffectBundle: Check value size for get preset name" into klp-dev am: f5d6e98996
am: b401a3bf44

Change-Id: Ie62820116b2250c7533975362e90ae8139933697

7 years agoMerge "EffectBundle: Check value size for get preset name" into klp-dev
Andy Hung [Tue, 6 Jun 2017 20:55:13 +0000 (20:55 +0000)]
Merge "EffectBundle: Check value size for get preset name" into klp-dev
am: f5d6e98996

Change-Id: I1af8959b4866ca2e45e2ef2aeb54806ac09e5176

7 years agoMerge "better manage buffer for libstagefright_soft_mpeg4enc" into klp-dev am: 021575...
Ray Essick [Tue, 6 Jun 2017 20:50:19 +0000 (20:50 +0000)]
Merge "better manage buffer for libstagefright_soft_mpeg4enc" into klp-dev am: 021575025c am: 5944b611e5 am: 1a419c7b2a am: 70a63bdf27 am: 40833da7b9 am: 2ad98cf1c7
am: be560fcb1c

Change-Id: Ia48ab3048f31dbf53c2c5dd78044fc9dd1b855bf

7 years agoMerge "EffectBundle: Check value size for get preset name" into klp-dev
Andy Hung [Tue, 6 Jun 2017 20:50:11 +0000 (20:50 +0000)]
Merge "EffectBundle: Check value size for get preset name" into klp-dev

7 years agoMerge "m4v_h263: update width/height only when they are valid." into klp-dev am:...
Wei Jia [Tue, 6 Jun 2017 20:49:51 +0000 (20:49 +0000)]
Merge "m4v_h263: update width/height only when they are valid." into klp-dev am: 2da03f40eb am: 5e9a9442a3 am: 36eb1039cf am: 1173c884db am: 3e99d14712 am: 0cb6c1f2b3
am: a0f88fe10b

Change-Id: I08ea2f520efb37c10fb25a193175fb5f7c0263a3

7 years agoMerge "better manage buffer for libstagefright_soft_mpeg4enc" into klp-dev am: 021575...
Ray Essick [Tue, 6 Jun 2017 20:45:43 +0000 (20:45 +0000)]
Merge "better manage buffer for libstagefright_soft_mpeg4enc" into klp-dev am: 021575025c am: 5944b611e5 am: 1a419c7b2a am: 70a63bdf27 am: 40833da7b9
am: 2ad98cf1c7

Change-Id: Ib1856e8073d36b874ac3280b31d69da5afb7878f

7 years agoMerge "m4v_h263: update width/height only when they are valid." into klp-dev am:...
Wei Jia [Tue, 6 Jun 2017 20:45:22 +0000 (20:45 +0000)]
Merge "m4v_h263: update width/height only when they are valid." into klp-dev am: 2da03f40eb am: 5e9a9442a3 am: 36eb1039cf am: 1173c884db am: 3e99d14712
am: 0cb6c1f2b3

Change-Id: I387bb015e84b6a32eef251860a9369c30eb7e8f6

7 years agoMerge "better manage buffer for libstagefright_soft_mpeg4enc" into klp-dev am: 021575...
Ray Essick [Tue, 6 Jun 2017 20:43:45 +0000 (20:43 +0000)]
Merge "better manage buffer for libstagefright_soft_mpeg4enc" into klp-dev am: 021575025c am: 5944b611e5 am: 1a419c7b2a am: 70a63bdf27
am: 40833da7b9

Change-Id: Icae7e002d54f1029a8b79a640fa2a9b89faf7a0d

7 years agoMerge "m4v_h263: update width/height only when they are valid." into klp-dev am:...
Wei Jia [Tue, 6 Jun 2017 20:43:21 +0000 (20:43 +0000)]
Merge "m4v_h263: update width/height only when they are valid." into klp-dev am: 2da03f40eb am: 5e9a9442a3 am: 36eb1039cf am: 1173c884db
am: 3e99d14712

Change-Id: I94e629c939151fb0918a8e2290af3e402ac2d0af

7 years agoMerge "better manage buffer for libstagefright_soft_mpeg4enc" into klp-dev am: 021575...
Ray Essick [Tue, 6 Jun 2017 20:37:16 +0000 (20:37 +0000)]
Merge "better manage buffer for libstagefright_soft_mpeg4enc" into klp-dev am: 021575025c am: 5944b611e5 am: 1a419c7b2a
am: 70a63bdf27

Change-Id: If759d2cd6c4bd350ca54218c2a6ae3fd07c11548

7 years agoMerge "m4v_h263: update width/height only when they are valid." into klp-dev am:...
Wei Jia [Tue, 6 Jun 2017 20:36:49 +0000 (20:36 +0000)]
Merge "m4v_h263: update width/height only when they are valid." into klp-dev am: 2da03f40eb am: 5e9a9442a3 am: 36eb1039cf
am: 1173c884db

Change-Id: Ie070371abe02527147724cdb620547c9f1ec1b2d

7 years agoMerge "better manage buffer for libstagefright_soft_mpeg4enc" into klp-dev am: 021575...
Ray Essick [Tue, 6 Jun 2017 20:28:12 +0000 (20:28 +0000)]
Merge "better manage buffer for libstagefright_soft_mpeg4enc" into klp-dev am: 021575025c am: 5944b611e5
am: 1a419c7b2a

Change-Id: Ibb5f76a8dac6cf37d4115d3c277687fa96b08660

7 years agoMerge "m4v_h263: update width/height only when they are valid." into klp-dev am:...
Wei Jia [Tue, 6 Jun 2017 20:27:45 +0000 (20:27 +0000)]
Merge "m4v_h263: update width/height only when they are valid." into klp-dev am: 2da03f40eb am: 5e9a9442a3
am: 36eb1039cf

Change-Id: I62be2937991b3d2d9fdf5c4cd543d669ba2edfab

7 years agoMerge "better manage buffer for libstagefright_soft_mpeg4enc" into klp-dev am: 021575025c
Ray Essick [Tue, 6 Jun 2017 20:21:35 +0000 (20:21 +0000)]
Merge "better manage buffer for libstagefright_soft_mpeg4enc" into klp-dev am: 021575025c
am: 5944b611e5

Change-Id: I7f5f93f57aa77cb87fdf5155881ed9463e50ef0f

7 years agoMerge "m4v_h263: check header first before decoding a frame." into lmp-dev am: 6aed93...
Wei Jia [Tue, 6 Jun 2017 20:21:14 +0000 (20:21 +0000)]
Merge "m4v_h263: check header first before decoding a frame." into lmp-dev am: 6aed93d593 am: 8772f84f2c am: fc97c43c79
am: c572616245

Change-Id: If16b6f9fc5b859fd913bbbf2a03afff59b8ac26c

7 years agoMerge "m4v_h263: update width/height only when they are valid." into klp-dev am:...
Wei Jia [Tue, 6 Jun 2017 20:21:13 +0000 (20:21 +0000)]
Merge "m4v_h263: update width/height only when they are valid." into klp-dev am: 2da03f40eb
am: 5e9a9442a3

Change-Id: I48abb4d5dfa84f3759dc7990b79a7495562a1376

7 years agoMerge "better manage buffer for libstagefright_soft_mpeg4enc" into klp-dev
Ray Essick [Tue, 6 Jun 2017 20:15:34 +0000 (20:15 +0000)]
Merge "better manage buffer for libstagefright_soft_mpeg4enc" into klp-dev
am: 021575025c

Change-Id: I5a5dd6e53b177854de9121bf7650f334a4fc67e9

7 years agoMerge "m4v_h263: update width/height only when they are valid." into klp-dev
Wei Jia [Tue, 6 Jun 2017 20:15:14 +0000 (20:15 +0000)]
Merge "m4v_h263: update width/height only when they are valid." into klp-dev
am: 2da03f40eb

Change-Id: I51de2fdbad57019904bcbc005e0fa85b6a8f54ed

7 years agoMerge "m4v_h263: check header first before decoding a frame." into lmp-dev am: 6aed93...
Wei Jia [Tue, 6 Jun 2017 20:15:13 +0000 (20:15 +0000)]
Merge "m4v_h263: check header first before decoding a frame." into lmp-dev am: 6aed93d593 am: 8772f84f2c
am: fc97c43c79

Change-Id: Icfb77facdc3883b0741b98584d7bc08acc5d158a

7 years agoMerge "better manage buffer for libstagefright_soft_mpeg4enc" into klp-dev
TreeHugger Robot [Tue, 6 Jun 2017 20:10:08 +0000 (20:10 +0000)]
Merge "better manage buffer for libstagefright_soft_mpeg4enc" into klp-dev

7 years agoMerge "m4v_h263: check header first before decoding a frame." into lmp-dev am: 6aed93d593
Wei Jia [Tue, 6 Jun 2017 20:09:12 +0000 (20:09 +0000)]
Merge "m4v_h263: check header first before decoding a frame." into lmp-dev am: 6aed93d593
am: 8772f84f2c

Change-Id: Iba4acd8b582f0cada22685b0dd5abd26a8c1ccde

7 years agoMerge "m4v_h263: update width/height only when they are valid." into klp-dev
TreeHugger Robot [Tue, 6 Jun 2017 20:05:05 +0000 (20:05 +0000)]
Merge "m4v_h263: update width/height only when they are valid." into klp-dev

7 years agoMerge "m4v_h263: check header first before decoding a frame." into lmp-dev
Wei Jia [Tue, 6 Jun 2017 20:03:12 +0000 (20:03 +0000)]
Merge "m4v_h263: check header first before decoding a frame." into lmp-dev
am: 6aed93d593

Change-Id: I3fc4c73813fa895796747b63ee849988f94f671a

7 years agoMerge "m4v_h263: check header first before decoding a frame." into lmp-dev
TreeHugger Robot [Tue, 6 Jun 2017 19:52:49 +0000 (19:52 +0000)]
Merge "m4v_h263: check header first before decoding a frame." into lmp-dev

7 years agoMerge "NuPlayerDecoder: fail gracefully when input data can't be held in allocated...
Wei Jia [Tue, 6 Jun 2017 19:46:11 +0000 (19:46 +0000)]
Merge "NuPlayerDecoder: fail gracefully when input data can't be held in allocated buffer." into lmp-mr1-dev am: 3b1a9c3f1b am: 2675f4cac9
am: 6a2a5b5808

Change-Id: Ic443f079bcb1213921a3bf61a13dbfe83ce2a63e

7 years agoMerge "NuPlayerDecoder: fail gracefully when input data can't be held in allocated...
Wei Jia [Tue, 6 Jun 2017 19:39:39 +0000 (19:39 +0000)]
Merge "NuPlayerDecoder: fail gracefully when input data can't be held in allocated buffer." into lmp-mr1-dev am: 3b1a9c3f1b
am: 2675f4cac9

Change-Id: Ia5f63cef5ead1153656f38b34ac4bc8ebb12ca59

7 years agoMerge "NuPlayerDecoder: fail gracefully when input data can't be held in allocated...
Wei Jia [Tue, 6 Jun 2017 19:34:04 +0000 (19:34 +0000)]
Merge "NuPlayerDecoder: fail gracefully when input data can't be held in allocated buffer." into lmp-mr1-dev
am: 3b1a9c3f1b

Change-Id: I2345da7f0816430a7a3eb1e42e411a41c4487a98

7 years agoMerge "NuPlayerDecoder: fail gracefully when input data can't be held in allocated...
TreeHugger Robot [Tue, 6 Jun 2017 19:24:27 +0000 (19:24 +0000)]
Merge "NuPlayerDecoder: fail gracefully when input data can't be held in allocated buffer." into lmp-mr1-dev

7 years agoMerge "DO NOT MERGE - m4v_h263: check header first before decoding a frame." into...
Wei Jia [Tue, 6 Jun 2017 19:22:25 +0000 (19:22 +0000)]
Merge "DO NOT MERGE - m4v_h263: check header first before decoding a frame." into klp-dev am: da924b45e1 am: fdfad5899d am: f3383881ff  -s ours am: 486e62c5dd  -s ours am: 98a5397265 am: bb3d5445c9  -s ours
am: 16531bf687

Change-Id: I3e1f949e4781eba1fa5599c1a4ee2a07dcd47e43

7 years agoFix integer overflow in mediadrmserver am: eb21712f81 am: 5250bc1bec am: d1a854a073
Jeff Tinker [Tue, 6 Jun 2017 19:22:07 +0000 (19:22 +0000)]
Fix integer overflow in mediadrmserver am: eb21712f81 am: 5250bc1bec am: d1a854a073
am: 7a22df06c3

Change-Id: I7747e1b22225bde71682de407b923accbf59ea2f

7 years agoMerge "DO NOT MERGE - m4v_h263: check header first before decoding a frame." into...
Wei Jia [Tue, 6 Jun 2017 19:17:01 +0000 (19:17 +0000)]
Merge "DO NOT MERGE - m4v_h263: check header first before decoding a frame." into klp-dev am: da924b45e1 am: fdfad5899d am: f3383881ff  -s ours am: 486e62c5dd  -s ours am: 98a5397265
am: bb3d5445c9  -s ours

Change-Id: I7e16e397d557dd1ff164840fba537ad26627a401

7 years agoFix integer overflow in mediadrmserver am: eb21712f81 am: 5250bc1bec
Jeff Tinker [Tue, 6 Jun 2017 19:16:09 +0000 (19:16 +0000)]
Fix integer overflow in mediadrmserver am: eb21712f81 am: 5250bc1bec
am: d1a854a073

Change-Id: I212669c64a748fed506b8b4a90a568aa91d01787

7 years agoMerge "DO NOT MERGE - m4v_h263: check header first before decoding a frame." into...
Wei Jia [Tue, 6 Jun 2017 19:11:01 +0000 (19:11 +0000)]
Merge "DO NOT MERGE - m4v_h263: check header first before decoding a frame." into klp-dev am: da924b45e1 am: fdfad5899d am: f3383881ff  -s ours am: 486e62c5dd  -s ours
am: 98a5397265

Change-Id: I8ba30c335c44dbf14c07eab2f656f249af424abf

7 years agoFix integer overflow in mediadrmserver am: eb21712f81
Jeff Tinker [Tue, 6 Jun 2017 19:10:38 +0000 (19:10 +0000)]
Fix integer overflow in mediadrmserver am: eb21712f81
am: 5250bc1bec

Change-Id: Ic300845c6fd6aa383ee6661812e489f885ada14c

7 years agoMerge "DO NOT MERGE - m4v_h263: check header first before decoding a frame." into...
Wei Jia [Tue, 6 Jun 2017 19:06:01 +0000 (19:06 +0000)]
Merge "DO NOT MERGE - m4v_h263: check header first before decoding a frame." into klp-dev am: da924b45e1 am: fdfad5899d am: f3383881ff  -s ours
am: 486e62c5dd  -s ours

Change-Id: I8f9016674ff88f70bc421604c1fae0bd208979d9

7 years agoFix integer overflow in mediadrmserver
Jeff Tinker [Tue, 6 Jun 2017 19:05:36 +0000 (19:05 +0000)]
Fix integer overflow in mediadrmserver
am: eb21712f81

Change-Id: I0caf94590f85f444a4705f62792c27a447fa8b69

7 years agoMerge "DO NOT MERGE - m4v_h263: check header first before decoding a frame." into...
Wei Jia [Tue, 6 Jun 2017 18:59:39 +0000 (18:59 +0000)]
Merge "DO NOT MERGE - m4v_h263: check header first before decoding a frame." into klp-dev am: da924b45e1 am: fdfad5899d
am: f3383881ff  -s ours

Change-Id: Ida0671401c4323f61ff63c4954522171efa2bcca

7 years agoMerge "DO NOT MERGE - m4v_h263: check header first before decoding a frame." into...
Wei Jia [Tue, 6 Jun 2017 18:54:07 +0000 (18:54 +0000)]
Merge "DO NOT MERGE - m4v_h263: check header first before decoding a frame." into klp-dev am: da924b45e1
am: fdfad5899d

Change-Id: Ibfeec763c09ce978dd44d7cade7cb848b31aa528

7 years agoMerge "DO NOT MERGE - m4v_h263: check header first before decoding a frame." into...
Wei Jia [Tue, 6 Jun 2017 18:48:36 +0000 (18:48 +0000)]
Merge "DO NOT MERGE - m4v_h263: check header first before decoding a frame." into klp-dev
am: da924b45e1

Change-Id: I346cc9a7df899bb760abb7eb99f684f0d40ceced

7 years agoMerge "DO NOT MERGE - m4v_h263: check header first before decoding a frame." into...
Wei Jia [Tue, 6 Jun 2017 18:39:58 +0000 (18:39 +0000)]
Merge "DO NOT MERGE - m4v_h263: check header first before decoding a frame." into klp-dev

7 years agoFix integer overflow in mediadrmserver
Jeff Tinker [Mon, 5 Jun 2017 21:34:48 +0000 (14:34 -0700)]
Fix integer overflow in mediadrmserver

bug:37710346
Change-Id: If18cfb5bb1d1f1b2997d2a0e1685590d674181f4

7 years agobetter manage buffer for libstagefright_soft_mpeg4enc
Ray Essick [Fri, 2 Jun 2017 20:07:19 +0000 (13:07 -0700)]
better manage buffer for libstagefright_soft_mpeg4enc

Existing code allocated buffer, adjusted pointer to use it, and would
adjust the pointer back when it came time to free the space. The problem
was that the adjustment was based on user-supplied values and if the
user changed those values between alloc and free (which was possible),
the code ended up free()ing the wrong address.

We fix this by keeping an extra pointer -- the unmodified allocation --
which we use for the subsequent free() calls. This makes the free()
independent of any changes to values that the user provides.

Bug: 36075363
Test: ran poc against patched nyc-mr2-dev tree
Change-Id: I7013ff5883a945c4647517b2980c76a6558f23d2

7 years agoMerge "Fix potential leak" into klp-dev am: 2f9eacc3ae am: a7602f8339 am: fe7c2700ae...
Marco Nelissen [Fri, 2 Jun 2017 04:25:02 +0000 (04:25 +0000)]
Merge "Fix potential leak" into klp-dev am: 2f9eacc3ae am: a7602f8339 am: fe7c2700ae am: cbaad4b189 am: 8ff995a8ae am: cfd6daa37e
am: 98a4729522

Change-Id: Ie371aca665e0c40d43c08187eb9cfc821af6cf73

7 years agoMerge "Fix potential leak" into klp-dev am: 2f9eacc3ae am: a7602f8339 am: fe7c2700ae...
Marco Nelissen [Fri, 2 Jun 2017 04:21:32 +0000 (04:21 +0000)]
Merge "Fix potential leak" into klp-dev am: 2f9eacc3ae am: a7602f8339 am: fe7c2700ae am: cbaad4b189 am: 8ff995a8ae
am: cfd6daa37e

Change-Id: I92f0c069616e6dd8e415d4a84917d7061857eb2d

7 years agoMerge "Fix potential leak" into klp-dev am: 2f9eacc3ae am: a7602f8339 am: fe7c2700ae...
Marco Nelissen [Fri, 2 Jun 2017 04:18:37 +0000 (04:18 +0000)]
Merge "Fix potential leak" into klp-dev am: 2f9eacc3ae am: a7602f8339 am: fe7c2700ae am: cbaad4b189
am: 8ff995a8ae

Change-Id: I2a84d1752dc91e1d99f0b6773195176dba1b15d3

7 years agoMerge "Fix potential leak" into klp-dev am: 2f9eacc3ae am: a7602f8339 am: fe7c2700ae
Marco Nelissen [Fri, 2 Jun 2017 04:15:32 +0000 (04:15 +0000)]
Merge "Fix potential leak" into klp-dev am: 2f9eacc3ae am: a7602f8339 am: fe7c2700ae
am: cbaad4b189

Change-Id: Ifd9897d7c631c92e756481c3f43f0b4cbca85ca0

7 years agoMerge "Fix potential leak" into klp-dev am: 2f9eacc3ae am: a7602f8339
Marco Nelissen [Fri, 2 Jun 2017 04:12:32 +0000 (04:12 +0000)]
Merge "Fix potential leak" into klp-dev am: 2f9eacc3ae am: a7602f8339
am: fe7c2700ae

Change-Id: I9c4c5dbe0682992f9e7521ed3bf6a52d8311e00f

7 years agoMerge "Fix potential leak" into klp-dev am: 2f9eacc3ae
Marco Nelissen [Fri, 2 Jun 2017 04:09:21 +0000 (04:09 +0000)]
Merge "Fix potential leak" into klp-dev am: 2f9eacc3ae
am: a7602f8339

Change-Id: I2883ac8221475d5fa73ed34350f199355b541b14

7 years agoMerge "Fix potential leak" into klp-dev
Marco Nelissen [Fri, 2 Jun 2017 04:05:59 +0000 (04:05 +0000)]
Merge "Fix potential leak" into klp-dev
am: 2f9eacc3ae

Change-Id: I7e3a53be249eff99dd895e500f9833ad55a184b0

7 years agoMerge "Fix potential leak" into klp-dev
TreeHugger Robot [Fri, 2 Jun 2017 04:02:09 +0000 (04:02 +0000)]
Merge "Fix potential leak" into klp-dev

7 years agom4v_h263: check header first before decoding a frame.
Wei Jia [Fri, 19 May 2017 21:34:10 +0000 (14:34 -0700)]
m4v_h263: check header first before decoding a frame.

Test: fix the file in the bug
Bug: 37660827
Change-Id: I9d6919f96c0c9f29221be1e8e852ecb21062bad9
(cherry picked from commit db545366c2e893dbbe1a42d858c52067101beda6)

7 years agoMerge "Fix potential leak" into mnc-dev
Marco Nelissen [Thu, 1 Jun 2017 23:13:12 +0000 (23:13 +0000)]
Merge "Fix potential leak" into mnc-dev
am: 167af356fd

Change-Id: I47300ca03662a0b24195ac16e73c2873577a2b55

7 years agoMerge "Fix potential leak" into mnc-dev
TreeHugger Robot [Thu, 1 Jun 2017 23:07:47 +0000 (23:07 +0000)]
Merge "Fix potential leak" into mnc-dev

7 years agoDO NOT MERGE Don't leak `this` out of GraphicBufferSource ctor
Robert Shih [Thu, 25 May 2017 21:52:55 +0000 (21:52 +0000)]
DO NOT MERGE Don't leak `this` out of GraphicBufferSource ctor
am: ebeb47000d

Change-Id: I1ae0603aa9b798bd6c624d96c18ef6457212bfa7

7 years agoDO NOT MERGE Don't leak `this` out of GraphicBufferSource ctor
Robert Shih [Tue, 23 May 2017 00:32:29 +0000 (17:32 -0700)]
DO NOT MERGE Don't leak `this` out of GraphicBufferSource ctor

Bug: 37622974
Bug: 37622987
Bug: 37623757
Test: run poc and observe no crash
Change-Id: I1e25c011f02bec26a1480ec9a217a52f15d43cf2

7 years agoCheck the buffer index from acquireBuffer
Pawin Vongmasa [Tue, 23 May 2017 01:24:30 +0000 (18:24 -0700)]
Check the buffer index from acquireBuffer

Test: Run the POC
Test: Small CtsMediaTestCases
Bug: 37563942
Merged-In: I8ddfbc91a08d96de1f732e6776d6f90997042f6b
Change-Id: I8ddfbc91a08d96de1f732e6776d6f90997042f6b

7 years agoCheck the buffer index from acquireBuffer
Pawin Vongmasa [Tue, 23 May 2017 01:24:30 +0000 (18:24 -0700)]
Check the buffer index from acquireBuffer

Test: Run the POC
Test: Small CtsMediaTestCases
Bug: 37563942
Merged-In: I8ddfbc91a08d96de1f732e6776d6f90997042f6b
Change-Id: I8ddfbc91a08d96de1f732e6776d6f90997042f6b

7 years agoDO NOT MERGE - m4v_h263: check header first before decoding a frame.
Wei Jia [Fri, 19 May 2017 21:34:10 +0000 (14:34 -0700)]
DO NOT MERGE - m4v_h263: check header first before decoding a frame.

Test: fix the file in the bug
Bug: 37660827
Change-Id: I9d6919f96c0c9f29221be1e8e852ecb21062bad9

7 years agom4v_h263: update width/height only when they are valid.
Wei Jia [Thu, 18 May 2017 19:43:12 +0000 (12:43 -0700)]
m4v_h263: update width/height only when they are valid.

Test: the file in the bug doesn't crash
Bug: 37079296
Change-Id: Ie092971dda568119ca38ec67d65ccfc00df93185

7 years agoNuPlayerDecoder: fail gracefully when input data can't be held in allocated buffer.
Wei Jia [Fri, 8 Jan 2016 00:03:03 +0000 (16:03 -0800)]
NuPlayerDecoder: fail gracefully when input data can't be held in allocated buffer.

Bug: 38391487
Bug: 24145279
Change-Id: I6b99ee2dc63063557f4ee2c5856f7c848e969752
(cherry picked from commit 56097a8ecc31ec308a1caa38f92b69f99324eada)

7 years agoFix potential leak
Marco Nelissen [Tue, 9 May 2017 21:17:06 +0000 (14:17 -0700)]
Fix potential leak

Fix potential memory leak introduced with bugfix for bug 31449945.

Bug: 36389123
Change-Id: I5a9a3551692d6cba385b45c4c7a465aa377a62b1

7 years agoEffectBundle: Check value size for get preset name
Andy Hung [Tue, 16 May 2017 19:04:50 +0000 (12:04 -0700)]
EffectBundle: Check value size for get preset name

Test: CTS testAllEffectsEqualizer_CVE_2017_0401
Bug: 37536407
Change-Id: I347af04677fc49a01efb549f06ff81d1a00dc4d0

7 years agoMerge "Fix memory leak in error case" into klp-dev am: 5136b7436f am: 60657857c6...
Marco Nelissen [Tue, 16 May 2017 15:46:30 +0000 (15:46 +0000)]
Merge "Fix memory leak in error case" into klp-dev am: 5136b7436f am: 60657857c6 am: 55057ab408 am: a2fbd251ca am: 4bd7103388 am: dd2f7e982f
am: 00be42f32c

Change-Id: I651a449830219d0e7513417246d0d269cf44fe88

7 years agoMerge "Fix memory leak in error case" into klp-dev am: 5136b7436f am: 60657857c6...
Marco Nelissen [Tue, 16 May 2017 15:42:58 +0000 (15:42 +0000)]
Merge "Fix memory leak in error case" into klp-dev am: 5136b7436f am: 60657857c6 am: 55057ab408 am: a2fbd251ca am: 4bd7103388
am: dd2f7e982f

Change-Id: I4cdcb7694baea6c10980860880c4bdcf41905a8f

7 years agoMerge "Fix memory leak in error case" into klp-dev am: 5136b7436f am: 60657857c6...
Marco Nelissen [Tue, 16 May 2017 15:39:56 +0000 (15:39 +0000)]
Merge "Fix memory leak in error case" into klp-dev am: 5136b7436f am: 60657857c6 am: 55057ab408 am: a2fbd251ca
am: 4bd7103388

Change-Id: I159ed2c6b4184689517bf39d791cb516d505e4ed

7 years agoMerge "Fix memory leak in error case" into klp-dev am: 5136b7436f am: 60657857c6...
Marco Nelissen [Tue, 16 May 2017 15:36:54 +0000 (15:36 +0000)]
Merge "Fix memory leak in error case" into klp-dev am: 5136b7436f am: 60657857c6 am: 55057ab408
am: a2fbd251ca

Change-Id: I8a0e99463feb24350f02d5b5ccdc9419ebb2d71d

7 years agoMerge "Fix memory leak in error case" into klp-dev am: 5136b7436f am: 60657857c6
Marco Nelissen [Tue, 16 May 2017 15:33:25 +0000 (15:33 +0000)]
Merge "Fix memory leak in error case" into klp-dev am: 5136b7436f am: 60657857c6
am: 55057ab408

Change-Id: I5107a57def4be19aad9dca950cca06bebecad1e8

7 years agoMerge "Fix memory leak in error case" into klp-dev am: 5136b7436f
Marco Nelissen [Tue, 16 May 2017 15:30:24 +0000 (15:30 +0000)]
Merge "Fix memory leak in error case" into klp-dev am: 5136b7436f
am: 60657857c6

Change-Id: I1564d4e2626a31b7018bae301c50a268ccc79749

7 years agoMerge "Fix memory leak in error case" into klp-dev
Marco Nelissen [Tue, 16 May 2017 15:27:25 +0000 (15:27 +0000)]
Merge "Fix memory leak in error case" into klp-dev
am: 5136b7436f

Change-Id: I479e015461fa46227c4cae49829b0f3c0d769de9

7 years agoMerge "Fix memory leak in error case" into klp-dev
Marco Nelissen [Tue, 16 May 2017 15:20:59 +0000 (15:20 +0000)]
Merge "Fix memory leak in error case" into klp-dev

7 years agoLimit ogg packet size am: bf928560ac am: f349435fcf am: 086cee9d89 am: b65b0a8367...
Marco Nelissen [Mon, 15 May 2017 17:07:58 +0000 (17:07 +0000)]
Limit ogg packet size am: bf928560ac am: f349435fcf am: 086cee9d89 am: b65b0a8367 am: 412be4b735 am: 045c64fe94
am: fd7cba4d0e

Change-Id: I0c11db2bb63c110732c925cfc482deee246dc720