OSDN Git Service
Lajos Molnar [Tue, 13 Oct 2015 00:10:31 +0000 (17:10 -0700)]
stagefright: check bounds for MediaCodecList.getCodecInfo
Bug:
24445127
Change-Id: I1c6cb9e2518b852d48d5d0d625b54409bd4e13ec
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.
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:35 +0000 (16:37 +0000)]
Merge "DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer." into lmp-dev
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 [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: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.
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 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
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
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.
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: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
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
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
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
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
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
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
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
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:32 +0000 (17:04 +0000)]
Merge "DO NOT MERGE Fix vulnerability in mediaserver" into lmp-dev
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:15 +0000 (17:04 +0000)]
Merge "Fix for security vulnerability in media server DO NOT MERGE" into lmp-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 [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)
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.
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: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
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:40:49 +0000 (18:40 +0000)]
am
38281f1c: am
d386c5be: Merge "Fix heap data leak vulnerability" into klp-dev
* commit '
38281f1cbcd4804095828f19b7954d5219560fcd':
Fix heap data leak vulnerability
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:26:28 +0000 (10:26 -0700)]
DO NOT MERGE Fix vulnerability in mediaserver
ICrypto.cpp: ASLR bypass using DECRYPT IPC
bug:
24074485
Change-Id: Ia12942d6b86adde28745908d36a728ab5d69a037
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)
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:43:55 +0000 (07:43 +0000)]
am
9860dcdf: (-s ours) am
b21a6420: Merge "DO NOT MERGE NuCachedSource2: fix possible erroneous early free" into klp-dev
* commit '
9860dcdf427d70e6aef4ce082be40a5459c466f4':
DO NOT MERGE NuCachedSource2: fix possible erroneous early free
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
Wonsik Kim [Wed, 16 Sep 2015 07:11:18 +0000 (07:11 +0000)]
Merge "DO NOT MERGE NuCachedSource2: fix possible erroneous early free" into lmp-dev
Wonsik Kim [Wed, 16 Sep 2015 07:11:04 +0000 (07:11 +0000)]
Merge "DO NOT MERGE NuCachedSource2: fix possible erroneous early free" into klp-dev
Jeff Tinker [Mon, 14 Sep 2015 20:55:23 +0000 (13:55 -0700)]
Fix heap data leak vulnerability
bug:
23600291
Change-Id: I7979e9e25ada01c13775be8580d433a8b4ce4ffe
Jeff Tinker [Mon, 14 Sep 2015 18:55:43 +0000 (11:55 -0700)]
Fix for security vulnerability in media server DO NOT MERGE
bug:
23540426
Change-Id: I7ca419e4008967a0387649e5293ac9d4be71d3c4
Jeff Tinker [Mon, 14 Sep 2015 17:18:56 +0000 (10:18 -0700)]
Fix for security vulnerability in media server DO NOT MERGE
bug:
23540426
Change-Id: I5d602f99fd82e50d0136d47ce20cfa1ac9fd7ae2
Wonsik Kim [Mon, 14 Sep 2015 06:30:56 +0000 (06:30 +0000)]
Merge "DO NOT MERGE Avoid size_t overflow in base64 decoding once again" into lmp-dev
Wonsik Kim [Tue, 8 Sep 2015 08:32:28 +0000 (17:32 +0900)]
DO NOT MERGE NuCachedSource2: fix possible erroneous early free
Because the constructor of NuCachedSource2 sent a message to
AHandlerReflector object, AHandlerReflector::onMessageReceived could
have executed just before the object gets wrapped in a strong
pointer, resulting in erroneous early free. Fix the issue by using
static Create function to ensure the message is sent after the
object is wrapped in a sp.
Bug:
23882800
Change-Id: I38a9d7a3083f184b4c81d0b00ba1661721278855
Wonsik Kim [Tue, 8 Sep 2015 08:32:28 +0000 (17:32 +0900)]
DO NOT MERGE NuCachedSource2: fix possible erroneous early free
Because the constructor of NuCachedSource2 sent a message to
AHandlerReflector object, AHandlerReflector::onMessageReceived could
have executed just before the object gets wrapped in a strong
pointer, resulting in erroneous early free. Fix the issue by using
static Create function to ensure the message is sent after the
object is wrapped in a sp.
Bug:
23882800
Change-Id: I38a9d7a3083f184b4c81d0b00ba1661721278855
Wonsik Kim [Fri, 11 Sep 2015 07:31:18 +0000 (16:31 +0900)]
DO NOT MERGE Avoid size_t overflow in base64 decoding once again
Switch to foundation base64 function in OggExtractor and fix the
issue there.
This reverts commit
28314aef9e8a666dbb75bbd555f6566a6c991f1c.
Bug:
23707088
Change-Id: I268bd50431de5b5e579343bf1b425c42ada6daba
Wei Jia [Sat, 12 Sep 2015 08:49:21 +0000 (08:49 +0000)]
am
8cfd0ac4: (-s ours) am
741a3351: Merge "DO NOT MERGE - IAudioFlinger: clear config before reading it from parcel." into klp-dev
* commit '
8cfd0ac4b05f3151f1083564f46f05b5f525af8a':
DO NOT MERGE - IAudioFlinger: clear config before reading it from parcel.
Wonsik Kim [Sat, 12 Sep 2015 08:49:20 +0000 (08:49 +0000)]
am
44da08ed: (-s ours) am
b659b4c7: Merge "DO NOT MERGE fix build" into klp-dev
* commit '
44da08ed957157645e1c8776bb59924b1bb7f61c':
DO NOT MERGE fix build
Wonsik Kim [Sat, 12 Sep 2015 08:49:19 +0000 (08:49 +0000)]
am
1507bbb0: (-s ours) am
1784a8db: Merge "DO NOT MERGE Avoid size_t overflow in base64 decoding once again" into klp-dev
* commit '
1507bbb00e78c297b1aca01f580f529b55009f94':
DO NOT MERGE Avoid size_t overflow in base64 decoding once again
Wei Jia [Sat, 12 Sep 2015 08:49:17 +0000 (08:49 +0000)]
am
c256004a: am
69ae6a87: libstagefright: fix A_Refl to return immediately when there is an error.
* commit '
c256004a8cbf4dc1d647957243cf8be1a3c7bec4':
libstagefright: fix A_Refl to return immediately when there is an error.
Wei Jia [Fri, 11 Sep 2015 14:10:14 +0000 (14:10 +0000)]
am
741a3351: Merge "DO NOT MERGE - IAudioFlinger: clear config before reading it from parcel." into klp-dev
* commit '
741a335126a562ae8f5883cc0b02ba72f40e56f3':
DO NOT MERGE - IAudioFlinger: clear config before reading it from parcel.
Wei Jia [Fri, 11 Sep 2015 13:55:30 +0000 (13:55 +0000)]
Merge "DO NOT MERGE - IAudioFlinger: clear config before reading it from parcel." into lmp-dev
Wei Jia [Fri, 11 Sep 2015 13:54:59 +0000 (13:54 +0000)]
Merge "DO NOT MERGE - IAudioFlinger: clear config before reading it from parcel." into klp-dev
Wonsik Kim [Fri, 11 Sep 2015 07:50:35 +0000 (07:50 +0000)]
am
b659b4c7: Merge "DO NOT MERGE fix build" into klp-dev
* commit '
b659b4c7e1405056d189b44bd96036b6500dd378':
DO NOT MERGE fix build
Wonsik Kim [Fri, 11 Sep 2015 07:34:53 +0000 (07:34 +0000)]
Merge "DO NOT MERGE fix build" into klp-dev
Wonsik Kim [Fri, 11 Sep 2015 07:14:18 +0000 (16:14 +0900)]
DO NOT MERGE fix build
Bug:
23707088
Change-Id: Ib0d6cbc52710f33310d21b2eae1f243f0f8e8bca
Wonsik Kim [Fri, 11 Sep 2015 07:25:22 +0000 (07:25 +0000)]
am
1784a8db: Merge "DO NOT MERGE Avoid size_t overflow in base64 decoding once again" into klp-dev
* commit '
1784a8dbbc73b3e6033340d107b6c08478b962c8':
DO NOT MERGE Avoid size_t overflow in base64 decoding once again
Wonsik Kim [Fri, 11 Sep 2015 06:59:11 +0000 (06:59 +0000)]
Merge "Revert "Avoid size_t overflow in base64 decoding once again"" into lmp-dev
Wonsik Kim [Fri, 11 Sep 2015 06:51:10 +0000 (06:51 +0000)]
Revert "Avoid size_t overflow in base64 decoding once again"
This reverts commit
c9ac5dfdafed1c66beae090cafa97002764e0ca3.
Change-Id: Iae9707bbd8641a0bb00fcda39a20eb8b8f4f5232
Wonsik Kim [Fri, 11 Sep 2015 06:49:37 +0000 (06:49 +0000)]
Merge "Avoid size_t overflow in base64 decoding once again" into lmp-dev
Wonsik Kim [Fri, 11 Sep 2015 06:49:22 +0000 (06:49 +0000)]
Merge "DO NOT MERGE Avoid size_t overflow in base64 decoding once again" into klp-dev
Wei Jia [Thu, 10 Sep 2015 21:23:55 +0000 (21:23 +0000)]
am
69ae6a87: libstagefright: fix A_Refl to return immediately when there is an error.
* commit '
69ae6a87342d5260d8d8660accc8aa1b9367dbbe':
libstagefright: fix A_Refl to return immediately when there is an error.
Wei Jia [Wed, 9 Sep 2015 16:48:34 +0000 (09:48 -0700)]
DO NOT MERGE - IAudioFlinger: clear config before reading it from parcel.
Bug:
23905951
Bug:
23912202
Change-Id: Id13a9d3cae2c09e7381b841e67ddfb188274d74c
(cherry picked from commit
e995e477ad59b79145200c8f1e9e13c16c682d59)
Wei Jia [Wed, 9 Sep 2015 16:48:34 +0000 (09:48 -0700)]
DO NOT MERGE - IAudioFlinger: clear config before reading it from parcel.
Bug:
23905951
Bug:
23912202
Change-Id: Id13a9d3cae2c09e7381b841e67ddfb188274d74c
(cherry picked from commit
e995e477ad59b79145200c8f1e9e13c16c682d59)
Wonsik Kim [Mon, 7 Sep 2015 06:52:27 +0000 (15:52 +0900)]
DO NOT MERGE Avoid size_t overflow in base64 decoding once again
Switch to foundation base64 function in OggExtractor and fix the
issue there.
Bug:
23707088
Change-Id: I999ae911177c88dc13f9ee9796ca93c5928b20b0
Wonsik Kim [Mon, 7 Sep 2015 06:52:27 +0000 (15:52 +0900)]
Avoid size_t overflow in base64 decoding once again
Switch to foundation base64 function in OggExtractor and fix the
issue there.
Bug:
23707088
Change-Id: I999ae911177c88dc13f9ee9796ca93c5928b20b0
Robert Shih [Wed, 2 Sep 2015 21:02:47 +0000 (14:02 -0700)]
DO NOT MERGE: Protect data source access with mutex during disconnect
Bug:
23658148
Change-Id: Ic37cac7b5d166143e0b77e9919b0aaef486e4fdd
Wei Jia [Fri, 4 Sep 2015 16:13:37 +0000 (09:13 -0700)]
libstagefright: fix A_Refl to return immediately when there is an error.
Bug:
23609206
Change-Id: I2ad25fb208df17f5a5b6d6b356eff2f400627f22
(cherry picked from commit
715dcb9c90d86c1a02a0da056f3cee8875ad1230)
Robert Shih [Thu, 3 Sep 2015 18:05:44 +0000 (18:05 +0000)]
am
c1e989e7: am
13ff64c2: Merge "Zero out return values in media binder calls" into klp-dev
* commit '
c1e989e76a461ea69e293839b3c29b634a462bd5':
Zero out return values in media binder calls
Andy Hung [Thu, 3 Sep 2015 18:05:43 +0000 (18:05 +0000)]
am
3732a3ac: am
ab203130: Merge "Make IEffect command more robust (second try)" into klp-dev
* commit '
3732a3acafa7eb621bc26cca3eb00150ea12d2e2':
Make IEffect command more robust (second try)
Marco Nelissen [Thu, 3 Sep 2015 18:05:42 +0000 (18:05 +0000)]
am
16e12007: am
74888428: Merge "Fix timedtext parsing" into klp-dev
* commit '
16e12007ab1581e1b6aa973f3c83b2a45a816881':
Fix timedtext parsing
Robert Shih [Thu, 3 Sep 2015 17:52:44 +0000 (17:52 +0000)]
am
13ff64c2: Merge "Zero out return values in media binder calls" into klp-dev
* commit '
13ff64c2db84f4e7cac3396700e333b48c42c7ee':
Zero out return values in media binder calls
Andy Hung [Thu, 3 Sep 2015 17:52:43 +0000 (17:52 +0000)]
am
ab203130: Merge "Make IEffect command more robust (second try)" into klp-dev
* commit '
ab20313074bb109f29f677c3f09d5da1a48c94e7':
Make IEffect command more robust (second try)
Marco Nelissen [Thu, 3 Sep 2015 17:52:42 +0000 (17:52 +0000)]
am
74888428: Merge "Fix timedtext parsing" into klp-dev
* commit '
74888428e51a2aa123e301912d09973bd9310c33':
Fix timedtext parsing
Wei Jia [Thu, 3 Sep 2015 17:24:20 +0000 (17:24 +0000)]
am
03b7f72b: (-s ours) am
9d916c77: DO NOT MERGE - libstagefright: sanity check size before dereferencing pointer in Utils.cpp
* commit '
03b7f72b98ef0a4fa58a84a27d2f8735342faf58':
DO NOT MERGE - libstagefright: sanity check size before dereferencing pointer in Utils.cpp
Robert Shih [Thu, 3 Sep 2015 17:21:20 +0000 (17:21 +0000)]
Merge "Zero out return values in media binder calls" into klp-dev
Andy Hung [Thu, 3 Sep 2015 17:16:12 +0000 (17:16 +0000)]
Merge "Make IEffect command more robust (second try)" into klp-dev
Wei Jia [Thu, 3 Sep 2015 17:14:06 +0000 (17:14 +0000)]
am
9d916c77: DO NOT MERGE - libstagefright: sanity check size before dereferencing pointer in Utils.cpp
* commit '
9d916c771ca32cb2d0df27b85ce3e17bb6b48eaf':
DO NOT MERGE - libstagefright: sanity check size before dereferencing pointer in Utils.cpp
Marco Nelissen [Thu, 3 Sep 2015 17:05:55 +0000 (17:05 +0000)]
Merge "Fix timedtext parsing" into klp-dev
Wei Jia [Tue, 1 Sep 2015 18:14:18 +0000 (11:14 -0700)]
DO NOT MERGE - libstagefright: sanity check size before dereferencing pointer in Utils.cpp
Also remove some CHECK's.
Bug:
23680780
Change-Id: I62d0941e203e40209fa6fbe3f923f3efdc5a6c23
(cherry picked from commit
7bb772e0c643ff3292599cf485b9dbf232bf39a4)
Wei Jia [Tue, 1 Sep 2015 18:14:18 +0000 (11:14 -0700)]
DO NOT MERGE - libstagefright: sanity check size before dereferencing pointer in Utils.cpp
Also remove some CHECK's.
Bug:
23680780
Change-Id: I62d0941e203e40209fa6fbe3f923f3efdc5a6c23
(cherry picked from commit
7bb772e0c643ff3292599cf485b9dbf232bf39a4)
Wonsik Kim [Thu, 3 Sep 2015 07:59:29 +0000 (07:59 +0000)]
am
436b32d1: am
d2605273: Ogg: avoid size_t overflow in base64 decoding
* commit '
436b32d1eb75cf20d09776549bd7f7a11fa569a1':
Ogg: avoid size_t overflow in base64 decoding
Wonsik Kim [Thu, 3 Sep 2015 07:54:01 +0000 (07:54 +0000)]
am
d2605273: Ogg: avoid size_t overflow in base64 decoding
* commit '
d26052738f7b095b7e318c8dde7f32db0a48450c':
Ogg: avoid size_t overflow in base64 decoding
Wonsik Kim [Wed, 2 Sep 2015 07:02:19 +0000 (16:02 +0900)]
Ogg: avoid size_t overflow in base64 decoding
Bug:
23707088
Change-Id: I8d32841fee3213c721cdcc57788807ea64d19d74
Robert Shih [Wed, 2 Sep 2015 23:46:59 +0000 (16:46 -0700)]
Zero out return values in media binder calls
More specifically when handling:
* GET_STREAM_VOLUME in IAudioPolicyService, and
* GET_CURRENT_POSITION and GET_DURATION in IMediaPlayer
This prevents leaking uninitialized values across binder in error cases.
Bug:
23756261
Change-Id: I0ffd900ab12b685b0611259ade4a3efb1ec5defe
Andy Hung [Tue, 1 Sep 2015 20:07:56 +0000 (20:07 +0000)]
Make IEffect command more robust (second try)
Bug:
23540907
Change-Id: If30cfa535ad51521053706fc40fc98d893db5bc7
(cherry picked from commit
10e6660cc5da65b027c90489ba7ac55d1504e012)
Marco Nelissen [Thu, 27 Aug 2015 20:49:32 +0000 (13:49 -0700)]
Fix timedtext parsing
Add bounds checking and fix other bugs.
Bug:
23284974
Bug:
23541506
Bug:
23542351
Bug:
23542352
Change-Id: I53551efdf109ce1833e0c361efaf4cee7a851023
Andy Hung [Fri, 28 Aug 2015 21:16:40 +0000 (21:16 +0000)]
am
fba72ab0: am
f394f121: Merge "libmedia: clear reply data for IEffect command" into klp-dev
* commit '
fba72ab0fcf7298492dcd9e3045913435d30d3a9':
libmedia: clear reply data for IEffect command
Andy Hung [Fri, 28 Aug 2015 21:08:45 +0000 (21:08 +0000)]
am
f394f121: Merge "libmedia: clear reply data for IEffect command" into klp-dev
* commit '
f394f12167fddbc755855d06b615509517c99f14':
libmedia: clear reply data for IEffect command