git.osdn.net Git - android-x86/frameworks-av.git/log

Marco Nelissen [Wed, 16 Mar 2016 17:32:05 +0000 (10:32 -0700)]

Add VPX output buffer size check

and handle dead observers more gracefully

Bug: 27597103
Change-Id: Id7acb25d5ef69b197da15ec200a9e4f9e7b03518

commit | commitdiff | tree

Marco Nelissen [Wed, 16 Mar 2016 17:53:16 +0000 (17:53 +0000)]

DO NOT MERGE Don\'t reject "thumbnail mode" setConfig am: 09e024f
am: 50af72b -s ours

* commit '50af72bcc5f5d84831d57333e64f439fcf125795':
DO NOT MERGE Don't reject "thumbnail mode" setConfig

commit | commitdiff | tree

Marco Nelissen [Wed, 16 Mar 2016 17:51:01 +0000 (17:51 +0000)]

DO NOT MERGE Don\'t reject "thumbnail mode" setConfig
am: 09e024f

* commit '09e024fe9a8dd9646e053275dd636301a9d463f0':
DO NOT MERGE Don't reject "thumbnail mode" setConfig

commit | commitdiff | tree

Marco Nelissen [Wed, 16 Mar 2016 17:45:01 +0000 (17:45 +0000)]

Merge "DO NOT MERGE Don't reject "thumbnail mode" setConfig" into lmp-dev

commit | commitdiff | tree

Marco Nelissen [Tue, 15 Mar 2016 20:19:56 +0000 (20:19 +0000)]

Merge "Fix initialization of AAC presentation struct" into lmp-dev

commit | commitdiff | tree

Marco Nelissen [Fri, 11 Mar 2016 22:40:17 +0000 (14:40 -0800)]

DO NOT MERGE Don't reject "thumbnail mode" setConfig

Bug: 27207275
Change-Id: I35f6bf5b407869a9479feaf1b5beef7b68d04509

commit | commitdiff | tree

Marco Nelissen [Fri, 11 Mar 2016 22:40:17 +0000 (14:40 -0800)]

DO NOT MERGE Don't reject "thumbnail mode" setConfig

Bug: 27207275
Change-Id: I35f6bf5b407869a9479feaf1b5beef7b68d04509

commit | commitdiff | tree

Marco Nelissen [Thu, 10 Mar 2016 22:29:26 +0000 (14:29 -0800)]

Fix initialization of AAC presentation struct

Otherwise the new size checks trip on this.

Bug: 27207275
Change-Id: I1f8f01097e3a88ff041b69279a6121be842f1766

commit | commitdiff | tree

Marco Nelissen [Fri, 4 Mar 2016 23:35:31 +0000 (23:35 +0000)]

Merge "DO NOT MERGE Verify OMX buffer sizes prior to access" into klp-dev am: d579ad0639
am: f0e76eb64b -s ours

* commit 'f0e76eb64b49f84a4b299ed0573144b9278bb92c':
DO NOT MERGE Verify OMX buffer sizes prior to access

commit | commitdiff | tree

Marco Nelissen [Fri, 4 Mar 2016 23:33:30 +0000 (23:33 +0000)]

Merge "DO NOT MERGE Verify OMX buffer sizes prior to access" into klp-dev
am: d579ad0639

* commit 'd579ad0639c6df7f4648047992aaaf00f107799c':
DO NOT MERGE Verify OMX buffer sizes prior to access

commit | commitdiff | tree

Marco Nelissen [Fri, 4 Mar 2016 23:22:59 +0000 (23:22 +0000)]

Merge "DO NOT MERGE Verify OMX buffer sizes prior to access" into klp-dev

commit | commitdiff | tree

Marco Nelissen [Mon, 29 Feb 2016 20:47:20 +0000 (12:47 -0800)]

DO NOT MERGE Verify OMX buffer sizes prior to access

Bug: 27207275
Change-Id: I4412825d1ee233d993af0a67708bea54304ff62d

commit | commitdiff | tree

Marco Nelissen [Mon, 29 Feb 2016 20:47:20 +0000 (12:47 -0800)]

DO NOT MERGE Verify OMX buffer sizes prior to access

Bug: 27207275
Change-Id: I4412825d1ee233d993af0a67708bea54304ff62d

commit | commitdiff | tree

Marco Nelissen [Wed, 24 Feb 2016 21:37:27 +0000 (21:37 +0000)]

Merge "Also fix out of bounds access for normal read" into klp-dev am: dc17049b02
am: fc4f739667

* commit 'fc4f739667f3eaa06f28a883f72a798db3e98027':
Also fix out of bounds access for normal read

commit | commitdiff | tree

Marco Nelissen [Wed, 24 Feb 2016 21:37:05 +0000 (21:37 +0000)]

Get service by value instead of reference am: 61a6d26aab
am: 93f5bcab20

* commit '93f5bcab205f8d7cd4557eacda513867e8b8ea65':
Get service by value instead of reference

commit | commitdiff | tree

Marco Nelissen [Wed, 24 Feb 2016 21:24:36 +0000 (21:24 +0000)]

Merge "Also fix out of bounds access for normal read" into klp-dev
am: dc17049b02

* commit 'dc17049b0294dd6b0b2156783d83333cca37fc4b':
Also fix out of bounds access for normal read

commit | commitdiff | tree

Marco Nelissen [Wed, 24 Feb 2016 21:24:09 +0000 (21:24 +0000)]

Get service by value instead of reference
am: 61a6d26aab

* commit '61a6d26aab95870279b274e565c1495748befde0':
Get service by value instead of reference

commit | commitdiff | tree

Marco Nelissen [Wed, 24 Feb 2016 21:05:22 +0000 (21:05 +0000)]

Merge "Also fix out of bounds access for normal read" into klp-dev

commit | commitdiff | tree

Marco Nelissen [Thu, 18 Feb 2016 16:25:47 +0000 (08:25 -0800)]

Get service by value instead of reference

to prevent a cleared service binder from being used.

Bug: 26040840
Change-Id: Ifb5483c55b172d3553deb80dbe27f2204b86ecdb

commit | commitdiff | tree

Marco Nelissen [Tue, 23 Feb 2016 22:48:46 +0000 (14:48 -0800)]

Also fix out of bounds access for normal read

Previous fix accidentally only fixed the fragmented read case.

Bug: 27208621
Change-Id: Ie16f1920b84c8aba613842659238fcd5925694ad

commit | commitdiff | tree

Marco Nelissen [Tue, 23 Feb 2016 04:25:07 +0000 (04:25 +0000)]

Clear allocation to avoid info leak am: f7a388203a
am: 33514675f6

* commit '33514675f6588d70a203b2c9200792bca18d425c':
Clear allocation to avoid info leak

commit | commitdiff | tree

Marco Nelissen [Tue, 23 Feb 2016 04:18:18 +0000 (04:18 +0000)]

Clear allocation to avoid info leak
am: f7a388203a

* commit 'f7a388203a1632084dbe3307d7e3265f689bc11e':
Clear allocation to avoid info leak

commit | commitdiff | tree

Marco Nelissen [Mon, 22 Feb 2016 21:05:15 +0000 (13:05 -0800)]

Clear allocation to avoid info leak

Bug: 26914474
Change-Id: Ie1a86e86d78058d041149fe599a4996e7f8185cf

commit | commitdiff | tree

mspector@google.com [Mon, 8 Feb 2016 18:56:13 +0000 (10:56 -0800)]

IOMX.cpp uninitialized pointer in BnOMX::onTransact

This can lead to local code execution in media server.
Fix initializes the pointer and checks the error conditions before
returning

Bug: 26403627
Change-Id: I7fa90682060148448dba01d6acbe3471d1ddb500

commit | commitdiff | tree

Vignesh Venkatasubramanian [Thu, 21 Jan 2016 02:42:46 +0000 (02:42 +0000)]

DO NOT MERGE - Remove deprecated image defines am: c73b811066
am: 87ca2397c4 -s ours

* commit '87ca2397c48faf480f6f9f532e4a1c04aeface2a':
DO NOT MERGE - Remove deprecated image defines

commit | commitdiff | tree

Vignesh Venkatasubramanian [Thu, 21 Jan 2016 02:40:52 +0000 (02:40 +0000)]

DO NOT MERGE - Remove deprecated image defines
am: c73b811066

* commit 'c73b811066319b2c7bbd1bc876a73f53a16f07e0':
DO NOT MERGE - Remove deprecated image defines

commit | commitdiff | tree

Vignesh Venkatasubramanian [Thu, 21 Jan 2016 02:36:13 +0000 (02:36 +0000)]

Merge "DO NOT MERGE - Remove deprecated image defines" into lmp-dev

commit | commitdiff | tree

Vignesh Venkatasubramanian [Fri, 15 Jan 2016 17:47:27 +0000 (09:47 -0800)]

DO NOT MERGE - Remove deprecated image defines

libvpx has always supported the VPX_ prefixed versions of these defines.
The unprefixed versions have been removed in the most recent release.

https://chromium.googlesource.com/webm/libvpx/+/9cdaa3d72eade9ad162ef8f78a93bd8f85c6de10

BUG=23452792

Change-Id: I8a656f2262f117d7a95271f45100b8c6fd0a470f

commit | commitdiff | tree

Vignesh Venkatasubramanian [Wed, 13 Jan 2016 20:18:05 +0000 (12:18 -0800)]

commit | commitdiff | tree

Eino-Ville Talvala [Thu, 14 Jan 2016 22:55:37 +0000 (14:55 -0800)]

resolve merge conflicts of 88b736a198 to lmp-dev.

Change-Id: Iec3cf4fb4bf75be853a1249ee1439eb4c5b38b50

commit | commitdiff | tree

Eino-Ville Talvala [Thu, 14 Jan 2016 22:34:55 +0000 (22:34 +0000)]

Camera: Disallow dumping clients directly
am: c9ab2b0bb0

* commit 'c9ab2b0bb05a7e19fb057e79b36e232809d70122':
Camera: Disallow dumping clients directly

commit | commitdiff | tree

Eino-Ville Talvala [Wed, 13 Jan 2016 18:07:04 +0000 (10:07 -0800)]

Camera: Disallow dumping clients directly

Camera service dumps should only be initiated through
ICameraService::dump.

Bug: 26265403
Change-Id: If3ca4718ed74bf33ad8a416192689203029e2803

commit | commitdiff | tree

Marco Nelissen [Tue, 12 Jan 2016 22:56:21 +0000 (22:56 +0000)]

Fix out-of-bounds write am: 5403587a74
am: fb2eb86102

* commit 'fb2eb8610208d3ad2ea69f57a151ffe436c6c6e6':
Fix out-of-bounds write

commit | commitdiff | tree

Marco Nelissen [Tue, 12 Jan 2016 22:54:38 +0000 (22:54 +0000)]

Fix out-of-bounds write
am: 5403587a74

* commit '5403587a74aee2fb57076528c3927851531c8afb':
Fix out-of-bounds write

commit | commitdiff | tree

Marco Nelissen [Tue, 12 Jan 2016 20:37:36 +0000 (12:37 -0800)]

Fix out-of-bounds write

Bug: 26365349
Change-Id: Ia363d9f8c231cf255dea852e0bbf5ca466c7990b

commit | commitdiff | tree

Eric Laurent [Tue, 12 Jan 2016 01:58:50 +0000 (01:58 +0000)]

fix possible overflow in effect wrappers. am: 9e29523b95
am: baebc739b0

* commit 'baebc739b0fe7257b26bfe105b67409559171c82':
fix possible overflow in effect wrappers.

commit | commitdiff | tree

Eric Laurent [Tue, 12 Jan 2016 01:56:51 +0000 (01:56 +0000)]

fix possible overflow in effect wrappers.
am: 9e29523b95

* commit '9e29523b9537983b4c4b205ff868d0b3bca0383b':
fix possible overflow in effect wrappers.

commit | commitdiff | tree

Eric Laurent [Fri, 8 Jan 2016 18:52:38 +0000 (10:52 -0800)]

fix possible overflow in effect wrappers.

Add checks on parameter size field in effect command handlers
to avoid overflow leading to invalid comparison with min allowed
size for command and reply buffers.

Bug: 26347509.
Change-Id: I20e6a9b6de8e5172b957caa1ac9410b9752efa4d
(cherry picked from commit ad1bd92a49d78df6bc6e75bee68c517c1326f3cf)

commit | commitdiff | tree

Andy Hung [Thu, 3 Dec 2015 22:58:49 +0000 (22:58 +0000)]

DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread am: 3d6a714980
am: 208bc477d9 -s ours

* commit '208bc477d92dbd2e5b4d1c0b2d000fa4c231e9d3':
DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread

commit | commitdiff | tree

Andy Hung [Thu, 3 Dec 2015 22:55:36 +0000 (22:55 +0000)]

DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread
am: 3d6a714980

* commit '3d6a7149802928ecf3f58b7218b0e82699b492df':
DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread

commit | commitdiff | tree

Andy Hung [Thu, 3 Dec 2015 22:48:03 +0000 (22:48 +0000)]

Merge "DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread" into lmp-dev

commit | commitdiff | tree

Andy Hung [Wed, 2 Dec 2015 23:55:23 +0000 (15:55 -0800)]

DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread

Sample decoding still occurs in SoundPoolThread
without holding the SoundPool lock.

Bug: 25781119
Change-Id: I11fde005aa9cf5438e0390a0d2dfe0ec1dd282e8

commit | commitdiff | tree

Wei Jia [Thu, 3 Dec 2015 17:56:44 +0000 (17:56 +0000)]

DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 6afc659b00
am: 9e1d7751b1 -s ours

* commit '9e1d7751b12ea976323abc1fe7760323ab142d39':
DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.

commit | commitdiff | tree

Wei Jia [Thu, 3 Dec 2015 17:53:24 +0000 (17:53 +0000)]

DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.
am: 6afc659b00

* commit '6afc659b00c3f4a83b9f5f3c744b7119b33340b4':
DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.

commit | commitdiff | tree

Wei Jia [Fri, 20 Nov 2015 18:34:35 +0000 (10:34 -0800)]

DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.

Bug: 25812794
Change-Id: I96dc74734380d462583f6efa33d09946f9532809
(cherry picked from commit 87f8cbb223ee516803dbb99699320c2484cbf3ba)

commit | commitdiff | tree

Wei Jia [Fri, 20 Nov 2015 18:34:35 +0000 (10:34 -0800)]

commit | commitdiff | tree

Andy Hung [Wed, 2 Dec 2015 23:55:23 +0000 (15:55 -0800)]

commit | commitdiff | tree

Wei Jia [Thu, 22 Oct 2015 18:35:04 +0000 (11:35 -0700)]

GenericSource: reset mDecryptHandle when mDataSource is cleared.

Bug: 25070434
Change-Id: Ib0eb6a419683a0e686a4f63b82e9300cb1f69484
(cherry picked from commit cdc9cf656a8e43875234cb021fffeb4792d7c74e)

commit | commitdiff | tree

Wei Jia [Mon, 19 Oct 2015 23:14:14 +0000 (16:14 -0700)]

GenericSource: reset mDrmManagerClient when mDataSource is cleared.

Bug: 25070434
Change-Id: Iade3472c496ac42456e42db35e402f7b66416f5b
(cherry picked from commit b41fd0d4929f0a89811bafcc4fd944b128f00ce2)

commit | commitdiff | tree

Jon Larimer [Tue, 20 Oct 2015 21:19:00 +0000 (21:19 +0000)]

Merge "stagefright: MPEG4Extractor: allow \'hdlr\' box before first track" into klp-dev am: b1a13d01dc
am: 781cd4f37d

* commit '781cd4f37d4b81a8e5af45a3ba6cdd4cdd209a3e':
stagefright: MPEG4Extractor: allow 'hdlr' box before first track

commit | commitdiff | tree

Jon Larimer [Tue, 20 Oct 2015 21:12:16 +0000 (21:12 +0000)]

Merge "stagefright: MPEG4Extractor: allow \'hdlr\' box before first track" into klp-dev
am: b1a13d01dc

* commit 'b1a13d01dccbc48ea54aeb4a4ba7fce636ff1daa':
stagefright: MPEG4Extractor: allow 'hdlr' box before first track

commit | commitdiff | tree

Jon Larimer [Tue, 20 Oct 2015 20:55:20 +0000 (20:55 +0000)]

Merge "stagefright: MPEG4Extractor: allow 'hdlr' box before first track" into klp-dev

commit | commitdiff | tree

Lajos Molnar [Mon, 19 Oct 2015 19:17:30 +0000 (19:17 +0000)]

Merge "stagefright: check bounds for MediaCodecList.getCodecInfo" into lmp-dev

commit | commitdiff | tree

Glenn Kasten [Wed, 14 Oct 2015 20:46:29 +0000 (20:46 +0000)]

am 5a018d15: (-s ours) am 0f21a688: Merge "DO NOT MERGE - AudioFlinger: Clear record buffers when starting RecordThread" into klp-dev

* commit '5a018d15da438933c30de4b25bcff527331cf8df':
DO NOT MERGE - AudioFlinger: Clear record buffers when starting RecordThread

commit | commitdiff | tree

Glenn Kasten [Wed, 14 Oct 2015 20:40:42 +0000 (20:40 +0000)]

am 0f21a688: Merge "DO NOT MERGE - AudioFlinger: Clear record buffers when starting RecordThread" into klp-dev

* commit '0f21a6880e74b56834940a131df912a49b70e82d':
DO NOT MERGE - AudioFlinger: Clear record buffers when starting RecordThread

commit | commitdiff | tree

Glenn Kasten [Wed, 14 Oct 2015 20:30:55 +0000 (20:30 +0000)]

Merge "DO NOT MERGE - AudioFlinger: Clear record buffers when starting RecordThread" into klp-dev

commit | commitdiff | tree

Glenn Kasten [Wed, 14 Oct 2015 20:30:40 +0000 (20:30 +0000)]

Merge "DO NOT MERGE - AudioFlinger: Clear record buffers when starting RecordThread" into lmp-dev

commit | commitdiff | tree

Andy Hung [Tue, 13 Oct 2015 18:21:28 +0000 (18:21 +0000)]

Merge "DO NOT MERGE - audio policy: fix commit dea1541f" into lmp-dev

commit | commitdiff | tree

Andy Hung [Tue, 13 Oct 2015 00:46:20 +0000 (00:46 +0000)]

Merge "DO NOT MERGE - audio policy: validate stream type received from binder calls." into lmp-dev

commit | commitdiff | tree

Lajos Molnar [Tue, 13 Oct 2015 00:10:31 +0000 (17:10 -0700)]

stagefright: check bounds for MediaCodecList.getCodecInfo

Bug: 24445127
Change-Id: I1c6cb9e2518b852d48d5d0d625b54409bd4e13ec

commit | commitdiff | tree

Wei Jia [Thu, 8 Oct 2015 16:53:23 +0000 (16:53 +0000)]

am dd184a48: (-s ours) am 3b4a72ac: Merge "DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer." into klp-dev

* commit 'dd184a4824acc31160895e2c6f8d93a7facfc2c8':
DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer.

commit | commitdiff | tree

Wei Jia [Thu, 8 Oct 2015 16:48:33 +0000 (16:48 +0000)]

am 3b4a72ac: Merge "DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer." into klp-dev

* commit '3b4a72acf039c58c33807b6d6fcdd5e09eafb1df':
DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer.

commit | commitdiff | tree

Wei Jia [Thu, 8 Oct 2015 16:37:35 +0000 (16:37 +0000)]

Merge "DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer." into lmp-dev

commit | commitdiff | tree

Wei Jia [Thu, 8 Oct 2015 16:37:26 +0000 (16:37 +0000)]

Merge "DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer." into klp-dev

commit | commitdiff | tree

Wei Jia [Mon, 28 Sep 2015 18:32:23 +0000 (11:32 -0700)]

DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer.

Bug: 24310423
Change-Id: Iebcfc58b447f925ec2134898060af2ef227266a3
(cherry picked from commit 8dde7269a5356503d2b283234b6cb46d0c3f214e)

commit | commitdiff | tree

Wei Jia [Mon, 28 Sep 2015 18:32:23 +0000 (11:32 -0700)]

commit | commitdiff | tree

Wei Jia [Tue, 6 Oct 2015 22:23:18 +0000 (22:23 +0000)]

am fc0e2a87: am 7ed8d1ef: ID3: check possible integer overflow for extendedHeaderSize and paddingSize.

* commit 'fc0e2a87c17b1f326b5e3302e8f534c143fd5784':
ID3: check possible integer overflow for extendedHeaderSize and paddingSize.

commit | commitdiff | tree

Wei Jia [Tue, 6 Oct 2015 22:17:52 +0000 (22:17 +0000)]

am 7ed8d1ef: ID3: check possible integer overflow for extendedHeaderSize and paddingSize.

* commit '7ed8d1eff9b292b3c65a875b13a549e29654534b':
ID3: check possible integer overflow for extendedHeaderSize and paddingSize.

commit | commitdiff | tree

Wei Jia [Mon, 5 Oct 2015 17:44:23 +0000 (10:44 -0700)]

ID3: check possible integer overflow for extendedHeaderSize and paddingSize.

Bug: 24623447
Change-Id: Ifbc74454d6e28ad7136efe35ab638a07e46398b1
(cherry picked from commit b3694ff5a5bcecd4b6cedca156f6effb55bbf4ca)

commit | commitdiff | tree

Marco Nelissen [Tue, 6 Oct 2015 17:03:00 +0000 (17:03 +0000)]

am 00f5fa82: am 74d1927e: Merge "Check NAL size before use" into klp-dev

* commit '00f5fa82d884c0ca41ee08e7a67ab54238109083':
Check NAL size before use

commit | commitdiff | tree

Marco Nelissen [Tue, 6 Oct 2015 16:45:37 +0000 (16:45 +0000)]

am 74d1927e: Merge "Check NAL size before use" into klp-dev

* commit '74d1927e4122a1748f89ca2ef79406fc06ee94b2':
Check NAL size before use

commit | commitdiff | tree

Wei Jia [Tue, 6 Oct 2015 16:38:51 +0000 (16:38 +0000)]

am 60b25aa0: am 9ab9c85e: Merge "MPEG4Extractor: ensure buffer size is not less than 8 for LastCommentData." into klp-dev

* commit '60b25aa0c173854593743dd85588c7449baf87c0':
MPEG4Extractor: ensure buffer size is not less than 8 for LastCommentData.

commit | commitdiff | tree

Marco Nelissen [Tue, 6 Oct 2015 16:34:45 +0000 (16:34 +0000)]

Merge "Check NAL size before use" into klp-dev

commit | commitdiff | tree

Wei Jia [Tue, 6 Oct 2015 16:34:00 +0000 (16:34 +0000)]

am 9ab9c85e: Merge "MPEG4Extractor: ensure buffer size is not less than 8 for LastCommentData." into klp-dev

* commit '9ab9c85e39f089f355faa9cd9db6d113dc482e61':
MPEG4Extractor: ensure buffer size is not less than 8 for LastCommentData.

commit | commitdiff | tree

Wei Jia [Tue, 6 Oct 2015 16:21:35 +0000 (16:21 +0000)]

Merge "MPEG4Extractor: ensure buffer size is not less than 8 for LastCommentData." into klp-dev

commit | commitdiff | tree

Marco Nelissen [Tue, 6 Oct 2015 15:54:38 +0000 (15:54 +0000)]

am f7d1f627: am 257b3bc5: Don\'t crash when there\'s no conceal frame

* commit 'f7d1f627b0b1139f82f16baee482476cc10ccde4':
Don't crash when there's no conceal frame

commit | commitdiff | tree

Marco Nelissen [Tue, 6 Oct 2015 15:47:51 +0000 (15:47 +0000)]

am 257b3bc5: Don\'t crash when there\'s no conceal frame

* commit '257b3bc581bbc65318a4cc2d3c22a07a4429dc1d':
Don't crash when there's no conceal frame

commit | commitdiff | tree

Marco Nelissen [Fri, 2 Oct 2015 22:12:00 +0000 (15:12 -0700)]

Check NAL size before use

Bug: 24441553
Bug: 24445122
Change-Id: Ib7f025769adbafd5a2cb64fae5562a0a565945c2

commit | commitdiff | tree

Wei Jia [Mon, 28 Sep 2015 21:50:47 +0000 (14:50 -0700)]

MPEG4Extractor: ensure buffer size is not less than 8 for LastCommentData.

Bug: 24346430
Change-Id: I897a724e968841d9160f819d06c0ce22f6d743c4
(cherry picked from commit 5cae16bdce77b0a3ba590b55637f7d55a2f35402)

commit | commitdiff | tree

Marco Nelissen [Mon, 5 Oct 2015 17:46:11 +0000 (10:46 -0700)]

Don't crash when there's no conceal frame

Bug: 24630158
Change-Id: If042aebebb58c218eb7bbf01dcddbcbd05dca1d6

commit | commitdiff | tree

Lajos Molnar [Tue, 1 Sep 2015 00:19:52 +0000 (17:19 -0700)]

stagefright: MPEG4Extractor: allow 'hdlr' box before first track

Bug: 21725583
Change-Id: I799c1967759c7e49fb50281a1708188450caac77
(cherry picked from commit cf75af8f76265fb2909028f5dc68c7029dbe5f49)

commit | commitdiff | tree

Flanker [Tue, 29 Sep 2015 06:36:16 +0000 (06:36 +0000)]

am bdaee5ea: (-s ours) am 3737a3fa: DO NOT MERGE stagefright: fix AMessage::FromParcel

* commit 'bdaee5eaa345ee9b1e5ddcb921565c4d127ceb8d':
DO NOT MERGE stagefright: fix AMessage::FromParcel

commit | commitdiff | tree

Flanker [Tue, 29 Sep 2015 06:28:47 +0000 (06:28 +0000)]

am 3737a3fa: DO NOT MERGE stagefright: fix AMessage::FromParcel

* commit '3737a3fa121796131ea5b782230e65dad9ccf90f':
DO NOT MERGE stagefright: fix AMessage::FromParcel

commit | commitdiff | tree

Flanker [Fri, 11 Sep 2015 11:05:47 +0000 (19:05 +0800)]

DO NOT MERGE stagefright: fix AMessage::FromParcel

Add check for incoming mNumItems. Also add check readCString return
value.

Fix style & add log.

Bug: 24123723

Change-Id: If41a5312c27d868f481893eef56019b6807c39b7

commit | commitdiff | tree

Flanker [Fri, 11 Sep 2015 11:05:47 +0000 (19:05 +0800)]

stagefright: fix AMessage::FromParcel

Add check for incoming mNumItems. Also add check readCString return
value.

Fix style & add log.

Bug: 24123723

Change-Id: If41a5312c27d868f481893eef56019b6807c39b7

commit | commitdiff | tree

Andy Hung [Thu, 24 Sep 2015 22:08:13 +0000 (15:08 -0700)]

DO NOT MERGE - AudioFlinger: Clear record buffers when starting RecordThread

Bug: 24211743
Bug: 24267152
Change-Id: I58c55e56b85067b71e4e300f947b4dfc159637ba

commit | commitdiff | tree

Andy Hung [Thu, 24 Sep 2015 23:36:56 +0000 (16:36 -0700)]

DO NOT MERGE - AudioFlinger: Clear record buffers when starting RecordThread

Bug: 24211743
Bug: 24267152
Change-Id: I58c55e56b85067b71e4e300f947b4dfc159637ba

commit | commitdiff | tree

Wei Jia [Thu, 17 Sep 2015 21:32:32 +0000 (21:32 +0000)]

Merge "IAudioFlinger: fix the missing initialization of variable to ensure no info leak when writing them to Parcel." into lmp-dev

commit | commitdiff | tree

Jeff Tinker [Thu, 17 Sep 2015 17:38:12 +0000 (17:38 +0000)]

am 4554ffd7: (-s ours) am 6272fa1b: Merge "DO NOT MERGE Fix vulnerability in mediaserver" into klp-dev

* commit '4554ffd7a1c4bc6973c11c00f5a19aa260e18100':
DO NOT MERGE Fix vulnerability in mediaserver

commit | commitdiff | tree

Jeff Tinker [Thu, 17 Sep 2015 17:38:11 +0000 (17:38 +0000)]

am 52b829cb: (-s ours) am f43125ed: Merge "Fix for security vulnerability in media server DO NOT MERGE" into klp-dev

* commit '52b829cbc2cb947733f312211a007ecd2f9fe96b':
Fix for security vulnerability in media server DO NOT MERGE

commit | commitdiff | tree

Jeff Tinker [Thu, 17 Sep 2015 17:28:47 +0000 (17:28 +0000)]

am 6272fa1b: Merge "DO NOT MERGE Fix vulnerability in mediaserver" into klp-dev

* commit '6272fa1baf361a6a89607243638cc592047947b3':
DO NOT MERGE Fix vulnerability in mediaserver

commit | commitdiff | tree

Jeff Tinker [Thu, 17 Sep 2015 17:28:46 +0000 (17:28 +0000)]

am f43125ed: Merge "Fix for security vulnerability in media server DO NOT MERGE" into klp-dev

* commit 'f43125ed08a408b02613b99f058564d97ce690cc':
Fix for security vulnerability in media server DO NOT MERGE

commit | commitdiff | tree

Jeff Tinker [Thu, 17 Sep 2015 17:04:32 +0000 (17:04 +0000)]

Merge "DO NOT MERGE Fix vulnerability in mediaserver" into lmp-dev

commit | commitdiff | tree

Jeff Tinker [Thu, 17 Sep 2015 17:04:25 +0000 (17:04 +0000)]

Merge "DO NOT MERGE Fix vulnerability in mediaserver" into klp-dev

commit | commitdiff | tree

Jeff Tinker [Thu, 17 Sep 2015 17:04:15 +0000 (17:04 +0000)]

Merge "Fix for security vulnerability in media server DO NOT MERGE" into lmp-dev

commit | commitdiff | tree

Jeff Tinker [Thu, 17 Sep 2015 17:04:05 +0000 (17:04 +0000)]

Merge "Fix for security vulnerability in media server DO NOT MERGE" into klp-dev

commit | commitdiff | tree

Wei Jia [Wed, 16 Sep 2015 22:01:16 +0000 (15:01 -0700)]

IAudioFlinger: fix the missing initialization of variable to ensure no info leak when writing them to Parcel.

Bug: 23953967
Change-Id: I3a1d0144ba3832649e322c197ff0f03305ee7829
(cherry picked from commit 4cac44b53cc9f965cc2c9706b1d7ee2cd79f4066)

commit | commitdiff | tree

Wei Jia [Thu, 17 Sep 2015 13:42:56 +0000 (13:42 +0000)]

am 190786d3: (-s ours) am ae922517: Merge "DO NOT MERGE - IAudioFlinger: always initialize variables to ensure no info leak when writing them to Parcel." into klp-dev

* commit '190786d3590c6b064a7d32eaa92f4a7b11cf16d5':
DO NOT MERGE - IAudioFlinger: always initialize variables to ensure no info leak when writing them to Parcel.

commit | commitdiff | tree

Wei Jia [Thu, 17 Sep 2015 13:36:52 +0000 (13:36 +0000)]

am ae922517: Merge "DO NOT MERGE - IAudioFlinger: always initialize variables to ensure no info leak when writing them to Parcel." into klp-dev

* commit 'ae92251730865e0c4bc59ef2a8fe9dacb6de41b9':
DO NOT MERGE - IAudioFlinger: always initialize variables to ensure no info leak when writing them to Parcel.

commit | commitdiff | tree

Wei Jia [Thu, 17 Sep 2015 13:19:23 +0000 (13:19 +0000)]

Merge "DO NOT MERGE - IAudioFlinger: always initialize variables to ensure no info leak when writing them to Parcel." into lmp-dev