OSDN Git Service
Pawin Vongmasa [Sat, 16 Apr 2016 00:09:00 +0000 (00:09 +0000)]
Merge "SampleTable.cpp: Prevent corrupted stts block from causing excessive memory allocation." into klp-dev am:
5964527
am:
e896c41
* commit '
e896c41d85a15de06c74885fe040f3f57b63cd5d':
SampleTable.cpp: Prevent corrupted stts block from causing excessive memory allocation.
Change-Id: I5f23c14d155ea5a64b00d877a329c77cfc5b55f7
Pawin Vongmasa [Sat, 16 Apr 2016 00:06:36 +0000 (00:06 +0000)]
Merge "SampleTable.cpp: Prevent corrupted stts block from causing excessive memory allocation." into klp-dev
am:
5964527
* commit '
59645279f48b3ae83ab42445148ea236c5dc72c4':
SampleTable.cpp: Prevent corrupted stts block from causing excessive memory allocation.
Change-Id: I37ea7cd16f1e0fcf2ce14d6687de080a7c0931c1
Pawin Vongmasa [Sat, 16 Apr 2016 00:01:22 +0000 (00:01 +0000)]
Merge "SampleTable.cpp: Prevent corrupted stts block from causing excessive memory allocation." into klp-dev
Pawin Vongmasa [Wed, 13 Apr 2016 23:25:12 +0000 (16:25 -0700)]
SampleTable.cpp: Prevent corrupted stts block from causing
excessive memory allocation.
Details:
DataSource.h
- Added function getVector() for reading from a data source into
a Vector object, whose capacity grows only as much as needed
(in case of EOS or reading error).
SampleTable.h
- Changed the type of mTimeToSample from uint32_t* to
Vector<uint32_t>.
SampleTable.cpp
- In setTimeToSample, modified the code to use getVector()
instead of readAt(). If the input source has a corrupt
time-to-sample table size that is too big, EOS will be reached
before the whole table is read, and the return value from
getVector() will be false.
- Also, tightened the bound for the provided time-to-sample table
size to guarantee that the table does not take more than
UINT_MAX32 bytes in memory.
Bug:
28076789
Change-Id: Id207f369ab7b27787d83f5d8fc48dc53ed9fcdc9
Marco Nelissen [Wed, 13 Apr 2016 22:21:11 +0000 (22:21 +0000)]
h264dec: check for overflows when calculating allocation size. am:
a3dd713
am:
d504c68
* commit '
d504c68310bf86e24321a7260c2ecdd9962c8b3b':
h264dec: check for overflows when calculating allocation size.
Change-Id: Iabbe0fcaf14241d1aa01184c61f1ecb134c16fe8
Marco Nelissen [Wed, 13 Apr 2016 22:17:37 +0000 (22:17 +0000)]
h264dec: check for overflows when calculating allocation size.
am:
a3dd713
* commit '
a3dd713893658baf50df88b261aba83bb0c40687':
h264dec: check for overflows when calculating allocation size.
Change-Id: Ie1acdd0ddaddce72f9072abf288db29ab3d75fc1
Marco Nelissen [Fri, 8 Apr 2016 17:04:48 +0000 (10:04 -0700)]
h264dec: check for overflows when calculating allocation size.
Bug:
27855419
Change-Id: Idabedca52913ec31ea5cb6a6109ab94e3fb2badd
Wonsik Kim [Fri, 8 Apr 2016 01:17:12 +0000 (01:17 +0000)]
Merge "DO NOT MERGE codecs: check OMX buffer size before use in vorbisdec" into klp-dev am:
52636f8
am:
9f83485
* commit '
9f834853a28d20ee9b218b0c8e68ff38b48f5743':
DO NOT MERGE codecs: check OMX buffer size before use in vorbisdec
Change-Id: I6cd36d4986fb6c96b7e01d9cdff3e7cd77f0f951
Wonsik Kim [Fri, 8 Apr 2016 01:17:11 +0000 (01:17 +0000)]
Merge "DO NOT MERGE codecs: check OMX buffer size before use in (h263|h264)dec" into klp-dev am:
f81eab3
am:
eec4dd5
* commit '
eec4dd5f859d6e8d0d77f03c1ad27ba720bf2e04':
DO NOT MERGE codecs: check OMX buffer size before use in (h263|h264)dec
Change-Id: I85cbc2e7d30332bf163599b36a518387796658c6
Wonsik Kim [Fri, 8 Apr 2016 01:13:27 +0000 (01:13 +0000)]
Merge "DO NOT MERGE codecs: check OMX buffer size before use in vorbisdec" into klp-dev
am:
52636f8
* commit '
52636f8462b2a24f77524ca912e3579c33ac113e':
DO NOT MERGE codecs: check OMX buffer size before use in vorbisdec
Change-Id: I63431cdcbe2903ca51b43ce4cddc13a0c62f6bae
Wonsik Kim [Fri, 8 Apr 2016 01:13:26 +0000 (01:13 +0000)]
Merge "DO NOT MERGE codecs: check OMX buffer size before use in (h263|h264)dec" into klp-dev
am:
f81eab3
* commit '
f81eab31874a6cf40e1f265b0c47cbe6b137d407':
DO NOT MERGE codecs: check OMX buffer size before use in (h263|h264)dec
Change-Id: Ie9c95c1847cc3e2a1a9ef3aeafbeb0aedf262a42
Wonsik Kim [Fri, 8 Apr 2016 01:05:03 +0000 (01:05 +0000)]
Merge "DO NOT MERGE codecs: check OMX buffer size before use in vorbisdec" into klp-dev
Wonsik Kim [Fri, 8 Apr 2016 01:03:55 +0000 (01:03 +0000)]
Merge "DO NOT MERGE codecs: check OMX buffer size before use in (h263|h264)dec" into klp-dev
Marco Nelissen [Thu, 7 Apr 2016 21:34:42 +0000 (21:34 +0000)]
Merge "Check mp3 output buffer size" into klp-dev am:
bc736f6
am:
44ef399
* commit '
44ef399573ddf6be54f4ab1c049a9d022a44bb60':
Check mp3 output buffer size
Change-Id: Ie3514d66b68a9add1e4c24b940f41df9cf31fb6e
Marco Nelissen [Thu, 7 Apr 2016 21:30:22 +0000 (21:30 +0000)]
Merge "Check mp3 output buffer size" into klp-dev
am:
bc736f6
* commit '
bc736f650daeacce241c1f1e9c1b3ac28b5befe1':
Check mp3 output buffer size
Change-Id: Iecf266fb05e72b245db1acf3bdc380c771ccabf8
Marco Nelissen [Thu, 7 Apr 2016 21:24:52 +0000 (21:24 +0000)]
Merge "Check mp3 output buffer size" into klp-dev
Marco Nelissen [Thu, 7 Apr 2016 20:32:12 +0000 (20:32 +0000)]
AudioSource: initialize variables am:
a2f5b80
am:
67e0eb7
* commit '
67e0eb763d50b7811176f97553934dcc8dca4328':
AudioSource: initialize variables
Change-Id: Ia3456efeff3fa722b93510a2428ec88e86394bce
Marco Nelissen [Thu, 7 Apr 2016 20:28:42 +0000 (20:28 +0000)]
AudioSource: initialize variables
am:
a2f5b80
* commit '
a2f5b80a54ac3cd0f7dcfbb4d87eaf2f5ab99557':
AudioSource: initialize variables
Change-Id: I8038fc4d98c868070139d8d26832cbc32af7144a
Marco Nelissen [Tue, 5 Apr 2016 21:20:11 +0000 (14:20 -0700)]
AudioSource: initialize variables
to prevent info leak
Bug:
27855172
Change-Id: I3d33e0a9cc5cf8a758d7b0794590b09c43a24561
Marco Nelissen [Wed, 23 Mar 2016 22:36:36 +0000 (15:36 -0700)]
Check mp3 output buffer size
Bug:
27793371
Change-Id: I0fe40a4cfd0a5b488f93d3f3ba6f9495235926ac
Wonsik Kim [Sun, 20 Mar 2016 01:44:44 +0000 (10:44 +0900)]
DO NOT MERGE codecs: check OMX buffer size before use in (h263|h264)dec
Bug:
27833616
Change-Id: I0fd599b3da431425d89236ffdd9df423c11947c0
Wonsik Kim [Wed, 30 Mar 2016 08:13:00 +0000 (17:13 +0900)]
DO NOT MERGE codecs: check OMX buffer size before use in vorbisdec
Bug:
27833616
Change-Id: I1ccdd16a00741da072527a6d13e87fd7c7fe8c54
Wei Jia [Fri, 25 Mar 2016 21:32:13 +0000 (21:32 +0000)]
Merge "SampleTable: reduce unnecessary logging message." into klp-dev
am:
f305afb
* commit '
f305afb6eeeebd066f34c2b2c514bd4342182200':
SampleTable: reduce unnecessary logging message.
Wei Jia [Fri, 25 Mar 2016 21:22:40 +0000 (21:22 +0000)]
Merge "SampleTable: reduce unnecessary logging message." into klp-dev
Marco Nelissen [Fri, 25 Mar 2016 17:18:37 +0000 (17:18 +0000)]
Fix AMR decoder
am:
d061b5b
* commit '
d061b5b120082c9445670ebc95c5edade9ea4505':
Fix AMR decoder
Marco Nelissen [Fri, 25 Mar 2016 15:26:18 +0000 (08:26 -0700)]
Fix AMR decoder
Previous change caused EOS to be ignored.
Bug:
27843673
Related-to-bug:
27662364
Change-Id: Ia148a88abc861a9b393f42bc7cd63d8d3ae349bc
Wei Jia [Thu, 24 Mar 2016 17:58:04 +0000 (10:58 -0700)]
SampleTable: reduce unnecessary logging message.
Bug:
23247055
Change-Id: Ida0021160532623c6e72bd5bb0bb2a24332d1c34
Wei Jia [Thu, 24 Mar 2016 17:05:45 +0000 (17:05 +0000)]
SampleTable: add logging.
am:
c27cee3
* commit '
c27cee30d9359fa83e33b4f87f88e6bb9ef66341':
SampleTable: add logging.
Wei Jia [Thu, 24 Mar 2016 16:41:24 +0000 (09:41 -0700)]
SampleTable: add logging.
Bug:
23247055
Change-Id: Id45f9815c1b3cdfaae664508204a6ce1c1da4532
Wonsik Kim [Tue, 22 Mar 2016 22:44:30 +0000 (22:44 +0000)]
Merge "DO NOT MERGE codecs: check OMX buffer size before use in VP8 encoder." into klp-dev
am:
4f99823
* commit '
4f99823535e09f1a72231b48551b3162d1c5060e':
DO NOT MERGE codecs: check OMX buffer size before use in VP8 encoder.
Wonsik Kim [Tue, 22 Mar 2016 22:31:01 +0000 (22:31 +0000)]
Merge "DO NOT MERGE codecs: check OMX buffer size before use in VP8 encoder." into klp-dev
Robert Shih [Tue, 22 Mar 2016 20:56:01 +0000 (20:56 +0000)]
Merge "NuPlayerStreamListener: NULL and bounds check before memcpy" into klp-dev
am:
4fa31b5
* commit '
4fa31b5d858e11df241d6518cb06eea5b0adb3d6':
NuPlayerStreamListener: NULL and bounds check before memcpy
Marco Nelissen [Tue, 22 Mar 2016 20:43:54 +0000 (20:43 +0000)]
Merge "NuPlayerStreamListener: NULL and bounds check before memcpy" into klp-dev
Wei Jia [Tue, 22 Mar 2016 18:03:02 +0000 (18:03 +0000)]
SoftAMR: check input buffer size to avoid overflow.
am:
55e5218
* commit '
55e5218fd53f4da5c1fbad539ed960c04a883b0b':
SoftAMR: check input buffer size to avoid overflow.
Wei Jia [Tue, 22 Mar 2016 17:42:19 +0000 (17:42 +0000)]
SoftAMR: check output buffer size to avoid overflow.
am:
a3536c6
* commit '
a3536c61c6b6c77e199cc207cbf1e5c5b063cf91':
SoftAMR: check output buffer size to avoid overflow.
Wei Jia [Sat, 19 Mar 2016 01:17:14 +0000 (18:17 -0700)]
SoftAMR: check input buffer size to avoid overflow.
Bug:
27662364
Change-Id: I47380545ea7d85845e141e722b0d84f498d27145
Wei Jia [Thu, 17 Mar 2016 18:15:02 +0000 (11:15 -0700)]
SoftAMR: check output buffer size to avoid overflow.
Bug:
27662364
Change-Id: I7b26892c41d6f2e690e77478ab855c2fed1ff6b0
Wonsik Kim [Sun, 20 Mar 2016 01:44:44 +0000 (10:44 +0900)]
DO NOT MERGE codecs: check OMX buffer size before use in VP8 encoder.
Bug:
27569635
Change-Id: I469573f40e21dc9f4c200749d4f220e3a2d31761
Chien-Yu Chen [Mon, 21 Mar 2016 18:24:47 +0000 (18:24 +0000)]
Merge "Camera3Device: Validate template ID" into klp-dev
am:
ac5ef62
* commit '
ac5ef6284656864eca089da83edfd062ea8139b7':
Camera3Device: Validate template ID
Chien-Yu Chen [Mon, 21 Mar 2016 18:15:07 +0000 (18:15 +0000)]
Merge "Camera3Device: Validate template ID" into klp-dev
Robert Shih [Fri, 18 Mar 2016 21:34:57 +0000 (14:34 -0700)]
NuPlayerStreamListener: NULL and bounds check before memcpy
Bug:
27533704
Change-Id: I992a7709b92b1cbc3114c97bec48a3fc5b22ba6e
Chien-Yu Chen [Wed, 9 Mar 2016 20:21:01 +0000 (12:21 -0800)]
Camera3Device: Validate template ID
Validate template ID before creating a default request.
Bug:
26866110
Bug:
27568958
Change-Id: Ifda457024f1d5c2b1382f189c1a8d5fda852d30d
Marco Nelissen [Fri, 18 Mar 2016 17:43:29 +0000 (17:43 +0000)]
DO NOT MERGE Add VPX output buffer size check
am:
1595f8a
* commit '
1595f8ac7ab412e81e0565e1347edaeedf9f2832':
DO NOT MERGE Add VPX output buffer size check
Marco Nelissen [Wed, 16 Mar 2016 17:32:05 +0000 (10:32 -0700)]
DO NOT MERGE Add VPX output buffer size check
and handle dead observers more gracefully
Bug:
27597103
Change-Id: Id7acb25d5ef69b197da15ec200a9e4f9e7b03518
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
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
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
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
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
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
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
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
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
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
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
Marco Nelissen [Mon, 22 Feb 2016 21:05:15 +0000 (13:05 -0800)]
Clear allocation to avoid info leak
Bug:
26914474
Change-Id: Ie1a86e86d78058d041149fe599a4996e7f8185cf
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
Vignesh Venkatasubramanian [Wed, 13 Jan 2016 20:18:05 +0000 (12:18 -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: Ib02073f42d545e6c08f9bd4a4fc868e3be886c1b
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
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
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
Marco Nelissen [Tue, 12 Jan 2016 20:37:36 +0000 (12:37 -0800)]
Fix out-of-bounds write
Bug:
26365349
Change-Id: Ia363d9f8c231cf255dea852e0bbf5ca466c7990b
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.
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)
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
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
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.
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)
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
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
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
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
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.
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
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)
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.
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)
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
Marco Nelissen [Tue, 6 Oct 2015 16:34:45 +0000 (16:34 +0000)]
Merge "Check NAL size before use" into klp-dev
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.
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
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
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
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)
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
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)
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
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
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
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
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
Jeff Tinker [Thu, 17 Sep 2015 17:04:25 +0000 (17:04 +0000)]
Merge "DO NOT MERGE Fix vulnerability in mediaserver" into klp-dev
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
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.
Wei Jia [Thu, 17 Sep 2015 13:19:08 +0000 (13:19 +0000)]
Merge "DO NOT MERGE - IAudioFlinger: always initialize variables to ensure no info leak when writing them to Parcel." into klp-dev
Jeff Tinker [Wed, 16 Sep 2015 18:33:58 +0000 (18:33 +0000)]
am
d386c5be: Merge "Fix heap data leak vulnerability" into klp-dev
* commit '
d386c5be9505d2db24048a6e08ab714f2151dac2':
Fix heap data leak vulnerability
Jeff Tinker [Wed, 16 Sep 2015 18:17:46 +0000 (18:17 +0000)]
Merge "Fix heap data leak vulnerability" into klp-dev
Jeff Tinker [Wed, 16 Sep 2015 17:23:12 +0000 (10:23 -0700)]
DO NOT MERGE Fix vulnerability in mediaserver
ICrypto.cpp: ASLR bypass using DECRYPT IPC
bug:
24074485
Change-Id: I40dd0e92083c7093030393b16dbab59323306a4e
Wei Jia [Thu, 10 Sep 2015 16:47:29 +0000 (09:47 -0700)]
DO NOT MERGE - IAudioFlinger: always initialize variables to ensure no info leak when writing them to Parcel.
Bug:
23953967
Change-Id: Ibbe841da149038675e9e8daea76c77558bc8564b
(cherry picked from commit
983dca391a76fb45df999fc40e8766b9ddb63511)
Wonsik Kim [Wed, 16 Sep 2015 07:37:16 +0000 (07:37 +0000)]
am
b21a6420: Merge "DO NOT MERGE NuCachedSource2: fix possible erroneous early free" into klp-dev
* commit '
b21a642067477c72f419956da0ca8dafe0c04eab':
DO NOT MERGE NuCachedSource2: fix possible erroneous early free
OSDN Git Service
