OSDN Git Service
Marco Nelissen [Thu, 13 Oct 2016 23:28:29 +0000 (23:28 +0000)]
Merge "DO NOT MERGE Fix divide by zero" into klp-dev am:
2c28e5b126
am:
a5477b11be
Change-Id: I23bc38094b99e0563a4aeeb7df08631212d0b73a
Marco Nelissen [Thu, 13 Oct 2016 23:28:17 +0000 (23:28 +0000)]
DO NOT MERGE Fix divide by zero am:
febbd52cd9
am:
55ce7e5d1e
Change-Id: I792667b35aacfa1b910a332d855f002615041408
Marco Nelissen [Thu, 13 Oct 2016 23:25:47 +0000 (23:25 +0000)]
Merge "DO NOT MERGE Fix divide by zero" into klp-dev
am:
2c28e5b126
Change-Id: Ic69824aeaf760eb6b5e79fef78be41c2cb4d749e
Marco Nelissen [Thu, 13 Oct 2016 23:25:47 +0000 (23:25 +0000)]
DO NOT MERGE Fix divide by zero
am:
febbd52cd9
Change-Id: I229ab9fee73b63493c4e61493de6183857ef886a
Marco Nelissen [Thu, 13 Oct 2016 23:19:54 +0000 (23:19 +0000)]
Merge "DO NOT MERGE Fix divide by zero" into klp-dev
Ricardo Garcia [Thu, 13 Oct 2016 01:26:59 +0000 (01:26 +0000)]
Merge "Fix potential NULL dereference in Visualizer effect" into klp-dev am:
eee86b009e
am:
6732f45ee9
Change-Id: Ic59a0ab61486e1a420988653e4276b3f5e660729
rago [Thu, 13 Oct 2016 01:26:47 +0000 (01:26 +0000)]
Fix potential NULL dereference in Visualizer effect am:
874f9e0b8e
am:
f060479b9a
Change-Id: I69eb3819f246e6d807af099f9a0260146cd06fd2
Ricardo Garcia [Thu, 13 Oct 2016 01:19:49 +0000 (01:19 +0000)]
Merge "Fix potential NULL dereference in Visualizer effect" into klp-dev
am:
eee86b009e
Change-Id: Id6c3168ccbf272646f123090ab4fadab34b0f728
rago [Thu, 13 Oct 2016 01:19:48 +0000 (01:19 +0000)]
Fix potential NULL dereference in Visualizer effect
am:
874f9e0b8e
Change-Id: I382b8cc3799b52e085aac0ccec7dcb668a4933ec
Ricardo Garcia [Thu, 13 Oct 2016 01:13:46 +0000 (01:13 +0000)]
Merge "Fix potential NULL dereference in Visualizer effect" into klp-dev
Pawin Vongmasa [Thu, 13 Oct 2016 01:06:30 +0000 (01:06 +0000)]
Merge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing." into klp-dev am:
8caef85235
am:
b512f4ab42
Change-Id: Ic852128c935782783fc03175be9968da6e894e90
Pawin Vongmasa [Thu, 13 Oct 2016 01:06:16 +0000 (01:06 +0000)]
DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing. am:
de84a76b86
am:
2c76c56d56
Change-Id: I24c8963da1f34e724213bbb896722a06d1eca378
Pawin Vongmasa [Thu, 13 Oct 2016 00:59:47 +0000 (00:59 +0000)]
Merge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing." into klp-dev
am:
8caef85235
Change-Id: I9b4b155c4a720b27120428ea995833c426a65fef
Pawin Vongmasa [Thu, 13 Oct 2016 00:59:46 +0000 (00:59 +0000)]
DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing.
am:
de84a76b86
Change-Id: I7bfde467167616b191ac1d75f3ea08f1ba78089b
Pawin Vongmasa [Thu, 13 Oct 2016 00:47:33 +0000 (00:47 +0000)]
Merge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing." into klp-dev
rago [Sat, 8 Oct 2016 01:16:09 +0000 (18:16 -0700)]
Fix potential NULL dereference in Visualizer effect
Bug:
30229821
Test: fixing CL. Existing unit tests still pass.
Change-Id: I6e4abd759d5d2abc3b391e92e2e18f060cab7af0
Lajos Molnar [Tue, 11 Oct 2016 22:58:40 +0000 (22:58 +0000)]
stagefright: don't fail MediaCodec.configure if clients use store-meta key am:
afb20c3102
am:
d9f6b22189
Change-Id: If02cd075a28e4b96fa1c311547a8837d67e848d5
Lajos Molnar [Tue, 11 Oct 2016 22:53:10 +0000 (22:53 +0000)]
stagefright: don't fail MediaCodec.configure if clients use store-meta key
am:
afb20c3102
Change-Id: Ia68b31d3e1781cb24e0c16f669a6b26644f33d46
Lajos Molnar [Tue, 11 Oct 2016 15:41:51 +0000 (08:41 -0700)]
stagefright: don't fail MediaCodec.configure if clients use store-meta key
Even though storing metadata is not supported in MediaCodec.configure and
is only meant to be used by Stagefright recorder, don't fail configure.
Bug:
31986922
Change-Id: Id9f083be6e857e7a0d8d4a74159be5b8894e28be
Marco Nelissen [Thu, 6 Oct 2016 22:31:52 +0000 (15:31 -0700)]
DO NOT MERGE Fix divide by zero
and be stricter about the layout of various boxes in mp4 files.
Bug:
31318219
Change-Id: I50034d5b6b1967ca6e88aabeacf49f26ba3c0d32
Pawin Vongmasa [Fri, 30 Sep 2016 07:45:52 +0000 (00:45 -0700)]
DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing.
Bug:
31449945
Change-Id: If2708b3006c22393e80a2557f93d8a71e4e7bf16
Robert Shih [Thu, 22 Sep 2016 00:43:10 +0000 (00:43 +0000)]
Merge "SampleIterator: clear members on seekTo error" into klp-dev am:
610a9222d6
am:
a78bd18c93
Change-Id: Iec88e35a497a7503b589739082b86ae5bc0e2479
Robert Shih [Thu, 22 Sep 2016 00:42:56 +0000 (00:42 +0000)]
SampleIterator: clear members on seekTo error am:
03237ce0f9
am:
8468b8980c
Change-Id: I4d81b7bd8732f03d0308740b96418203d17cd65b
Robert Shih [Thu, 22 Sep 2016 00:36:56 +0000 (00:36 +0000)]
Merge "SampleIterator: clear members on seekTo error" into klp-dev
am:
610a9222d6
Change-Id: I39efc9f85b13cb1212565b58f8907fd53b31920c
Robert Shih [Thu, 22 Sep 2016 00:36:55 +0000 (00:36 +0000)]
SampleIterator: clear members on seekTo error
am:
03237ce0f9
Change-Id: I0dd1251bd8f132b445ebf515e4555e9ec9953269
Robert Shih [Thu, 22 Sep 2016 00:25:48 +0000 (00:25 +0000)]
Merge "SampleIterator: clear members on seekTo error" into klp-dev
Marco Nelissen [Wed, 21 Sep 2016 20:41:43 +0000 (20:41 +0000)]
Merge "Limit mp4 atom size to something reasonable" into klp-dev am:
9af51c59dc
am:
3fb9e5b7cb
Change-Id: Ibcb0e44db0ff0da658af399522266606171b6a2e
Marco Nelissen [Wed, 21 Sep 2016 20:41:31 +0000 (20:41 +0000)]
Limit mp4 atom size to something reasonable am:
638c99bad6
am:
569f3db605
Change-Id: Icc063dd70e08fea6320e3d3f64ebbd4ba51d8aa8
Marco Nelissen [Wed, 21 Sep 2016 20:39:01 +0000 (20:39 +0000)]
Merge "Limit mp4 atom size to something reasonable" into klp-dev
am:
9af51c59dc
Change-Id: Id16a06b7ec4fceac9ecec7ed3504fdf233095268
Marco Nelissen [Wed, 21 Sep 2016 20:39:01 +0000 (20:39 +0000)]
Limit mp4 atom size to something reasonable
am:
638c99bad6
Change-Id: I1284a0b7a44c5f7a8d88b931114e201d8cb09601
Marco Nelissen [Wed, 21 Sep 2016 20:35:16 +0000 (20:35 +0000)]
Merge "Limit mp4 atom size to something reasonable" into klp-dev
Marco Nelissen [Mon, 19 Sep 2016 23:22:56 +0000 (16:22 -0700)]
Limit mp4 atom size to something reasonable
Bug:
28615448
Change-Id: I5916f6839b4a9bbee4388a106e7373bcd4154f5a
Marco Nelissen [Wed, 21 Sep 2016 14:41:28 +0000 (14:41 +0000)]
Check mprotect result am:
866c800c06
am:
a0cfcf38d4
Change-Id: I0f188e2c717922689df42af21f6c47a865a8c390
Marco Nelissen [Wed, 21 Sep 2016 14:38:58 +0000 (14:38 +0000)]
Check mprotect result
am:
866c800c06
Change-Id: I7b20d72aafb9a95480c1a6b16f0cafc4d1749470
Robert Shih [Wed, 21 Sep 2016 00:37:55 +0000 (17:37 -0700)]
SampleIterator: clear members on seekTo error
Bug:
31091777
Change-Id: Iddf99d0011961d0fd3d755e57db4365b6a6a1193
Marco Nelissen [Tue, 20 Sep 2016 20:36:40 +0000 (13:36 -0700)]
Check mprotect result
mprotect can theoretically fail, which could then let one exploit
a vulnerable codec if one exists on the device.
Bug:
31350239
Change-Id: I7b99c190619f0fb2eb93119596e6da0d2deb8ba5
Ricardo Garcia [Tue, 20 Sep 2016 00:39:45 +0000 (00:39 +0000)]
Merge "Fix potential overflow in Visualizer effect" into klp-dev am:
b602286952
am:
f59ab362c5
Change-Id: I9b65bbed0946bb25b25772f24256dbe1f8fe022c
rago [Tue, 20 Sep 2016 00:39:33 +0000 (00:39 +0000)]
Fix potential overflow in Visualizer effect am:
46dc714d52
am:
8720f85196
Change-Id: I0803632824e6fc5a70ad6a1ba36743eb11cc3e7e
Chong Zhang [Tue, 20 Sep 2016 00:39:03 +0000 (00:39 +0000)]
IOMX: do not clear buffer if it's allocated by component am:
ea76573aa2
am:
86d9bb9141
Change-Id: Id27e600a2c500634cd56bb8367f8d7ce811d63e8
Ricardo Garcia [Tue, 20 Sep 2016 00:35:07 +0000 (00:35 +0000)]
Merge "Fix potential overflow in Visualizer effect" into klp-dev
am:
b602286952
Change-Id: Ic0cd9c82a5417e0281db38d806956876d95801fc
rago [Tue, 20 Sep 2016 00:35:04 +0000 (00:35 +0000)]
Fix potential overflow in Visualizer effect
am:
46dc714d52
Change-Id: I61f5adb793d2c54c078211213b25fd7ea37a3895
Chong Zhang [Tue, 20 Sep 2016 00:29:11 +0000 (00:29 +0000)]
IOMX: do not clear buffer if it's allocated by component
am:
ea76573aa2
Change-Id: Id77521c1d8a2e3c0f24b3467db0cea1907d5b934
Ricardo Garcia [Tue, 20 Sep 2016 00:27:26 +0000 (00:27 +0000)]
Merge "Fix potential overflow in Visualizer effect" into klp-dev
Chong Zhang [Mon, 19 Sep 2016 22:29:04 +0000 (15:29 -0700)]
IOMX: do not clear buffer if it's allocated by component
The component might depends on their buffers to be initialized
in certain ways to work. Don't clear unless we're allocating it.
bug:
31586647
Change-Id: Ia0a125797e414998ef0cd8ce03672f5b1e0bbf7a
Lajos Molnar [Thu, 15 Sep 2016 22:39:55 +0000 (22:39 +0000)]
IOMX: allow configuration after going to loaded state am:
c13904014b
am:
99accf6cdc
Change-Id: I2f80600bad65948b26e839d8588b98a574ffba9b
Lajos Molnar [Thu, 15 Sep 2016 22:36:52 +0000 (22:36 +0000)]
IOMX: allow configuration after going to loaded state
am:
c13904014b
Change-Id: Ibc6e43830d08890077691ebd55b1515554b94053
Lajos Molnar [Wed, 14 Sep 2016 17:01:37 +0000 (10:01 -0700)]
IOMX: allow configuration after going to loaded state
This was disallowed recently but we still use it as MediaCodcec.stop
only goes to loaded state, and does not free component.
Bug:
31450460
Change-Id: I72e092e4e55c9f23b1baee3e950d76e84a5ef28d
Lajos Molnar [Fri, 9 Sep 2016 17:00:31 +0000 (17:00 +0000)]
Merge "DO NOT MERGE: IOMX: work against metadata buffer spoofing" into klp-dev am:
425cc025a1
am:
9c7f0824be
Change-Id: Ibd31110a7191c39b09947f5026c2c50af3e0146c
Lajos Molnar [Fri, 9 Sep 2016 16:59:46 +0000 (16:59 +0000)]
DO NOT MERGE: IOMX: work against metadata buffer spoofing am:
807e827d4c
am:
ee9effab3d
Change-Id: I64bd10fa5e5e5a020c129c0b77d813a2772376a0
Lajos Molnar [Fri, 9 Sep 2016 16:56:46 +0000 (16:56 +0000)]
Merge "DO NOT MERGE: IOMX: work against metadata buffer spoofing" into klp-dev
am:
425cc025a1
Change-Id: I271b7657d85973bf745d3d099d36fc6858442f88
Lajos Molnar [Fri, 9 Sep 2016 16:56:45 +0000 (16:56 +0000)]
DO NOT MERGE: IOMX: work against metadata buffer spoofing
am:
807e827d4c
Change-Id: I514b6b8fce06d666799fcd5f41238e81598c0aa9
Lajos Molnar [Fri, 9 Sep 2016 16:52:06 +0000 (16:52 +0000)]
Merge "DO NOT MERGE: IOMX: work against metadata buffer spoofing" into klp-dev
Wei Jia [Wed, 31 Aug 2016 00:05:25 +0000 (00:05 +0000)]
MediaPlayerService: allow next player to be NULL am:
2828412787
am:
f4e00a7c5a
Change-Id: I4b72afd20bbca69423d1be6ebf963ed41ded1a4e
Wei Jia [Wed, 31 Aug 2016 00:02:55 +0000 (00:02 +0000)]
MediaPlayerService: allow next player to be NULL
am:
2828412787
Change-Id: I54fad659721dde258259a503c5514d6327e521f7
Wei Jia [Tue, 30 Aug 2016 20:49:06 +0000 (13:49 -0700)]
MediaPlayerService: allow next player to be NULL
Bug:
31155917
Bug:
30204103
Change-Id: I9a2a59ddb900fc942e7c19b31b53a110d790474c
rago [Tue, 23 Aug 2016 00:20:26 +0000 (17:20 -0700)]
Fix potential overflow in Visualizer effect
Bug:
30229821
Change-Id: Idd3c1563dc9d3261e6e168e945005bf133ab2cdb
(cherry picked from commit
099ab280775946e7c36c73fde47f2ee5a2579f53)
Robert Shih [Mon, 22 Aug 2016 18:23:42 +0000 (18:23 +0000)]
Merge "DO NOT MERGE MediaPlayerService: avoid invalid static cast" into klp-dev am:
4fb531e262
am:
24b2dba452
Change-Id: Ia3933416f651d737beaae34cab4efd35e9e6156d
Robert Shih [Mon, 22 Aug 2016 18:23:40 +0000 (18:23 +0000)]
DO NOT MERGE MediaPlayerService: avoid invalid static cast am:
c159a5ae12
am:
2cee1deec9
Change-Id: I0cde33c6f069de9eac4e954e9c6ed6f6968546be
Robert Shih [Mon, 22 Aug 2016 18:12:48 +0000 (18:12 +0000)]
Merge "DO NOT MERGE MediaPlayerService: avoid invalid static cast" into klp-dev
am:
4fb531e262
Change-Id: I3cb099c3fdf0c476a92392b185d782e980a463de
Robert Shih [Mon, 22 Aug 2016 18:12:48 +0000 (18:12 +0000)]
DO NOT MERGE MediaPlayerService: avoid invalid static cast
am:
c159a5ae12
Change-Id: I3e349cb44073359b9c009100c341864468187f68
Robert Shih [Mon, 22 Aug 2016 17:53:09 +0000 (17:53 +0000)]
Merge "DO NOT MERGE MediaPlayerService: avoid invalid static cast" into klp-dev
Andy Hung [Fri, 19 Aug 2016 18:59:07 +0000 (18:59 +0000)]
Merge "Add EFFECT_CMD_SET_PARAM parameter checking" into klp-dev am:
9665548a42
am:
19294437ac
Change-Id: I926b0e3df89ff3c648c7b6896c359808300896b6
Andy Hung [Fri, 19 Aug 2016 18:59:06 +0000 (18:59 +0000)]
Add EFFECT_CMD_SET_PARAM parameter checking am:
e4a1d91501
am:
19d8a61324
Change-Id: I002990dc446d8a713f41b77671d17dbb11a914f9
Andy Hung [Fri, 19 Aug 2016 18:54:13 +0000 (18:54 +0000)]
Merge "Add EFFECT_CMD_SET_PARAM parameter checking" into klp-dev
am:
9665548a42
Change-Id: I784a0df389663da64dfa9a3eadb8b4dd6af545c7
Andy Hung [Fri, 19 Aug 2016 18:54:12 +0000 (18:54 +0000)]
Add EFFECT_CMD_SET_PARAM parameter checking
am:
e4a1d91501
Change-Id: I0b45b8c0fdccc9016717ce21de6771e9e6b6f11f
Andy Hung [Fri, 19 Aug 2016 18:49:14 +0000 (18:49 +0000)]
Merge "Add EFFECT_CMD_SET_PARAM parameter checking" into klp-dev
Pawin Vongmasa [Fri, 19 Aug 2016 16:57:03 +0000 (16:57 +0000)]
DO NOT MERGE - Fix build breakage caused by commit
940829f69b52d6038db66a9c727534636ecc456d. am:
ad929db743
am:
453ba68c65
Change-Id: I833cb55b51e554e6b2ef3227f2923def6643c9e4
Pawin Vongmasa [Fri, 19 Aug 2016 16:54:03 +0000 (16:54 +0000)]
DO NOT MERGE - Fix build breakage caused by commit
940829f69b52d6038db66a9c727534636ecc456d.
am:
ad929db743
Change-Id: Ib2ef17356334d2340a5aa0250a4b5ffbdd9c4dd0
Pawin Vongmasa [Fri, 19 Aug 2016 08:45:39 +0000 (01:45 -0700)]
DO NOT MERGE - Fix build breakage caused by commit
940829f69b52d6038db66a9c727534636ecc456d.
Change-Id: Ic55a9ab25ddb57f270c21d78ffcb556f3e11dd5d
Pawin Vongmasa [Fri, 19 Aug 2016 02:43:37 +0000 (02:43 +0000)]
DO NOT MERGE - SoftMPEG4: Check the buffer size before writing the reference frame. am:
940829f69b
am:
920b0f7887
Change-Id: I603ab931f82d8a83187be989dccb8686de8bf95e
Pawin Vongmasa [Fri, 19 Aug 2016 02:40:37 +0000 (02:40 +0000)]
DO NOT MERGE - SoftMPEG4: Check the buffer size before writing the reference frame.
am:
940829f69b
Change-Id: I3df8797998bac785ad198cb4fb2401779a3947ff
Andy Hung [Wed, 17 Aug 2016 21:11:13 +0000 (14:11 -0700)]
Add EFFECT_CMD_SET_PARAM parameter checking
Bug:
30204301
Change-Id: Ib9c3ee1c2f23c96f8f7092dd9e146bc453d7a290
Lajos Molnar [Tue, 2 Aug 2016 14:07:05 +0000 (07:07 -0700)]
DO NOT MERGE: IOMX: work against metadata buffer spoofing
- Prohibit direct set/getParam/Settings for extensions meant for
OMXNodeInstance alone. This disallows enabling metadata mode
without the knowledge of OMXNodeInstance.
- Do not share metadata mode buffers cross process.
- Disallow setting up metadata mode/input surface
after first sendCommand (except to Idle for OMXCodec quirk).
- Disallow store-meta for input cross process.
- Disallow emptyBuffer for surface input (via IOMX).
- Fix checking for input surface.
[backported from L]
Bug:
29422020
Change-Id: I801c77b80e703903f62e42d76fd2e76a34e4bc8e
Robert Shih [Tue, 16 Aug 2016 23:50:54 +0000 (16:50 -0700)]
DO NOT MERGE MediaPlayerService: avoid invalid static cast
Bug:
30204103
Change-Id: Ie0dd3568a375f1e9fed8615ad3d85184bcc99028
Pawin Vongmasa [Tue, 19 Jul 2016 03:12:02 +0000 (20:12 -0700)]
DO NOT MERGE - SoftMPEG4: Check the buffer size before writing the reference frame.
Also prevent overflow in SoftMPEG4 and division by zero in SoftMPEG4Encoder.
Bug:
30033990
Change-Id: I7701f5fc54c2670587d122330e5dc851f64ed3c2
(cherry picked from commit
695123195034402ca76169b195069c28c30342d3)
Wonsik Kim [Mon, 1 Aug 2016 20:30:39 +0000 (20:30 +0000)]
DO NOT MERGE - stagefright: fix integer overflow error am:
17a10c50e2
am:
8df5df78a3
Change-Id: Iba844e14f530d15531c5b47e7aaaedfd7849813b
Wonsik Kim [Mon, 1 Aug 2016 20:28:10 +0000 (20:28 +0000)]
DO NOT MERGE - stagefright: fix integer overflow error
am:
17a10c50e2
Change-Id: I310e406b5370678b112f5ad0603e22456d6c3de7
Wonsik Kim [Thu, 21 Jul 2016 05:43:38 +0000 (14:43 +0900)]
DO NOT MERGE - stagefright: fix integer overflow error
Bug:
30103394
Change-Id: If449d3e30a0bf2ebea5317f41813bfed094f7408
(cherry picked from commit
2c74a3cd5d1d66b9a35424b9c4443dafa6db5bef)
Wonsik Kim [Tue, 19 Jul 2016 22:46:54 +0000 (22:46 +0000)]
omx: prevent input port enable/disable for software codecs am:
2b94fa8277
am:
c83b53c9e5
Change-Id: I6eeb301a2418cae6a57e49ed29527edd5e8de2b0
Wonsik Kim [Tue, 19 Jul 2016 22:44:18 +0000 (22:44 +0000)]
omx: prevent input port enable/disable for software codecs
am:
2b94fa8277
Change-Id: I5c370c34986be1435f2d0eebae8e264c0f4f0f44
Wonsik Kim [Thu, 7 Jul 2016 03:57:02 +0000 (12:57 +0900)]
omx: prevent input port enable/disable for software codecs
Bug:
29421804
Change-Id: Iba1011e9af942a6dff7f659af769a51e3f5ba66f
Robert Shih [Thu, 14 Jul 2016 23:01:31 +0000 (23:01 +0000)]
DO NOT MERGE - Fix build am:
bf835e4525
am:
98b31b9270
Change-Id: Ib3dd2d315096bcb31dbfcd5be66f00d482594c9b
Robert Shih [Thu, 14 Jul 2016 22:58:30 +0000 (22:58 +0000)]
DO NOT MERGE - Fix build
am:
bf835e4525
Change-Id: Idd0b7779345c8b4c595681de7431c3339b44129e
Robert Shih [Thu, 14 Jul 2016 22:32:08 +0000 (15:32 -0700)]
DO NOT MERGE - Fix build
Change-Id: Iff47bb735778fb275abeee573c636856b839feb5
Robert Shih [Thu, 14 Jul 2016 01:37:58 +0000 (01:37 +0000)]
Merge \\"DO NOT MERGE - SoftMP3: memset safely\\" into klp-dev am:
3242dcf6e9
am:
f4ad14f154
Change-Id: Iec5f4a53a3db5fbb40bfecd4bddf4b3f607ae450
Robert Shih [Thu, 14 Jul 2016 01:31:29 +0000 (01:31 +0000)]
Merge \"DO NOT MERGE - SoftMP3: memset safely\" into klp-dev
am:
3242dcf6e9
Change-Id: I09c381c92c7efeacc95c611b2775d875a6202027
Robert Shih [Thu, 14 Jul 2016 01:26:14 +0000 (01:26 +0000)]
Merge "DO NOT MERGE - SoftMP3: memset safely" into klp-dev
Robert Shih [Thu, 14 Jul 2016 01:25:31 +0000 (01:25 +0000)]
Merge \\"DO NOT MERGE - SoftVPX: fix nFilledLen overflow\\" into klp-dev am:
91ad8847ab
am:
74b10b831c
Change-Id: I2b300c5f4993d4beb866e4f1c94eb4fece1149e2
Robert Shih [Thu, 14 Jul 2016 01:25:30 +0000 (01:25 +0000)]
Merge \\"OMXCodec: check IMemory::pointer() before using allocation\\" into klp-dev am:
f545c72b97
am:
d89781f3be
Change-Id: Iae2cc6d8f4512e7e1f4273bbb28b292337e291b6
Robert Shih [Thu, 14 Jul 2016 01:22:56 +0000 (01:22 +0000)]
Merge \"DO NOT MERGE - SoftVPX: fix nFilledLen overflow\" into klp-dev
am:
91ad8847ab
Change-Id: I66eec25f4bc143dd5d67b9bb77825f6e6c732880
Robert Shih [Thu, 14 Jul 2016 01:22:56 +0000 (01:22 +0000)]
Merge \"OMXCodec: check IMemory::pointer() before using allocation\" into klp-dev
am:
f545c72b97
Change-Id: I9206ce86485cb3acc2540d135f6beacc03bb38f5
Robert Shih [Thu, 14 Jul 2016 01:18:10 +0000 (01:18 +0000)]
Merge "DO NOT MERGE - SoftVPX: fix nFilledLen overflow" into klp-dev
Robert Shih [Thu, 14 Jul 2016 01:16:52 +0000 (01:16 +0000)]
Merge "OMXCodec: check IMemory::pointer() before using allocation" into klp-dev
Robert Shih [Mon, 27 Jun 2016 20:55:14 +0000 (13:55 -0700)]
DO NOT MERGE - SoftMP3: memset safely
Bug:
29422022
Change-Id: I70c9e33269d16bf8c163815706ac24e18e34fe97
Robert Shih [Fri, 24 Jun 2016 19:37:45 +0000 (12:37 -0700)]
DO NOT MERGE - SoftVPX: fix nFilledLen overflow
Bug:
29421675
Change-Id: I25d4cf54a5df22c2130c37e95c7c7f75063111f3
Ray Essick [Wed, 13 Jul 2016 22:41:18 +0000 (22:41 +0000)]
Merge \\"Fix corruption via buffer overflow in mediaserver\\" into klp-dev am:
b5299033ce
am:
357e0f132e
Change-Id: Ia387bc54c8d51975aa4c938616a43e47cb3338d9
Ray Essick [Wed, 13 Jul 2016 22:38:29 +0000 (22:38 +0000)]
Merge \"Fix corruption via buffer overflow in mediaserver\" into klp-dev
am:
b5299033ce
Change-Id: I774cb0256be49317851488879221a1c3602148f3
Ray Essick [Wed, 13 Jul 2016 22:12:57 +0000 (22:12 +0000)]
Merge "Fix corruption via buffer overflow in mediaserver" into klp-dev
Wonsik Kim [Wed, 13 Jul 2016 03:56:57 +0000 (03:56 +0000)]
Merge \\"DO NOT MERGE stagefright: fix possible stack overflow in AVCC reassemble\\" into klp-dev am:
b239e27433
am:
cc3c549065
Change-Id: I772fba4484975a2f28fc947e4a16296b400f5a99
Wonsik Kim [Wed, 13 Jul 2016 03:45:39 +0000 (03:45 +0000)]
Merge \"DO NOT MERGE stagefright: fix possible stack overflow in AVCC reassemble\" into klp-dev
am:
b239e27433
Change-Id: I2f3e5b3b1e4451506e7c66ced8222137d504abdb