OSDN Git Service
Wei Jia [Thu, 20 Aug 2015 16:53:41 +0000 (16:53 +0000)]
am
a590baca: Merge commit \'
6ae815e0\' into HEAD
* commit '
a590baca031199327f6382347625dd232de2c95c':
libstagefright: fix overflow in MPEG4Source::parseSampleAuxiliaryInformationOffsets.
Wei Jia [Thu, 20 Aug 2015 16:42:08 +0000 (09:42 -0700)]
Merge commit '
6ae815e0' into HEAD
libstagefright: fix overflow in MPEG4Source::parseSampleAuxiliaryInformationOffsets.
Bug:
23270724
(cherry picked from commit
c51ab7dd82bf4e24666fc72a55e03e2f530204d5)
Change-Id: I44c642548ee6ba3745fb1f46d8645bece231035a
Wei Jia [Thu, 20 Aug 2015 04:25:47 +0000 (04:25 +0000)]
Merge "libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable." into lmp-dev
Wei Jia [Thu, 20 Aug 2015 04:10:56 +0000 (04:10 +0000)]
am
5221133b: am
b2ae4351: libstagefright: fix overflow in pvdec_api.cpp.
* commit '
5221133bfa1585b4488b01cad165627b1cd17077':
libstagefright: fix overflow in pvdec_api.cpp.
Wei Jia [Thu, 20 Aug 2015 04:04:08 +0000 (04:04 +0000)]
am
b2ae4351: libstagefright: fix overflow in pvdec_api.cpp.
* commit '
b2ae4351539de9aa4667fcb3e02ba40d9c6bd094':
libstagefright: fix overflow in pvdec_api.cpp.
Wei Jia [Thu, 20 Aug 2015 04:01:18 +0000 (04:01 +0000)]
Merge "libstagefright: fix overflow in MPEG4Source::parseSampleAuxiliaryInformationOffsets." into klp-dev
Wei Jia [Tue, 18 Aug 2015 21:32:16 +0000 (14:32 -0700)]
libstagefright: fix overflow in MPEG4Source::parseSampleAuxiliaryInformationOffsets.
Bug:
23270724
Change-Id: Id7ba55c7bf6860fbfc892bbb6378aac644c82da4
(cherry picked from commit
c51ab7dd82bf4e24666fc72a55e03e2f530204d5)
Wei Jia [Thu, 20 Aug 2015 00:31:51 +0000 (17:31 -0700)]
libstagefright: fix overflow in pvdec_api.cpp.
Bug:
20674086
Change-Id: Ie2c711865c3b92f3fa2f3c7a436fa0e3687eb8b3
(cherry picked from commit
d7bb1cd786e5ea4ac61119cc1a08082474f7787b)
Wei Jia [Tue, 18 Aug 2015 18:17:24 +0000 (11:17 -0700)]
libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable.
Bug:
23247055
Change-Id: I29ef59c7ff09248063714e5013f7c33f66c5eebd
(cherry picked from commit
3564c4562f46bede6ef1ea716c4fd4f77e470ae8)
(cherry picked from commit
108cd2dc8df55f3f2ecdfbb4bb0ae981a74b6860)
Eric Laurent [Tue, 18 Aug 2015 21:51:55 +0000 (21:51 +0000)]
am
6b52d191: (-s ours) am
916a9684: Merge "DO NOT MERGE - audio flinger: fix fuzz test crash" into klp-dev
* commit '
6b52d191f96c611b768318eec74d25908da76d03':
DO NOT MERGE - audio flinger: fix fuzz test crash
Eric Laurent [Tue, 18 Aug 2015 21:45:18 +0000 (21:45 +0000)]
am
916a9684: Merge "DO NOT MERGE - audio flinger: fix fuzz test crash" into klp-dev
* commit '
916a9684295fb578f4b3c6c16b621ef201a49964':
DO NOT MERGE - audio flinger: fix fuzz test crash
Eric Laurent [Tue, 18 Aug 2015 21:44:50 +0000 (21:44 +0000)]
Merge "DO NOT MERGE - audio flinger: fix fuzz test crash" into lmp-dev
Eric Laurent [Tue, 18 Aug 2015 21:33:46 +0000 (21:33 +0000)]
Merge "DO NOT MERGE - audio flinger: fix fuzz test crash" into klp-dev
Eric Laurent [Fri, 8 May 2015 17:50:03 +0000 (10:50 -0700)]
DO NOT MERGE - audio flinger: fix fuzz test crash
Clear output stream pointer in duplicating thread
when the main output to which it is attached is closed.
Also do not forward master mute and volume commands to
duplicating threads as this is not applicable.
Also fix logic in AudioFlinger::primaryPlaybackThread_l()
that could accidentally return a duplicating thread.
This never happens because the primary thread is always
first in the list.
Bug:
20731946.
Change-Id: Ic8869699836920351b23d09544c50a258d3fb585
(cherry picked from commit
f6870aefc5e31d4220f3778c4e79ff34a61f48ad)
Chong Zhang [Tue, 18 Aug 2015 18:20:29 +0000 (18:20 +0000)]
am
5d7a381b: am
877c76ac: Merge "stagefright: check IMemory::pointer() before using the allocation" into klp-dev
* commit '
5d7a381b9c86ff4f00a95063d57ad0a80467799c':
stagefright: check IMemory::pointer() before using the allocation
Jon Larimer [Tue, 18 Aug 2015 18:20:27 +0000 (18:20 +0000)]
am
9707195b: am
f97b6bee: Merge "Check integer overflow to prevent memory corruption" into klp-dev
* commit '
9707195bf18fed1318e5c747db82f9783262a137':
Check integer overflow to prevent memory corruption
Jon Larimer [Tue, 18 Aug 2015 18:20:25 +0000 (18:20 +0000)]
am
27362395: (-s ours) am
2ed42aea: Merge "do not dequeue from native window after we hit fatal error -- DO NOT MERGE" into klp-dev
* commit '
27362395cec5673a9cbfe7179ad5490c4e475329':
do not dequeue from native window after we hit fatal error -- DO NOT MERGE
Chong Zhang [Tue, 18 Aug 2015 17:07:34 +0000 (17:07 +0000)]
am
877c76ac: Merge "stagefright: check IMemory::pointer() before using the allocation" into klp-dev
* commit '
877c76ac42701859fb8185f05c4724a06867fc07':
stagefright: check IMemory::pointer() before using the allocation
Nick Kralevich [Tue, 18 Aug 2015 16:57:24 +0000 (09:57 -0700)]
resolved conflicts for merge of
6035c811 to lmp-dev
Change-Id: Icf911f31e207c4c658047f6bfe8088d697b04ed6
Chong Zhang [Tue, 18 Aug 2015 16:55:38 +0000 (16:55 +0000)]
Merge "stagefright: check IMemory::pointer() before using the allocation" into klp-dev
Jon Larimer [Tue, 18 Aug 2015 16:33:55 +0000 (16:33 +0000)]
am
0afecdeb: am
aa1cc741: Merge "Check buffer size before using it" into klp-dev
* commit '
0afecdebaea1982ead120a701ddd24f2b0ff3897':
Check buffer size before using it
Abhishek Arya [Tue, 18 Aug 2015 16:33:50 +0000 (16:33 +0000)]
am
8026ad38: am
6efa86be: Merge "Check vector size before accessing" into klp-dev
* commit '
8026ad3838e2f7367e8ff616f66b2c2f8bc8488c':
Check vector size before accessing
Abhishek Arya [Tue, 18 Aug 2015 16:33:49 +0000 (16:33 +0000)]
am
d146d466: am
6f561b93: Merge "MatroskaExtractor: detect infinite loop when parsing NALs" into klp-dev
* commit '
d146d4660451fb04c039f4ac8554103876fa4722':
MatroskaExtractor: detect infinite loop when parsing NALs
Neel Mehta [Tue, 18 Aug 2015 16:33:48 +0000 (16:33 +0000)]
am
a2a68264: am
c37f7f6f: Fix for memory corruption in ID3::removeUnsynchronizationV2_4(). Bug:
23227354
* commit '
a2a6826494dec4a8fab6bd6828828fae886e516a':
Fix for memory corruption in ID3::removeUnsynchronizationV2_4(). Bug:
23227354
Abhishek Arya [Tue, 18 Aug 2015 16:33:46 +0000 (16:33 +0000)]
am
073a656d: am
deba0610: Merge "Revert "Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4"" into klp-dev
* commit '
073a656d7dd0b432e7c8d508745d9fb552955b9e':
Revert "Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4"
Abhishek Arya [Tue, 18 Aug 2015 16:33:43 +0000 (16:33 +0000)]
am
af46239a: am
9abb7401: Fix compile failure after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4
* commit '
af46239a10921980f5030222dff147a592480248':
Fix compile failure after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4
Wei Jia [Tue, 18 Aug 2015 16:33:38 +0000 (16:33 +0000)]
am
43131299: am
1a09d352: Merge "libstagefright: check remaining data size before parsing it." into klp-dev
* commit '
431312997856ce689e683ee0639cf1f4bedab7f0':
libstagefright: check remaining data size before parsing it.
Abhishek Arya [Tue, 18 Aug 2015 16:33:35 +0000 (16:33 +0000)]
am
8a34499a: am
c23e3dd8: Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4
* commit '
8a34499ab9987d962040881b4c8d66b655f65ae0':
Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4
Wei Jia [Tue, 18 Aug 2015 16:33:34 +0000 (16:33 +0000)]
am
ce380290: (-s ours) am
567b6551: Merge "SoftAVCEnc: check requested memory size before allocation." into klp-dev
* commit '
ce3802906214ec1ae2ac78d765b8480a2ebe295a':
SoftAVCEnc: check requested memory size before allocation.
Jon Larimer [Tue, 18 Aug 2015 15:13:40 +0000 (15:13 +0000)]
am
f97b6bee: Merge "Check integer overflow to prevent memory corruption" into klp-dev
* commit '
f97b6beeb2e2f0977d1c7fa8d2aaafe4e2f4d68a':
Check integer overflow to prevent memory corruption
Jon Larimer [Tue, 18 Aug 2015 15:13:39 +0000 (15:13 +0000)]
am
2ed42aea: Merge "do not dequeue from native window after we hit fatal error -- DO NOT MERGE" into klp-dev
* commit '
2ed42aea9c6fbca4bde52d647ff082b997b5968c':
do not dequeue from native window after we hit fatal error -- DO NOT MERGE
Jon Larimer [Tue, 18 Aug 2015 15:04:20 +0000 (15:04 +0000)]
Merge "Check integer overflow to prevent memory corruption" into klp-dev
Jon Larimer [Tue, 18 Aug 2015 15:00:47 +0000 (15:00 +0000)]
Merge "do not dequeue from native window after we hit fatal error -- DO NOT MERGE" into lmp-dev
Jon Larimer [Tue, 18 Aug 2015 15:00:42 +0000 (15:00 +0000)]
Merge "do not dequeue from native window after we hit fatal error -- DO NOT MERGE" into klp-dev
Jon Larimer [Tue, 18 Aug 2015 14:37:32 +0000 (14:37 +0000)]
Merge "SoftOpus: Fix output buffer capacity." into lmp-dev
Jon Larimer [Tue, 18 Aug 2015 14:31:25 +0000 (14:31 +0000)]
am
0d46c937: Merge "MPEG4Source::fragmentedRead: check range before writing into buffers" into klp-dev
* commit '
0d46c93785e2c426be11172bec0489b698fea6c3':
MPEG4Source::fragmentedRead: check range before writing into buffers
Jon Larimer [Tue, 18 Aug 2015 14:31:24 +0000 (14:31 +0000)]
am
aa1cc741: Merge "Check buffer size before using it" into klp-dev
* commit '
aa1cc74139341eb3ae9511af5310b965dbf890f4':
Check buffer size before using it
Jon Larimer [Tue, 18 Aug 2015 14:25:45 +0000 (14:25 +0000)]
Merge "MPEG4Source::fragmentedRead: check range before writing into buffers" into klp-dev
Jon Larimer [Tue, 18 Aug 2015 14:24:26 +0000 (14:24 +0000)]
Merge "Check buffer size before using it" into klp-dev
Abhishek Arya [Tue, 18 Aug 2015 13:41:18 +0000 (13:41 +0000)]
am
6efa86be: Merge "Check vector size before accessing" into klp-dev
* commit '
6efa86beff54332cbf7bbd4949b0c38c1ec8c5cd':
Check vector size before accessing
Abhishek Arya [Tue, 18 Aug 2015 13:36:34 +0000 (13:36 +0000)]
am
6f561b93: Merge "MatroskaExtractor: detect infinite loop when parsing NALs" into klp-dev
* commit '
6f561b93d8c6473fa0baa281ad4a53f882e656cc':
MatroskaExtractor: detect infinite loop when parsing NALs
Neel Mehta [Tue, 18 Aug 2015 13:36:33 +0000 (13:36 +0000)]
am
c37f7f6f: Fix for memory corruption in ID3::removeUnsynchronizationV2_4(). Bug:
23227354
* commit '
c37f7f6fa0cb7f55cdc5b2d4ccbf2c87c3bc6c3b':
Fix for memory corruption in ID3::removeUnsynchronizationV2_4(). Bug:
23227354
Abhishek Arya [Tue, 18 Aug 2015 13:28:34 +0000 (13:28 +0000)]
Merge "Check vector size before accessing" into klp-dev
Abhishek Arya [Tue, 18 Aug 2015 13:24:21 +0000 (13:24 +0000)]
Merge "MatroskaExtractor: detect infinite loop when parsing NALs" into klp-dev
Abhishek Arya [Tue, 18 Aug 2015 13:06:48 +0000 (13:06 +0000)]
am
09c29ec4: am
94c1969c: Merge "libstagefright: check memory size for overflow before allocation." into klp-dev
* commit '
09c29ec42df51ae807725d4eea52c4cc305c13a0':
libstagefright: check memory size for overflow before allocation.
Wei Jia [Tue, 18 Aug 2015 12:59:42 +0000 (12:59 +0000)]
Merge "Merge commit '
5a289b87' into HEAD" into lmp-dev
Robert Shih [Thu, 16 Jul 2015 22:04:12 +0000 (15:04 -0700)]
MatroskaExtractor: detect infinite loop when parsing NALs
Bug:
21335999
Change-Id: I76bd34610e52048ffcf16e41aa6175afc8a14ee4
(cherry picked from commit
2dcf6138ebc9c5688aeae151d2fbde55a2826128)
Wei Jia [Tue, 18 Aug 2015 02:27:05 +0000 (02:27 +0000)]
Merge "SoftAVCEncoder: fix mismatched type for comparison." into lmp-dev
Wei Jia [Tue, 18 Aug 2015 02:18:24 +0000 (19:18 -0700)]
Merge commit '
5a289b87' into HEAD
ABuffer: reset members when memory allocation fails.
Bug:
22077698
(cherry picked from commit
94b0badc025b14141ff234e3e4e2745411742bac)
Change-Id: I359ec16e524ffb298c143c3d72fbf1a3af72d663
Neel Mehta [Sat, 15 Aug 2015 00:38:48 +0000 (17:38 -0700)]
Fix for memory corruption in ID3::removeUnsynchronizationV2_4().
Bug:
23227354
Change-Id: Iaa36cfda4fd84ca7e039f56086fd61b4118020db
(cherry picked from commit
77e23413a539df16503e356bd4df4a952f3abc47)
Wei Jia [Tue, 18 Aug 2015 02:07:48 +0000 (19:07 -0700)]
SoftAVCEncoder: fix mismatched type for comparison.
Bug:
20674674
Change-Id: Iace5b8c882339b3a9d2e706375255aeeeb0532fe
Wei Jia [Tue, 18 Aug 2015 01:53:08 +0000 (01:53 +0000)]
am
6d59c11c: (-s ours) am
fc8c226b: Merge "Revert "SoftAVCEnc: check requested memory size before allocation."" into klp-dev
* commit '
6d59c11c0dfa5aee2ebbadcf282b512cb55be9c2':
Revert "SoftAVCEnc: check requested memory size before allocation."
Abhishek Arya [Tue, 18 Aug 2015 01:45:49 +0000 (01:45 +0000)]
am
deba0610: Merge "Revert "Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4"" into klp-dev
* commit '
deba0610c89d54390c9d2d0a0f3b79fd7679779c':
Revert "Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4"
Abhishek Arya [Tue, 18 Aug 2015 01:45:48 +0000 (01:45 +0000)]
am
9abb7401: Fix compile failure after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4
* commit '
9abb7401df730b5c510f6b8dac2716a0928d9623':
Fix compile failure after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4
Wei Jia [Tue, 18 Aug 2015 01:33:05 +0000 (01:33 +0000)]
am
652926c8: am
74d3170f: Merge "Fix comparison sign warnings." into klp-dev
* commit '
652926c8a37fb904aaa0756a0d0bae0574f308c5':
Fix comparison sign warnings.
Abhishek Arya [Tue, 18 Aug 2015 01:31:42 +0000 (01:31 +0000)]
Merge "Revert "Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4"" into klp-dev
Abhishek Arya [Tue, 18 Aug 2015 01:24:11 +0000 (18:24 -0700)]
Fix compile failure after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4
Bug:
20674086
Change-Id: I2ee6b7e0eabbf696c0986d08b2d759d48cb9eb7b
Eric Laurent [Fri, 8 May 2015 17:50:03 +0000 (10:50 -0700)]
DO NOT MERGE - audio flinger: fix fuzz test crash
Clear output stream pointer in duplicating thread
when the main output to which it is attached is closed.
Also do not forward master mute and volume commands to
duplicating threads as this is not applicable.
Also fix logic in AudioFlinger::primaryPlaybackThread_l()
that could accidentally return a duplicating thread.
This never happens because the primary thread is always
first in the list.
Bug:
20731946.
Change-Id: Ic8869699836920351b23d09544c50a258d3fb585
Wei Jia [Tue, 18 Aug 2015 01:09:22 +0000 (18:09 -0700)]
Merge commit '
b46eb8d9' into HEAD
SoftAVCEnc: check requested memory size before allocation.
Bug:
20674674
(cherry picked from commit
f6fe4340219a8e674f3250fe32d4697ec8184b24)
Change-Id: Ib52a26de912fd5a9a08dd9948885fb4a9b32e9e6
Wei Jia [Tue, 18 Aug 2015 01:00:53 +0000 (01:00 +0000)]
am
1a09d352: Merge "libstagefright: check remaining data size before parsing it." into klp-dev
* commit '
1a09d3521e8849dcb1090ecb50393f6e9ee140ec':
libstagefright: check remaining data size before parsing it.
Abhishek Arya [Tue, 18 Aug 2015 00:53:14 +0000 (00:53 +0000)]
am
c23e3dd8: Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4
* commit '
c23e3dd8af7397f023aae040c4a03dd14091cbed':
Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4
Wei Jia [Tue, 18 Aug 2015 00:53:12 +0000 (00:53 +0000)]
am
567b6551: Merge "SoftAVCEnc: check requested memory size before allocation." into klp-dev
* commit '
567b6551f8bc240cc267054ea5de55c46f10cc29':
SoftAVCEnc: check requested memory size before allocation.
Abhishek Arya [Tue, 18 Aug 2015 00:53:11 +0000 (00:53 +0000)]
am
94c1969c: Merge "libstagefright: check memory size for overflow before allocation." into klp-dev
* commit '
94c1969c38d4386933ed5cad7f625029442f6331':
libstagefright: check memory size for overflow before allocation.
Wei Jia [Tue, 18 Aug 2015 00:53:10 +0000 (00:53 +0000)]
am
120f259d: Merge "ABuffer: reset members when memory allocation fails." into klp-dev
* commit '
120f259d0de4dc048a2b9007c0f19b8808e59021':
ABuffer: reset members when memory allocation fails.
Wei Jia [Tue, 18 Aug 2015 00:53:09 +0000 (00:53 +0000)]
am
fc8c226b: Merge "Revert "SoftAVCEnc: check requested memory size before allocation."" into klp-dev
* commit '
fc8c226b75a45876e6545c3a217698ada52bd2d6':
Revert "SoftAVCEnc: check requested memory size before allocation."
Wei Jia [Tue, 18 Aug 2015 00:53:08 +0000 (00:53 +0000)]
am
74d3170f: Merge "Fix comparison sign warnings." into klp-dev
* commit '
74d3170ffc02620fcedb5a98c7a66e83ee2faa87':
Fix comparison sign warnings.
Wei Jia [Tue, 18 Aug 2015 00:53:07 +0000 (00:53 +0000)]
am
479b4de0: SoftAVCEnc: check requested memory size before allocation.
* commit '
479b4de0d267eb7d4c419f4da0069186a952ad17':
SoftAVCEnc: check requested memory size before allocation.
Wei Jia [Tue, 18 Aug 2015 00:48:01 +0000 (00:48 +0000)]
Merge "libstagefright: check remaining data size before parsing it." into klp-dev
Abhishek Arya [Mon, 17 Aug 2015 22:34:16 +0000 (22:34 +0000)]
Revert "Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4"
This reverts commit
c23e3dd8af7397f023aae040c4a03dd14091cbed.
This speculative fix didn't fix the compile failure, do checking locally.
Change-Id: I1598f7208c8232ca38c0fcad17f211598591594e
Robert Shih [Tue, 23 Jun 2015 00:58:27 +0000 (17:58 -0700)]
MPEG4Source::fragmentedRead: check range before writing into buffers
Bug:
22008959
Change-Id: I5f6e188adcc593796455bdaf7b0b8aba672b106e
Abhishek Arya [Mon, 17 Aug 2015 21:50:02 +0000 (14:50 -0700)]
Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4
BUG:
20674086
Change-Id: Idaff17975b327adea65c39bdba1ab4e88789c0cd
Wei Jia [Mon, 17 Aug 2015 19:49:39 +0000 (19:49 +0000)]
Merge "SoftAVCEnc: check requested memory size before allocation." into klp-dev
Abhishek Arya [Mon, 17 Aug 2015 18:39:11 +0000 (18:39 +0000)]
Merge "libstagefright: check memory size for overflow before allocation." into klp-dev
Chong Zhang [Fri, 15 May 2015 20:40:15 +0000 (13:40 -0700)]
stagefright: check IMemory::pointer() before using the allocation
bug:
19779574
Change-Id: I4ffe8c3fadc07da211f421e75ee83010b01d9cbb
Chong Zhang [Fri, 14 Aug 2015 20:50:02 +0000 (13:50 -0700)]
do not dequeue from native window after we hit fatal error -- DO NOT MERGE
bug:
22845824
Change-Id: I8c375790c697e02b6ab3ea54b84d3f70d5e78141
(cherry picked from commit
346de3c26a8fbd0fa0c8102f4a21ea4dcee4432a)
Chong Zhang [Fri, 14 Aug 2015 20:50:02 +0000 (13:50 -0700)]
do not dequeue from native window after we hit fatal error -- DO NOT MERGE
bug:
22845824
Change-Id: I8c375790c697e02b6ab3ea54b84d3f70d5e78141
(cherry picked from commit
346de3c26a8fbd0fa0c8102f4a21ea4dcee4432a)
Wei Jia [Mon, 17 Aug 2015 00:41:50 +0000 (17:41 -0700)]
libstagefright: check remaining data size before parsing it.
Bug:
23248776
Change-Id: I45cf53e58e4375afcf260b122264c968ec0ff6c8
(cherry picked from commit
3bf1e0fdf27e1188b8d3574ed073595b8eacb114)
Wei Jia [Mon, 17 Aug 2015 00:46:34 +0000 (17:46 -0700)]
SoftAVCEnc: check requested memory size before allocation.
Bug:
20674674
Change-Id: If80186a7b9078e575d389220f3bebe9f7630a956
(cherry picked from commit
f6fe4340219a8e674f3250fe32d4697ec8184b24)
Wei Jia [Sun, 16 Aug 2015 20:20:57 +0000 (20:20 +0000)]
Merge "ABuffer: reset members when memory allocation fails." into klp-dev
Wei Jia [Sun, 16 Aug 2015 18:19:37 +0000 (18:19 +0000)]
Merge "Revert "SoftAVCEnc: check requested memory size before allocation."" into klp-dev
Wei Jia [Sun, 16 Aug 2015 18:14:33 +0000 (18:14 +0000)]
Revert "SoftAVCEnc: check requested memory size before allocation."
This reverts commit
479b4de0d267eb7d4c419f4da0069186a952ad17.
Change-Id: I014746db3f861cb1cd5bf1b76f86b0356836a128
Wei Jia [Sun, 16 Aug 2015 18:02:05 +0000 (18:02 +0000)]
Merge "Fix comparison sign warnings." into klp-dev
Jeff Tinker [Tue, 11 Aug 2015 22:52:26 +0000 (15:52 -0700)]
Check integer overflow to prevent memory corruption
bug:
23016072
Change-Id: If3c9a835408773847c0024a812bd8b4915ebd680
(cherry picked from commit
fa8ebb45fd850f56ca1bf64fbed3ac11e10c7d3d)
Vignesh Venkatasubramanian [Thu, 11 Jun 2015 18:15:00 +0000 (11:15 -0700)]
SoftOpus: Fix output buffer capacity.
The output buffer size as per opus project's sample decoder [1] is
960*6*channel_count. Whereas in SoftOpus, we use 960*6 (without the
channel count multiplier. Fixing it to include maximum number of
channels possible as the multiplier.
[1] http://git.xiph.org/?p=opus-tools.git;a=blob;f=src/opusdec.c;h=
d085f04eacdfd49759ffdb73db805562ba396720;hb=
f2a2e88b47f6f24083a37be476f140f677fe7160#l571
BUG=
20721050
Change-Id: I323891a1b11491782bc093477b09e7757b885674
(cherry picked from commit
08e8227514f5ab99822dfae8b4d39414646ff59d)
Marco Nelissen [Wed, 1 Jul 2015 20:05:50 +0000 (13:05 -0700)]
Check buffer size before using it
Bug:
21814993
Change-Id: Idaac61b4b9f4058b94e84093644593ba315d72ff
(cherry picked from commit
c1a104aaad2d84a57bf5d87dd030d2bef56bf541)
Dan Albert [Fri, 8 May 2015 17:43:54 +0000 (10:43 -0700)]
Fix comparison sign warnings.
Bug:
23213430
Change-Id: I6f2e2b03b968a569b122004b4803c5d17fccfb12
(cherry picked from commit
635bc8f90429b2fdcaf7f8d43f7f59bcd0fe951c)
Wei Jia [Mon, 20 Jul 2015 18:34:22 +0000 (11:34 -0700)]
ABuffer: reset members when memory allocation fails.
Bug:
22077698
Change-Id: I2beb724662d041ad2339d0f4c7f983e7ac5e5e6f
(cherry picked from commit
94b0badc025b14141ff234e3e4e2745411742bac)
Wei Jia [Sat, 15 Aug 2015 00:16:46 +0000 (17:16 -0700)]
SoftAVCEnc: check requested memory size before allocation.
Bug:
20674674
Change-Id: I569e7a9b33fe64779a40e55539929c3dc4303c19
(cherry picked from commit
f6fe4340219a8e674f3250fe32d4697ec8184b24)
Marco Nelissen [Fri, 24 Jul 2015 16:18:36 +0000 (09:18 -0700)]
Check vector size before accessing
Bug:
22388975
Change-Id: I3c157b1029d37f6a22e6302ea7b52077fe27ce53
(cherry picked from commit
529c595b083f8a4c3175e2350fba5547e6008e00)
Wei Jia [Wed, 3 Jun 2015 20:47:51 +0000 (13:47 -0700)]
libstagefright: check memory size for overflow before allocation.
Bug:
20674086
Change-Id: I431aa2b7d30a942350ab6d105451c6b77e2f99d4
(cherry picked from commit
42cccd7c8811597d56fb86afeacf6231d693dea6)
Eric Laurent [Thu, 2 Apr 2015 20:49:15 +0000 (13:49 -0700)]
DO NOT MERGE - IAudioFlinger: add checks on binder calls
Limit number of ports and patches listed by
LIST_AUDIO_PATCHES and LIST_AUDIO_PORTS.
Also fix typo causing wrong pointer to be used when writing to Parcel.
Bug:
19573085.
Change-Id: I41a9c710e45738a4f11990160587856c429a4646
(cherry picked from commit
f75c2fef14354024ec27bff1444f9e50b5ef55a9)
Wei Jia [Thu, 13 Aug 2015 18:14:57 +0000 (18:14 +0000)]
am
88aa97ea: am
3ce29384: libstagefright: fix possible overflow in amrwbenc.
* commit '
88aa97ea87b7e4f7b4f82df3500754e03205ef60':
libstagefright: fix possible overflow in amrwbenc.
Wei Jia [Thu, 13 Aug 2015 18:08:00 +0000 (18:08 +0000)]
am
3ce29384: libstagefright: fix possible overflow in amrwbenc.
* commit '
3ce293842fed1b3abd2ff0aecd2a0c70a55086ee':
libstagefright: fix possible overflow in amrwbenc.
Wei Jia [Wed, 12 Aug 2015 17:08:41 +0000 (10:08 -0700)]
libstagefright: fix possible overflow in amrwbenc.
Bug:
23142203
Change-Id: I309df51e4df6412655f04cc093d792bf6c7944f7
(cherry picked from commit
9dd01777aa14bbb90a6cdccf97383bb4e3d717a5)
Wei Jia [Thu, 13 Aug 2015 16:42:54 +0000 (16:42 +0000)]
am
4e86a483: am
f51115bd: libstagefright: fix possible overflow in ID3.
* commit '
4e86a483a12b0139a8babf4754e5de340eaccd40':
libstagefright: fix possible overflow in ID3.
Wei Jia [Thu, 13 Aug 2015 16:34:17 +0000 (16:34 +0000)]
am
f51115bd: libstagefright: fix possible overflow in ID3.
* commit '
f51115bd8e44c2779b74477277c6f6046916e7cf':
libstagefright: fix possible overflow in ID3.
Wei Jia [Wed, 12 Aug 2015 17:41:00 +0000 (10:41 -0700)]
libstagefright: fix possible overflow in ID3.
Bug:
23129786
Change-Id: I2e6b7a6927aa4362ab49dd6824bbb1abf7b4e661
(cherry picked from commit
09da86913ca97d7a818a8917b6601527e5e18a24)
Nick Kralevich [Tue, 11 Aug 2015 05:04:40 +0000 (05:04 +0000)]
am
94f8150b: resolved conflicts for merge of
c86eae32 to klp-modular-dev
* commit '
94f8150be2041f73c2f185f2c3622a9537d47454':
MPEG4Extractor.cpp: Add check for size == SIZE_MAX
Nick Kralevich [Tue, 11 Aug 2015 04:24:54 +0000 (21:24 -0700)]
resolved conflicts for merge of
c86eae32 to klp-modular-dev
Change-Id: I127912aed9c9e57a985c46bee13d111e159d2c6f
Nick Kralevich [Tue, 11 Aug 2015 03:31:38 +0000 (03:31 +0000)]
am
9d9491f9: am
0dbd0d7b: am
c9924410: am
2fe61ed0: am
3b8d3fa0: am
186d1fb9: am
f4dfe12e: am
54d88fe2: am
aa8dab77: Merge "MPEG4Extractor.cpp: Add check for size == SIZE_MAX" into jb-dev
* commit '
9d9491f9fb83523cfe68f2aa26c14f72f70812fc':
MPEG4Extractor.cpp: Add check for size == SIZE_MAX