OSDN Git Service
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
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
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
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
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
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
Ricardo Garcia [Wed, 7 Jun 2017 13:19:48 +0000 (13:19 +0000)]
Merge "Fix security vulnerability: Equalizer setParameter memory overflow" into klp-dev
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
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
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
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
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
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
TreeHugger Robot [Wed, 7 Jun 2017 04:51:35 +0000 (04:51 +0000)]
Merge "Check the buffer index from acquireBuffer" into klp-dev
TreeHugger Robot [Wed, 7 Jun 2017 02:05:17 +0000 (02:05 +0000)]
Merge "Check the buffer index from acquireBuffer" into mnc-dev
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
TreeHugger Robot [Tue, 6 Jun 2017 20:10:08 +0000 (20:10 +0000)]
Merge "better manage buffer for libstagefright_soft_mpeg4enc" into klp-dev
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
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
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
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
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
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
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
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
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
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
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
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
Jeff Tinker [Tue, 6 Jun 2017 19:05:36 +0000 (19:05 +0000)]
Fix integer overflow in mediadrmserver
am:
eb21712f81
Change-Id: I0caf94590f85f444a4705f62792c27a447fa8b69
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
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
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
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
Jeff Tinker [Mon, 5 Jun 2017 21:34:48 +0000 (14:34 -0700)]
Fix integer overflow in mediadrmserver
bug:
37710346
Change-Id: If18cfb5bb1d1f1b2997d2a0e1685590d674181f4
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
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
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
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
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
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
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
TreeHugger Robot [Fri, 2 Jun 2017 04:02:09 +0000 (04:02 +0000)]
Merge "Fix potential leak" into klp-dev
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)
TreeHugger Robot [Thu, 1 Jun 2017 23:07:47 +0000 (23:07 +0000)]
Merge "Fix potential leak" into mnc-dev
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
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
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
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
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
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)
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
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
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
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
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
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
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
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
Marco Nelissen [Tue, 16 May 2017 15:20:59 +0000 (15:20 +0000)]
Merge "Fix memory leak in error case" into klp-dev
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
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
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
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
Marco Nelissen [Mon, 15 May 2017 16:53:54 +0000 (16:53 +0000)]
Limit ogg packet size am:
bf928560ac
am:
f349435fcf
Change-Id: I952944295017f01b254c80c8db935e33c51337f3
Marco Nelissen [Mon, 15 May 2017 16:50:55 +0000 (16:50 +0000)]
Limit ogg packet size
am:
bf928560ac
Change-Id: I102f6e9b1b4933d043b2a3e1e3f7fc885aaf6779
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
Marco Nelissen [Fri, 12 May 2017 17:45:14 +0000 (10:45 -0700)]
Fix memory leak in error case
Bug:
37239013
Change-Id: Ic33e0f7ed946d0729efa46f69aff1a5d35e81b1e
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
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
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
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
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
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
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
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
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
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
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
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
OSDN Git Service
