OSDN Git Service

android-x86/frameworks-av.git
7 years agoMerge "NuPlayerDecoder: fail gracefully when input data can't be held in allocated...
Wei Jia [Tue, 6 Jun 2017 20:03:13 +0000 (20:03 +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 am: 333b2d578a am: ba97351e6b
am: a8d6457eaa

Change-Id: I86fe27aa4825a44fd0aa8f6b7002bbc1466537d3

7 years agoMerge "NuPlayerDecoder: fail gracefully when input data can't be held in allocated...
Wei Jia [Tue, 6 Jun 2017 19:57:42 +0000 (19:57 +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 am: 333b2d578a
am: ba97351e6b

Change-Id: Ibe39c012581f37f8d4984f63ff88b9ac06be49da

7 years agoMerge "NuPlayerDecoder: fail gracefully when input data can't be held in allocated...
Wei Jia [Tue, 6 Jun 2017 19:51:41 +0000 (19:51 +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
am: 333b2d578a

Change-Id: I33e279617987ea8e577b06ce8666825f0c6f5ca5

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 "DO NOT MERGE - m4v_h263: check header first before decoding a frame." into...
Wei Jia [Tue, 6 Jun 2017 19:40:07 +0000 (19:40 +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 am: e138ca8b82 am: cfd9b9b85a
am: 2a930213ed  -s ours

Change-Id: I9767275a479be9be3045ac6cc5a233b58ecd77a0

7 years agoFix integer overflow in mediadrmserver am: eb21712f81 am: 5250bc1bec am: d1a854a073...
Jeff Tinker [Tue, 6 Jun 2017 19:39:40 +0000 (19:39 +0000)]
Fix integer overflow in mediadrmserver am: eb21712f81 am: 5250bc1bec am: d1a854a073 am: 7a22df06c3 am: 4e339cbca4 am: 1248e62082
am: fdfb9d206d

Change-Id: I09b988c8906ccbabd7bc970d6a0be117e8b4b1df

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 "DO NOT MERGE - m4v_h263: check header first before decoding a frame." into...
Wei Jia [Tue, 6 Jun 2017 19:34:27 +0000 (19:34 +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 am: e138ca8b82
am: cfd9b9b85a

Change-Id: I330f5809dd7a8b8f80796f7764fa261f68a68a2e

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 agoFix integer overflow in mediadrmserver am: eb21712f81 am: 5250bc1bec am: d1a854a073...
Jeff Tinker [Tue, 6 Jun 2017 19:34:01 +0000 (19:34 +0000)]
Fix integer overflow in mediadrmserver am: eb21712f81 am: 5250bc1bec am: d1a854a073 am: 7a22df06c3 am: 4e339cbca4
am: 1248e62082

Change-Id: If8396602c2c92f2e3c97e73a2da6a338ec17131d

7 years agoMerge "DO NOT MERGE - m4v_h263: check header first before decoding a frame." into...
Wei Jia [Tue, 6 Jun 2017 19:28:34 +0000 (19:28 +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
am: e138ca8b82

Change-Id: I5f55433da57c986167d638b4ea65edafb087b7b1

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

Change-Id: I8519bf3be2231d04e5ec8d245ee083730cd4cd7d

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 agoMerge "Fix potential leak" into klp-dev am: 2f9eacc3ae am: a7602f8339 am: fe7c2700ae...
Marco Nelissen [Fri, 2 Jun 2017 04:35:05 +0000 (04:35 +0000)]
Merge "Fix potential leak" into klp-dev am: 2f9eacc3ae am: a7602f8339 am: fe7c2700ae am: cbaad4b189 am: 8ff995a8ae am: cfd6daa37e am: 98a4729522 am: 813dbf802d am: 3899cc3c40
am: f86cad799d

Change-Id: Icf444ef6f5991887c9ae3ec7824c923249015faf

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

Change-Id: I8a60298c8c6a0df393fed10adb08b3ad6abcd18d

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

Change-Id: Iefe131de5ac30ef2626ec85fb814c24b4e2c0be0

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 agoMerge "Fix potential leak" into mnc-dev am: 167af356fd am: 39336ac84e am: 1adfafdfdb
Marco Nelissen [Thu, 1 Jun 2017 23:27:07 +0000 (23:27 +0000)]
Merge "Fix potential leak" into mnc-dev am: 167af356fd am: 39336ac84e am: 1adfafdfdb
am: 781d2a7521

Change-Id: I3744292b358320f52342a3eb8550ea53afa4be5b

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

Change-Id: Ie4741f517a464ddb02cf6f1ccccc131cf3eafcfa

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

Change-Id: I92f65b5720aed2ffe0659c19d54836e8c87f94fe

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 am: ebeb47000d am...
Robert Shih [Thu, 25 May 2017 22:06:24 +0000 (22:06 +0000)]
DO NOT MERGE Don't leak `this` out of GraphicBufferSource ctor am: ebeb47000d am: afa728e0b7 am: 63f4d38b3e
am: 19b6a74a9d  -s ours

Change-Id: Ibc36c2ba098a7ddcf35dcfdc6095786b8bb92925

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

Change-Id: I970ff440d2efd77587bbd110f379a9e5ae8a03ca

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

Change-Id: I8e5afcf1bb874447737d1a7c7c45ecd4e54dacd1

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 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 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 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 agoMerge "Modifying MetaData invalidates previous char*" into nyc-dev
Marco Nelissen [Tue, 16 May 2017 19:37:16 +0000 (19:37 +0000)]
Merge "Modifying MetaData invalidates previous char*" into nyc-dev

7 years agoMerge "Fix memory leak in error case" into klp-dev am: 5136b7436f am: 60657857c6...
Marco Nelissen [Tue, 16 May 2017 15:56:30 +0000 (15:56 +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 am: e4b59cb256 am: 15f2244696
am: 6721b0295f

Change-Id: I56cc783d993f01ee26df858151d1ee649ee62c51

7 years agoMerge "Fix memory leak in error case" into klp-dev am: 5136b7436f am: 60657857c6...
Marco Nelissen [Tue, 16 May 2017 15:53:29 +0000 (15:53 +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 am: e4b59cb256
am: 15f2244696

Change-Id: I220aa6cbd2de6ac74a409d6be5aa62c331931929

7 years agoMerge "Fix memory leak in error case" into klp-dev am: 5136b7436f am: 60657857c6...
Marco Nelissen [Tue, 16 May 2017 15:49:58 +0000 (15:49 +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
am: e4b59cb256

Change-Id: I89844419918d671a11696909cf530185ab452822

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 agoModifying MetaData invalidates previous char*
Marco Nelissen [Mon, 15 May 2017 22:40:14 +0000 (15:40 -0700)]
Modifying MetaData invalidates previous char*

so don't use those char* after having updated the MetaData

Bug: 36576151
Change-Id: I1430f3151cb929e436fbdac566cf91fc4164b934

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

Change-Id: I0306abb9a6a8ffd5bc4351b4af78121fd32a4890

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

Change-Id: Id4f4b331c2f4fd56a18e032ad1d55983e6b91bc5

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

Change-Id: Ibffd67ae4a98c0b38c42f68efcb8cc7b401deb0c

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

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

Change-Id: I02f221f5a4a14706c83ce12c3273df75bd23361f

7 years agoLimit ogg packet size am: bf928560ac am: f349435fcf am: 086cee9d89 am: b65b0a8367
Marco Nelissen [Mon, 15 May 2017 17:01:55 +0000 (17:01 +0000)]
Limit ogg packet size am: bf928560ac am: f349435fcf am: 086cee9d89 am: b65b0a8367
am: 412be4b735

Change-Id: I70263d5cb5fca57353337a60686d1468692819cf

7 years agoLimit ogg packet size am: bf928560ac am: f349435fcf am: 086cee9d89
Marco Nelissen [Mon, 15 May 2017 16:59:57 +0000 (16:59 +0000)]
Limit ogg packet size am: bf928560ac am: f349435fcf am: 086cee9d89
am: b65b0a8367

Change-Id: I2faa1a87e934851ee2a4a865e3e3d7084381dac6

7 years agoLimit ogg packet size am: bf928560ac am: f349435fcf
Marco Nelissen [Mon, 15 May 2017 16:56:55 +0000 (16:56 +0000)]
Limit ogg packet size am: bf928560ac am: f349435fcf
am: 086cee9d89

Change-Id: I9687649ed25dade9f872c83a290bbcd0abb4b5fc

7 years agoLimit ogg packet size am: bf928560ac
Marco Nelissen [Mon, 15 May 2017 16:53:54 +0000 (16:53 +0000)]
Limit ogg packet size am: bf928560ac
am: f349435fcf

Change-Id: I952944295017f01b254c80c8db935e33c51337f3

7 years agoLimit ogg packet size
Marco Nelissen [Mon, 15 May 2017 16:50:55 +0000 (16:50 +0000)]
Limit ogg packet size
am: bf928560ac

Change-Id: I102f6e9b1b4933d043b2a3e1e3f7fc885aaf6779

7 years agoLimit ogg packet size
Marco Nelissen [Fri, 12 May 2017 22:35:30 +0000 (15:35 -0700)]
Limit ogg packet size

A malformed ogg file might lace together a very large packet, which
could lead to out of memory conditions. Limit the packet size to
avoid this.

Bug: 36592202
Change-Id: I8650b3ec54a0de9ec302a7cbac296bb85efcfb3d

7 years agoPrevent OOB write in soft_avc encoder am: 463452a949 am: 97db64baf6 am: b6bf46944f
Ray Essick [Fri, 12 May 2017 17:52:31 +0000 (17:52 +0000)]
Prevent OOB write in soft_avc encoder am: 463452a949 am: 97db64baf6 am: b6bf46944f
am: cd35c846f0

Change-Id: Id65aa9338a1a362488f33708b4bf5f36d8581104

7 years agoPrevent OOB write in soft_avc encoder am: 463452a949 am: 97db64baf6
Ray Essick [Fri, 12 May 2017 17:50:30 +0000 (17:50 +0000)]
Prevent OOB write in soft_avc encoder am: 463452a949 am: 97db64baf6
am: b6bf46944f

Change-Id: Ib5533f65db8acecfa3b02e13a07815af8901047c

7 years agoPrevent OOB write in soft_avc encoder am: 463452a949
Ray Essick [Fri, 12 May 2017 17:48:28 +0000 (17:48 +0000)]
Prevent OOB write in soft_avc encoder am: 463452a949
am: 97db64baf6

Change-Id: Ia77a7a995dab5a20d1757ab36d0dda680946274b

7 years agoPrevent OOB write in soft_avc encoder
Ray Essick [Fri, 12 May 2017 17:45:57 +0000 (17:45 +0000)]
Prevent OOB write in soft_avc encoder
am: 463452a949

Change-Id: I7cad9d84093cce83b2edf09a55bb8b9a588bee43

7 years agoFix memory leak in error case
Marco Nelissen [Fri, 12 May 2017 17:45:14 +0000 (10:45 -0700)]
Fix memory leak in error case

Bug: 37239013
Change-Id: Ic33e0f7ed946d0729efa46f69aff1a5d35e81b1e

7 years agoPrevent OOB write in soft_avc encoder
Ray Essick [Wed, 10 May 2017 22:38:51 +0000 (15:38 -0700)]
Prevent OOB write in soft_avc encoder

Soft avc encoder cached buffer sizes across a point where the sizes
could be reset by an app, allowing crafted requests to hit outside
of the current buffer. This remedies that by forcing buffer reallocation
with new sizes whenever the encoder state at such 'reset' points.

Bug: 35421151
Test: run POC with no crash
Change-Id: I8c689846142264f7b6a277332260a6bd8a2bd92d

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 agoMerge "Avoid crash for stss sync sample number 0" into lmp-dev am: d12204372f am...
Roger1 Jonsson [Tue, 11 Apr 2017 17:50:21 +0000 (17:50 +0000)]
Merge "Avoid crash for stss sync sample number 0" into lmp-dev am: d12204372f am: 6dfbcefe4b am: 85f575dc67 am: c5bea960dc am: c510b7fb9b am: 2f72b15892
am: 4f383edd27

Change-Id: Ica34036c7643495fb521b9a6f859d9388f3fd1cd

7 years agoMerge "Avoid crash for stss sync sample number 0" into lmp-dev am: d12204372f am...
Roger1 Jonsson [Tue, 11 Apr 2017 17:45:52 +0000 (17:45 +0000)]
Merge "Avoid crash for stss sync sample number 0" into lmp-dev am: d12204372f am: 6dfbcefe4b am: 85f575dc67 am: c5bea960dc am: c510b7fb9b
am: 2f72b15892

Change-Id: I7c0c20fd9da75dcf7dcd68b7b49aaf31b77162ae

7 years agoMerge "Avoid crash for stss sync sample number 0" into lmp-dev am: d12204372f am...
Roger1 Jonsson [Tue, 11 Apr 2017 17:40:50 +0000 (17:40 +0000)]
Merge "Avoid crash for stss sync sample number 0" into lmp-dev am: d12204372f am: 6dfbcefe4b am: 85f575dc67 am: c5bea960dc
am: c510b7fb9b

Change-Id: Ia652aac790d73def27c400b1ac327a4ad1ff8ceb

7 years agoMerge "Avoid crash for stss sync sample number 0" into lmp-dev am: d12204372f am...
Roger1 Jonsson [Tue, 11 Apr 2017 17:35:50 +0000 (17:35 +0000)]
Merge "Avoid crash for stss sync sample number 0" into lmp-dev am: d12204372f am: 6dfbcefe4b am: 85f575dc67
am: c5bea960dc

Change-Id: I0448adf35221404dbc19c4ed14f2d0252770499e

7 years agoMerge "Avoid crash for stss sync sample number 0" into lmp-dev am: d12204372f am...
Roger1 Jonsson [Tue, 11 Apr 2017 17:32:20 +0000 (17:32 +0000)]
Merge "Avoid crash for stss sync sample number 0" into lmp-dev am: d12204372f am: 6dfbcefe4b
am: 85f575dc67

Change-Id: Ie8f3698b61e3f4d13383eaf1f36788186fdf3676

7 years agoMerge "Avoid crash for stss sync sample number 0" into lmp-dev am: d12204372f
Roger1 Jonsson [Tue, 11 Apr 2017 17:27:19 +0000 (17:27 +0000)]
Merge "Avoid crash for stss sync sample number 0" into lmp-dev am: d12204372f
am: 6dfbcefe4b

Change-Id: I2c528d91424183cbc31c6d8a55ec1f35c685315b

7 years agoMerge "Avoid crash for stss sync sample number 0" into lmp-dev
Roger1 Jonsson [Tue, 11 Apr 2017 17:22:19 +0000 (17:22 +0000)]
Merge "Avoid crash for stss sync sample number 0" into lmp-dev
am: d12204372f

Change-Id: Ic2bca43957197cf537760826de60fcb85777cb1b

7 years agoMerge "Avoid crash for stss sync sample number 0" into lmp-dev
TreeHugger Robot [Tue, 11 Apr 2017 17:02:45 +0000 (17:02 +0000)]
Merge "Avoid crash for stss sync sample number 0" into lmp-dev

7 years agoMerge "Don't allow using or allocating a buffer after the first state transition...
Marco Nelissen [Mon, 10 Apr 2017 21:52:43 +0000 (21:52 +0000)]
Merge "Don't allow using or allocating a buffer after the first state transition" into klp-dev am: 922ad6183e am: 0893c50bcf am: 59bc7f77f8 am: 82ffcbd667 am: 9edaa79f62 am: 56c520c4ca am: 12c176066e am: 8671302d0b am: 4a9200308c
am: 2d4e2b4975  -s ours

Change-Id: Ifb9839ce10ac5bd7d60873b434eceefb43182241

7 years agoMerge "Don't allow using or allocating a buffer after the first state transition...
Marco Nelissen [Mon, 10 Apr 2017 21:52:07 +0000 (21:52 +0000)]
Merge "Don't allow using or allocating a buffer after the first state transition" into nyc-dev

7 years agoMerge "Don't allow using or allocating a buffer after the first state transition...
Marco Nelissen [Mon, 10 Apr 2017 21:04:05 +0000 (21:04 +0000)]
Merge "Don't allow using or allocating a buffer after the first state transition" into klp-dev am: 922ad6183e am: 0893c50bcf am: 59bc7f77f8 am: 82ffcbd667 am: 9edaa79f62 am: 56c520c4ca am: 12c176066e am: 8671302d0b
am: 4a9200308c

Change-Id: I1534efa8ced51e1b43611da84283d67af1d4f8bd

7 years agoMerge "Don't allow using or allocating a buffer after the first state transition...
Marco Nelissen [Mon, 10 Apr 2017 20:59:36 +0000 (20:59 +0000)]
Merge "Don't allow using or allocating a buffer after the first state transition" into klp-dev am: 922ad6183e am: 0893c50bcf am: 59bc7f77f8 am: 82ffcbd667 am: 9edaa79f62 am: 56c520c4ca am: 12c176066e
am: 8671302d0b

Change-Id: I8cda69d1fdf55fe8be6d904813eb0e87db043c8a

7 years agoMerge "Don't allow using or allocating a buffer after the first state transition...
Marco Nelissen [Mon, 10 Apr 2017 20:55:06 +0000 (20:55 +0000)]
Merge "Don't allow using or allocating a buffer after the first state transition" into klp-dev am: 922ad6183e am: 0893c50bcf am: 59bc7f77f8 am: 82ffcbd667 am: 9edaa79f62 am: 56c520c4ca
am: 12c176066e

Change-Id: Id2207725fc2e69c8aee4a24ee605dc7fae8939e2

7 years agoMerge "Don't allow using or allocating a buffer after the first state transition...
Marco Nelissen [Mon, 10 Apr 2017 20:50:38 +0000 (20:50 +0000)]
Merge "Don't allow using or allocating a buffer after the first state transition" into klp-dev am: 922ad6183e am: 0893c50bcf am: 59bc7f77f8 am: 82ffcbd667 am: 9edaa79f62
am: 56c520c4ca

Change-Id: I27e648ddd65325600cad22d5b0fef03aa4a9447a

7 years agoMerge "Don't allow using or allocating a buffer after the first state transition...
Marco Nelissen [Mon, 10 Apr 2017 20:45:34 +0000 (20:45 +0000)]
Merge "Don't allow using or allocating a buffer after the first state transition" into klp-dev am: 922ad6183e am: 0893c50bcf am: 59bc7f77f8 am: 82ffcbd667
am: 9edaa79f62

Change-Id: Iad06395ed255dbd48b0a77147b6da809963e4306

7 years agoMerge "Don't allow using or allocating a buffer after the first state transition...
Marco Nelissen [Mon, 10 Apr 2017 20:41:04 +0000 (20:41 +0000)]
Merge "Don't allow using or allocating a buffer after the first state transition" into klp-dev am: 922ad6183e am: 0893c50bcf am: 59bc7f77f8
am: 82ffcbd667

Change-Id: I1b2ea29d1c22f1714f0c0e90a56c585176742dd2

7 years agoMerge "Don't allow using or allocating a buffer after the first state transition...
Marco Nelissen [Mon, 10 Apr 2017 20:36:33 +0000 (20:36 +0000)]
Merge "Don't allow using or allocating a buffer after the first state transition" into klp-dev am: 922ad6183e am: 0893c50bcf
am: 59bc7f77f8

Change-Id: I133f8566b649821e06cfb21a95b20f84eb839219

7 years agoMerge "Don't allow using or allocating a buffer after the first state transition...
Marco Nelissen [Mon, 10 Apr 2017 20:32:06 +0000 (20:32 +0000)]
Merge "Don't allow using or allocating a buffer after the first state transition" into klp-dev am: 922ad6183e
am: 0893c50bcf

Change-Id: I819b55a95ff50c51488bac50c43fea8b2244a410