OSDN Git Service

android-x86/frameworks-av.git
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 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 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

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

Change-Id: I8fbd67b5fe298d6f842d224109e2ab0b52a2b59a

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

7 years agoAvoid crash for stss sync sample number 0 am: 5c364997a3 am: e77a32bd3d am: ab28d49e4...
Roger1 Jonsson [Wed, 5 Apr 2017 23:28:09 +0000 (23:28 +0000)]
Avoid crash for stss sync sample number 0 am: 5c364997a3 am: e77a32bd3d am: ab28d49e41  -s ours am: 73db408aa3 am: 0bb0a8e1e8 am: 4d86bef7f7 am: 241f5feb8a am: a7cec6180f am: d022170614
am: cbdc2b7899

Change-Id: Id114e3cd00bcdbb000d26e0d48e4ec91affd062c

7 years agoAvoid crash for stss sync sample number 0 am: 5c364997a3 am: e77a32bd3d am: ab28d49e4...
Roger1 Jonsson [Wed, 5 Apr 2017 23:25:09 +0000 (23:25 +0000)]
Avoid crash for stss sync sample number 0 am: 5c364997a3 am: e77a32bd3d am: ab28d49e41  -s ours am: 73db408aa3 am: 0bb0a8e1e8 am: 4d86bef7f7 am: 241f5feb8a am: a7cec6180f
am: d022170614

Change-Id: I488701da8808d3da8695aaabae74074f8080d512

7 years agoAvoid crash for stss sync sample number 0 am: 5c364997a3 am: e77a32bd3d am: ab28d49e4...
Roger1 Jonsson [Wed, 5 Apr 2017 23:22:11 +0000 (23:22 +0000)]
Avoid crash for stss sync sample number 0 am: 5c364997a3 am: e77a32bd3d am: ab28d49e41  -s ours am: 73db408aa3 am: 0bb0a8e1e8 am: 4d86bef7f7 am: 241f5feb8a
am: a7cec6180f

Change-Id: I75a8ee185d28f82f6760a9b7d392161762e3399d

7 years agoAvoid crash for stss sync sample number 0 am: 5c364997a3 am: e77a32bd3d am: ab28d49e4...
Roger1 Jonsson [Wed, 5 Apr 2017 23:19:37 +0000 (23:19 +0000)]
Avoid crash for stss sync sample number 0 am: 5c364997a3 am: e77a32bd3d am: ab28d49e41  -s ours am: 73db408aa3 am: 0bb0a8e1e8 am: 4d86bef7f7
am: 241f5feb8a

Change-Id: I52d24edf474be0f12e7debf052e1398a56674dc8

7 years agoAvoid crash for stss sync sample number 0 am: 5c364997a3 am: e77a32bd3d am: ab28d49e4...
Roger1 Jonsson [Wed, 5 Apr 2017 23:16:08 +0000 (23:16 +0000)]
Avoid crash for stss sync sample number 0 am: 5c364997a3 am: e77a32bd3d am: ab28d49e41  -s ours am: 73db408aa3 am: 0bb0a8e1e8
am: 4d86bef7f7

Change-Id: I53fd99fb4436b2cce7a8473a1e188cf8fcdf19eb

7 years agoAvoid crash for stss sync sample number 0 am: 5c364997a3 am: e77a32bd3d am: ab28d49e4...
Roger1 Jonsson [Wed, 5 Apr 2017 23:13:37 +0000 (23:13 +0000)]
Avoid crash for stss sync sample number 0 am: 5c364997a3 am: e77a32bd3d am: ab28d49e41  -s ours am: 73db408aa3
am: 0bb0a8e1e8

Change-Id: Id88b6709127ad9799d63dff3c1310001142a0a2c

7 years agoAvoid crash for stss sync sample number 0 am: 5c364997a3 am: e77a32bd3d am: ab28d49e4...
Roger1 Jonsson [Wed, 5 Apr 2017 23:10:38 +0000 (23:10 +0000)]
Avoid crash for stss sync sample number 0 am: 5c364997a3 am: e77a32bd3d am: ab28d49e41  -s ours
am: 73db408aa3

Change-Id: Ibe55680e73e9caddc3fc79883fa17a50742f393d

7 years agoAvoid crash for stss sync sample number 0
Roger1 Jonsson [Wed, 26 Oct 2016 07:20:00 +0000 (09:20 +0200)]
Avoid crash for stss sync sample number 0

A sample number value of 0 means that the value stored in
the mSyncSamples array, would become negative (-1),
when converted to index value. This causes a crash.

Make sure that stss sample numbers are bigger
than 0 before converting sample number to index value.

Bug: 32423862
bug: 35645051
Test: Playback video that triggers stss sync sample number 0
Change-Id: I35bee7c718e01b086d7e05deda13b38083f509f5

7 years agoAvoid crash for stss sync sample number 0 am: 5c364997a3 am: e77a32bd3d
Roger1 Jonsson [Wed, 5 Apr 2017 23:07:37 +0000 (23:07 +0000)]
Avoid crash for stss sync sample number 0 am: 5c364997a3 am: e77a32bd3d
am: ab28d49e41  -s ours

Change-Id: I63e6f4ea65dda85e5d779f6aaf1fbd4ca5806f8c

7 years agoAvoid crash for stss sync sample number 0 am: 5c364997a3
Roger1 Jonsson [Wed, 5 Apr 2017 22:52:35 +0000 (22:52 +0000)]
Avoid crash for stss sync sample number 0 am: 5c364997a3
am: e77a32bd3d

Change-Id: If61ba19bc937c6b7c7227296ddba5a1797072f9d

7 years agoAvoid crash for stss sync sample number 0
Roger1 Jonsson [Wed, 5 Apr 2017 22:49:34 +0000 (22:49 +0000)]
Avoid crash for stss sync sample number 0
am: 5c364997a3

Change-Id: Ia97daf543c65b52db1c5d09471ed8d00a434364d

7 years agoAvoid crash for stss sync sample number 0
Roger1 Jonsson [Wed, 26 Oct 2016 07:20:00 +0000 (09:20 +0200)]
Avoid crash for stss sync sample number 0

A sample number value of 0 means that the value stored in
the mSyncSamples array, would become negative (-1),
when converted to index value. This causes a crash.

Make sure that stss sample numbers are bigger
than 0 before converting sample number to index value.

Bug: 32423862
bug: 35645051
Test: Playback video that triggers stss sync sample number 0
Change-Id: I35bee7c718e01b086d7e05deda13b38083f509f5

7 years agoDon't allow using or allocating a buffer after the first state transition
Marco Nelissen [Mon, 27 Mar 2017 22:04:25 +0000 (15:04 -0700)]
Don't allow using or allocating a buffer after the first state transition

Bug: 35467458
Change-Id: Ia76c8cec8ad2abb95ca29b2a89075f7acab4b174

7 years agoDon't allow using or allocating a buffer after the first state transition
Marco Nelissen [Mon, 27 Mar 2017 22:04:25 +0000 (15:04 -0700)]
Don't allow using or allocating a buffer after the first state transition

Bug: 35467458
Change-Id: Ia76c8cec8ad2abb95ca29b2a89075f7acab4b174

7 years agoDO NOT MERGE FLACExtractor: copy protect mWriteBuffer am: 13c77f4fe0 am: 761abda1bd...
Robert Shih [Wed, 15 Mar 2017 00:30:31 +0000 (00:30 +0000)]
DO NOT MERGE FLACExtractor: copy protect mWriteBuffer am: 13c77f4fe0 am: 761abda1bd am: aca26c9d45  -s ours am: 1e4d8d67bc  -s ours am: 413ad04890 am: 27ba2d85d6  -s ours am: 4066f0e808 am: db11181861 am: b38fd0baf8
am: acc15f5a71  -s ours

Change-Id: If271c8cc840e5447f9bfa882cba4ae76801cd17b

7 years agoDO NOT MERGE FLACExtractor: copy protect mWriteBuffer am: 13c77f4fe0 am: 761abda1bd...
Robert Shih [Wed, 15 Mar 2017 00:25:32 +0000 (00:25 +0000)]
DO NOT MERGE FLACExtractor: copy protect mWriteBuffer am: 13c77f4fe0 am: 761abda1bd am: aca26c9d45  -s ours am: 1e4d8d67bc  -s ours am: 413ad04890 am: 27ba2d85d6  -s ours am: 4066f0e808 am: db11181861
am: b38fd0baf8

Change-Id: I0d43d8afed17f5c64e731080002260ec2f05cfee

7 years agoFLACExtractor: copy protect mWriteBuffer am: 8ee699977c am: 038fd6e5ec am: 4eea0b3aa4...
Robert Shih [Wed, 15 Mar 2017 00:25:31 +0000 (00:25 +0000)]
FLACExtractor: copy protect mWriteBuffer am: 8ee699977c am: 038fd6e5ec am: 4eea0b3aa4 am: b06f7c6e15 am: 5c1a7d4c64 am: 5b937b03d5
am: ced3c15960

Change-Id: I0e56cd59a6c8818f6fbd1f909c226970cd3b330e

7 years agoDO NOT MERGE FLACExtractor: copy protect mWriteBuffer am: 13c77f4fe0 am: 761abda1bd...
Robert Shih [Wed, 15 Mar 2017 00:21:02 +0000 (00:21 +0000)]
DO NOT MERGE FLACExtractor: copy protect mWriteBuffer am: 13c77f4fe0 am: 761abda1bd am: aca26c9d45  -s ours am: 1e4d8d67bc  -s ours am: 413ad04890 am: 27ba2d85d6  -s ours am: 4066f0e808
am: db11181861

Change-Id: I857531fc1e7a6727de639813c63423758eb37017

7 years agoFLACExtractor: copy protect mWriteBuffer am: 8ee699977c am: 038fd6e5ec am: 4eea0b3aa4...
Robert Shih [Wed, 15 Mar 2017 00:20:32 +0000 (00:20 +0000)]
FLACExtractor: copy protect mWriteBuffer am: 8ee699977c am: 038fd6e5ec am: 4eea0b3aa4 am: b06f7c6e15 am: 5c1a7d4c64
am: 5b937b03d5

Change-Id: I07fae26ec82b190b82c2949a4fbfc1d4e293fda5

7 years agoDO NOT MERGE FLACExtractor: copy protect mWriteBuffer am: 13c77f4fe0 am: 761abda1bd...
Robert Shih [Wed, 15 Mar 2017 00:15:30 +0000 (00:15 +0000)]
DO NOT MERGE FLACExtractor: copy protect mWriteBuffer am: 13c77f4fe0 am: 761abda1bd am: aca26c9d45  -s ours am: 1e4d8d67bc  -s ours am: 413ad04890 am: 27ba2d85d6  -s ours
am: 4066f0e808

Change-Id: Icaa568c50688db3157c524978deda0a52ca87e37

7 years agoFLACExtractor: copy protect mWriteBuffer am: 8ee699977c am: 038fd6e5ec am: 4eea0b3aa4...
Robert Shih [Wed, 15 Mar 2017 00:15:30 +0000 (00:15 +0000)]
FLACExtractor: copy protect mWriteBuffer am: 8ee699977c am: 038fd6e5ec am: 4eea0b3aa4 am: b06f7c6e15
am: 5c1a7d4c64

Change-Id: Id2cc3152facf8147504b34c9ee575acfc3f67668

7 years agoFLACExtractor: copy protect mWriteBuffer am: 8ee699977c am: 038fd6e5ec am: 4eea0b3aa4
Robert Shih [Wed, 15 Mar 2017 00:10:00 +0000 (00:10 +0000)]
FLACExtractor: copy protect mWriteBuffer am: 8ee699977c am: 038fd6e5ec am: 4eea0b3aa4
am: b06f7c6e15

Change-Id: I9b5601e129a7162aa125feef425bdc93de4e4471

7 years agoDO NOT MERGE FLACExtractor: copy protect mWriteBuffer am: 13c77f4fe0 am: 761abda1bd...
Robert Shih [Wed, 15 Mar 2017 00:09:59 +0000 (00:09 +0000)]
DO NOT MERGE FLACExtractor: copy protect mWriteBuffer am: 13c77f4fe0 am: 761abda1bd am: aca26c9d45  -s ours am: 1e4d8d67bc  -s ours am: 413ad04890
am: 27ba2d85d6  -s ours

Change-Id: Ib80a0800bbcbb4033081ff9052681dbaf5406ab8

7 years agoFLACExtractor: copy protect mWriteBuffer am: 8ee699977c am: 038fd6e5ec
Robert Shih [Wed, 15 Mar 2017 00:04:31 +0000 (00:04 +0000)]
FLACExtractor: copy protect mWriteBuffer am: 8ee699977c am: 038fd6e5ec
am: 4eea0b3aa4

Change-Id: I4f3b1e4a100374da2e412082564fc6fb54dc122a

7 years agoDO NOT MERGE FLACExtractor: copy protect mWriteBuffer am: 13c77f4fe0 am: 761abda1bd...
Robert Shih [Wed, 15 Mar 2017 00:04:30 +0000 (00:04 +0000)]
DO NOT MERGE FLACExtractor: copy protect mWriteBuffer am: 13c77f4fe0 am: 761abda1bd am: aca26c9d45  -s ours am: 1e4d8d67bc  -s ours
am: 413ad04890

Change-Id: I160f5893987b330ae73e6675ffb2dc2fed2d1304

7 years agoDO NOT MERGE FLACExtractor: copy protect mWriteBuffer am: 13c77f4fe0 am: 761abda1bd...
Robert Shih [Tue, 14 Mar 2017 23:58:59 +0000 (23:58 +0000)]
DO NOT MERGE FLACExtractor: copy protect mWriteBuffer am: 13c77f4fe0 am: 761abda1bd am: aca26c9d45  -s ours
am: 1e4d8d67bc  -s ours

Change-Id: Iab0b678707ea31ad02f0f9be5f02f5638c601826

7 years agoFLACExtractor: copy protect mWriteBuffer am: 8ee699977c
Robert Shih [Tue, 14 Mar 2017 23:58:59 +0000 (23:58 +0000)]
FLACExtractor: copy protect mWriteBuffer am: 8ee699977c
am: 038fd6e5ec

Change-Id: I475073171089f82eac7816d479f9b720a887a0c9

7 years agoFLACExtractor: copy protect mWriteBuffer
Robert Shih [Tue, 14 Mar 2017 23:55:10 +0000 (23:55 +0000)]
FLACExtractor: copy protect mWriteBuffer
am: 8ee699977c

Change-Id: Icdfd99c85fb0f76cc607f8bb29430913cf72bad1

7 years agoDO NOT MERGE FLACExtractor: copy protect mWriteBuffer am: 13c77f4fe0 am: 761abda1bd
Robert Shih [Tue, 14 Mar 2017 23:54:28 +0000 (23:54 +0000)]
DO NOT MERGE FLACExtractor: copy protect mWriteBuffer am: 13c77f4fe0 am: 761abda1bd
am: aca26c9d45  -s ours

Change-Id: Id436554a36de729ccd7a3220e32e155c423d0531

7 years agoDO NOT MERGE FLACExtractor: copy protect mWriteBuffer am: 13c77f4fe0
Robert Shih [Tue, 14 Mar 2017 23:49:57 +0000 (23:49 +0000)]
DO NOT MERGE FLACExtractor: copy protect mWriteBuffer am: 13c77f4fe0
am: 761abda1bd

Change-Id: I30bf5233b69619d260edb952248865adf5c55c83

7 years agoDO NOT MERGE FLACExtractor: copy protect mWriteBuffer
Robert Shih [Tue, 14 Mar 2017 23:45:27 +0000 (23:45 +0000)]
DO NOT MERGE FLACExtractor: copy protect mWriteBuffer
am: 13c77f4fe0

Change-Id: Ib7f8b77b3ba27fcd8e61e540eb39259cb287185c

7 years agoFLACExtractor: copy protect mWriteBuffer
Robert Shih [Mon, 24 Oct 2016 18:38:31 +0000 (11:38 -0700)]
FLACExtractor: copy protect mWriteBuffer

Bug: 30895578
Bug: 34970788
Change-Id: I4cba36bbe3502678210e5925181683df9726b431
(cherry picked from commit 328cd66cc72ba7bc5452ed5a93f29ddcd73aa9f9)

7 years agoDO NOT MERGE FLACExtractor: copy protect mWriteBuffer
Robert Shih [Mon, 24 Oct 2016 18:38:31 +0000 (11:38 -0700)]
DO NOT MERGE FLACExtractor: copy protect mWriteBuffer

Bug: 30895578
Bug: 34970788
Change-Id: I4cba36bbe3502678210e5925181683df9726b431

7 years agoMerge "Add bounds check in SoftAACEncoder2::onQueueFilled()" into klp-dev am: 19b91af...
Ray Essick [Mon, 13 Mar 2017 23:23:43 +0000 (23:23 +0000)]
Merge "Add bounds check in SoftAACEncoder2::onQueueFilled()" into klp-dev am: 19b91af752 am: 8e3cf4d841 am: 5b1bfc1f43 am: 8abf11b512 am: 4bc4f78933 am: 7f2592fe4a am: dbdf026f76 am: c4305aeda4 am: 1baad9ad99
am: 2ad7f9b172

Change-Id: Iff4a0475dde613d649196c826dbc482e9af93872

7 years agoMerge "Fix TOCTOU problem in libstagefright_soft_aacenc" into klp-dev am: 2076915c5f...
Ray Essick [Mon, 13 Mar 2017 23:23:26 +0000 (23:23 +0000)]
Merge "Fix TOCTOU problem in libstagefright_soft_aacenc" into klp-dev am: 2076915c5f am: dcda2ec2fe am: f5c7784dbd am: c3de266a99 am: 8655d4fc01 am: b05be00f56 am: eb58ce5bb0 am: a830539187 am: e973c65525
am: ae7fae1810

Change-Id: I08b043910e7bf2173cd1b19c3bb76f5753b38ff0

7 years agoMerge "Add bounds check in SoftAACEncoder2::onQueueFilled()" into klp-dev am: 19b91af...
Ray Essick [Mon, 13 Mar 2017 23:18:46 +0000 (23:18 +0000)]
Merge "Add bounds check in SoftAACEncoder2::onQueueFilled()" into klp-dev am: 19b91af752 am: 8e3cf4d841 am: 5b1bfc1f43 am: 8abf11b512 am: 4bc4f78933 am: 7f2592fe4a am: dbdf026f76 am: c4305aeda4
am: 1baad9ad99

Change-Id: If99804d172112b671974d84d29ac61fe8bf885d8

7 years agoMerge "Fix TOCTOU problem in libstagefright_soft_aacenc" into klp-dev am: 2076915c5f...
Ray Essick [Mon, 13 Mar 2017 23:18:31 +0000 (23:18 +0000)]
Merge "Fix TOCTOU problem in libstagefright_soft_aacenc" into klp-dev am: 2076915c5f am: dcda2ec2fe am: f5c7784dbd am: c3de266a99 am: 8655d4fc01 am: b05be00f56 am: eb58ce5bb0 am: a830539187
am: e973c65525

Change-Id: Icb9263d13832bc7826aa67af92f61bafbff4b7a1

7 years agoMerge "Fix integer overflow and divide-by-zero" into klp-dev am: b264ece2c0 am: bbca2...
Marco Nelissen [Mon, 13 Mar 2017 23:14:57 +0000 (23:14 +0000)]
Merge "Fix integer overflow and divide-by-zero" into klp-dev am: b264ece2c0 am: bbca2719c6 am: c2e69851ea am: 3285770d37 am: d935c7f16e am: 98ee832c7e am: 1db2ee3dbd am: 946a690f5c am: 5fef11c61a
am: 3a3cc883c1

Change-Id: Iefe473341e64546c69ee98a8a4e47b17903ca02d

7 years agoMerge "Fix NPDs in h263 decoder" into klp-dev am: 012e5fd39e am: 9e8dfb5938 am: 9e4a0...
Marco Nelissen [Mon, 13 Mar 2017 23:14:42 +0000 (23:14 +0000)]
Merge "Fix NPDs in h263 decoder" into klp-dev am: 012e5fd39e am: 9e8dfb5938 am: 9e4a0e1fab am: 3c4401fce8 am: 8867ca40df am: 4ba3934ec3 am: 89349b8d29 am: 176e7e8183 am: 0cbbb5c561
am: 2e1457123f

Change-Id: Idf145d96a408f70a6b5637af0603832f8dfdbcd7

7 years agoMerge "Fix out of bounds access" into klp-dev am: 360cbbd72c am: f71b76cae8 am: 36c2e...
Marco Nelissen [Mon, 13 Mar 2017 23:14:25 +0000 (23:14 +0000)]
Merge "Fix out of bounds access" into klp-dev am: 360cbbd72c am: f71b76cae8 am: 36c2e14da3 am: 8a3cc1963e am: 5b0ca6a92c am: d270a899c2 am: 8f2b91f0a1 am: 6e25e6f7a2 am: f375fd0f70
am: 5d1ce82bb3

Change-Id: Ia8706bf387c1f779f31952fe287e3414e67ccbbe

7 years agoMerge "Add bounds check in SoftAACEncoder2::onQueueFilled()" into klp-dev am: 19b91af...
Ray Essick [Mon, 13 Mar 2017 23:14:14 +0000 (23:14 +0000)]
Merge "Add bounds check in SoftAACEncoder2::onQueueFilled()" into klp-dev am: 19b91af752 am: 8e3cf4d841 am: 5b1bfc1f43 am: 8abf11b512 am: 4bc4f78933 am: 7f2592fe4a am: dbdf026f76
am: c4305aeda4

Change-Id: Idac42ec10c4295ae4e5761531b96bd4ce58a8473

7 years agoMerge "Fix TOCTOU problem in libstagefright_soft_aacenc" into klp-dev am: 2076915c5f...
Ray Essick [Mon, 13 Mar 2017 23:13:59 +0000 (23:13 +0000)]
Merge "Fix TOCTOU problem in libstagefright_soft_aacenc" into klp-dev am: 2076915c5f am: dcda2ec2fe am: f5c7784dbd am: c3de266a99 am: 8655d4fc01 am: b05be00f56 am: eb58ce5bb0
am: a830539187

Change-Id: I10929475d031fb3d1b6aab57bd2041f40e5bcf01

7 years agoMerge "Fix integer overflow and divide-by-zero" into klp-dev am: b264ece2c0 am: bbca2...
Marco Nelissen [Mon, 13 Mar 2017 23:09:59 +0000 (23:09 +0000)]
Merge "Fix integer overflow and divide-by-zero" into klp-dev am: b264ece2c0 am: bbca2719c6 am: c2e69851ea am: 3285770d37 am: d935c7f16e am: 98ee832c7e am: 1db2ee3dbd am: 946a690f5c
am: 5fef11c61a

Change-Id: I39d07c6a978c2e0c2b4c6f8bc02135c1acbb3ba5

7 years agoMerge "Fix NPDs in h263 decoder" into klp-dev am: 012e5fd39e am: 9e8dfb5938 am: 9e4a0...
Marco Nelissen [Mon, 13 Mar 2017 23:09:44 +0000 (23:09 +0000)]
Merge "Fix NPDs in h263 decoder" into klp-dev am: 012e5fd39e am: 9e8dfb5938 am: 9e4a0e1fab am: 3c4401fce8 am: 8867ca40df am: 4ba3934ec3 am: 89349b8d29 am: 176e7e8183
am: 0cbbb5c561

Change-Id: I2dc56447dd0386046bc765110a545b967237e63b