OSDN Git Service
Marco Nelissen [Thu, 20 Aug 2015 18:05:12 +0000 (18:05 +0000)]
am
a07ad890: am
776bfd80: am
8a55bcb6: resolved conflicts for merge of
ced2dd3c to lmp-dev
* commit '
a07ad8901acd0b4c1eeab5e0c44b56b692662a92':
Sanity check padding/delay values for gapless playback
Marco Nelissen [Thu, 20 Aug 2015 17:59:10 +0000 (17:59 +0000)]
am
776bfd80: am
8a55bcb6: resolved conflicts for merge of
ced2dd3c to lmp-dev
* commit '
776bfd806a1619ac0944d4ea36330c4cde4d665d':
Sanity check padding/delay values for gapless playback
Marco Nelissen [Thu, 20 Aug 2015 17:54:22 +0000 (17:54 +0000)]
am
8a55bcb6: resolved conflicts for merge of
ced2dd3c to lmp-dev
* commit '
8a55bcb640c8842348eb41495fdb8fe82cb0465d':
Sanity check padding/delay values for gapless playback
Marco Nelissen [Thu, 20 Aug 2015 17:26:33 +0000 (10:26 -0700)]
resolved conflicts for merge of
ced2dd3c to lmp-dev
Change-Id: I5dbb4f7d6c38c75a54c59d5e59305657bc50ab10
Wei Jia [Thu, 20 Aug 2015 17:16:00 +0000 (17:16 +0000)]
am
f076fabf: am
0af43510: am
2562495d: am
a590baca: Merge commit \'
6ae815e0\' into HEAD
* commit '
f076fabff7a518ed5668a9a1be03dd729b8cbfb6':
libstagefright: fix overflow in MPEG4Source::parseSampleAuxiliaryInformationOffsets.
Wei Jia [Thu, 20 Aug 2015 17:07:14 +0000 (17:07 +0000)]
am
0af43510: am
2562495d: am
a590baca: Merge commit \'
6ae815e0\' into HEAD
* commit '
0af43510cc45373614cdfce7d014283100e96cb9':
libstagefright: fix overflow in MPEG4Source::parseSampleAuxiliaryInformationOffsets.
Abhishek Arya [Thu, 20 Aug 2015 17:04:05 +0000 (17:04 +0000)]
am
2c880dde: Merge "Sanity check padding/delay values for gapless playback" into klp-dev
* commit '
2c880dde90e4303f9201f46124ee879325c57ba0':
Sanity check padding/delay values for gapless playback
Wei Jia [Thu, 20 Aug 2015 16:59:43 +0000 (16:59 +0000)]
am
2562495d: am
a590baca: Merge commit \'
6ae815e0\' into HEAD
* commit '
2562495de9338e14ca3a3ef74ce07a7b310cd1fb':
libstagefright: fix overflow in MPEG4Source::parseSampleAuxiliaryInformationOffsets.
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:42:43 +0000 (04:42 +0000)]
am
238a487a: am
e3cb2507: am
4b995f73: Merge "libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable." into lmp-dev
* commit '
238a487a0cf0fde606a27ea1f00bad5d92589161':
libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable.
Wei Jia [Thu, 20 Aug 2015 04:36:50 +0000 (04:36 +0000)]
am
e3cb2507: am
4b995f73: Merge "libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable." into lmp-dev
* commit '
e3cb25078b814b40f8e1506514bd17066935a51f':
libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable.
Wei Jia [Thu, 20 Aug 2015 04:31:45 +0000 (04:31 +0000)]
am
4b995f73: Merge "libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable." into lmp-dev
* commit '
4b995f73b581ce0705b537317f32ad76bddb55fa':
libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable.
Wei Jia [Thu, 20 Aug 2015 04:30:33 +0000 (04:30 +0000)]
am
4bb01def: am
84a4221e: am
a9b3cd3c: am
5221133b: am
b2ae4351: libstagefright: fix overflow in pvdec_api.cpp.
* commit '
4bb01def2c34e8b92a6640190b42f8555e989d60':
libstagefright: fix overflow in pvdec_api.cpp.
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:23:14 +0000 (04:23 +0000)]
am
84a4221e: am
a9b3cd3c: am
5221133b: am
b2ae4351: libstagefright: fix overflow in pvdec_api.cpp.
* commit '
84a4221e305847fb0c8846122fe8f2bc7c2fda0a':
libstagefright: fix overflow in pvdec_api.cpp.
Wei Jia [Thu, 20 Aug 2015 04:16:58 +0000 (04:16 +0000)]
am
a9b3cd3c: am
5221133b: am
b2ae4351: libstagefright: fix overflow in pvdec_api.cpp.
* commit '
a9b3cd3c101b68522a3d8492cb3a19d8b5409329':
libstagefright: fix overflow in pvdec_api.cpp.
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.
Abhishek Arya [Thu, 20 Aug 2015 04:06:25 +0000 (04:06 +0000)]
Merge "Sanity check padding/delay values for gapless playback" into klp-dev
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 [Wed, 19 Aug 2015 02:28:33 +0000 (02:28 +0000)]
am
603d35e1: am
096a931e: am
fd5942b3: am
6b52d191: (-s ours) am
916a9684: Merge "DO NOT MERGE - audio flinger: fix fuzz test crash" into klp-dev
* commit '
603d35e184802dcf7cfe184ea492af5acc4bc839':
DO NOT MERGE - audio flinger: fix fuzz test crash
Eric Laurent [Wed, 19 Aug 2015 02:19:47 +0000 (02:19 +0000)]
am
096a931e: am
fd5942b3: am
6b52d191: (-s ours) am
916a9684: Merge "DO NOT MERGE - audio flinger: fix fuzz test crash" into klp-dev
* commit '
096a931e5a0d5f45c3546b09046912b4d54136c8':
DO NOT MERGE - audio flinger: fix fuzz test crash
Eric Laurent [Wed, 19 Aug 2015 01:42:46 +0000 (01:42 +0000)]
am
bc167f83: resolved conflicts for merge of
84fb58bd to lmp-mr1-dev
* commit '
bc167f832db091e490b552a147ec73412241e1e5':
DO NOT MERGE - audio flinger: fix fuzz test crash
Eric Laurent [Wed, 19 Aug 2015 01:27:54 +0000 (18:27 -0700)]
resolved conflicts for merge of
84fb58bd to lmp-mr1-dev
Change-Id: I9b2b1ff690d35e0da644bdb52c8c42a72e5fd4f6
Eric Laurent [Tue, 18 Aug 2015 21:58:54 +0000 (21:58 +0000)]
am
fd5942b3: am
6b52d191: (-s ours) am
916a9684: Merge "DO NOT MERGE - audio flinger: fix fuzz test crash" into klp-dev
* commit '
fd5942b332c5f6e4dc50f50181344957334854e1':
DO NOT MERGE - audio flinger: fix fuzz test crash
Eric Laurent [Tue, 18 Aug 2015 21:52:31 +0000 (21:52 +0000)]
am
bdb5e497: Merge "DO NOT MERGE - audio flinger: fix fuzz test crash" into lmp-dev
* commit '
bdb5e49787dcb56fec68a2410a0985bfe388cd14':
DO NOT MERGE - audio flinger: fix fuzz test crash
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
Chong Zhang [Tue, 18 Aug 2015 18:35:54 +0000 (18:35 +0000)]
am
bfadec12: am
25c00122: am
4ce86e78: am
5d7a381b: am
877c76ac: Merge "stagefright: check IMemory::pointer() before using the allocation" into klp-dev
* commit '
bfadec126c43cff30aa8445d8d42265c39a03ad5':
stagefright: check IMemory::pointer() before using the allocation
Jon Larimer [Tue, 18 Aug 2015 18:35:53 +0000 (18:35 +0000)]
am
64459f96: am
3e9ed500: am
8a1a5d17: am
9707195b: am
f97b6bee: Merge "Check integer overflow to prevent memory corruption" into klp-dev
* commit '
64459f96001c4cd38fa28946fc805f022d3676b5':
Check integer overflow to prevent memory corruption
Jon Larimer [Tue, 18 Aug 2015 18:35:52 +0000 (18:35 +0000)]
am
7ba8b9f8: am
fc26577c: am
698ff79c: 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 '
7ba8b9f84531091c50ef5e1903b3428330e7b9e1':
do not dequeue from native window after we hit fatal error -- DO NOT MERGE
Nick Kralevich [Tue, 18 Aug 2015 18:35:52 +0000 (18:35 +0000)]
am
a3a29952: am
4b153ff9: am
2f3c04a4: resolved conflicts for merge of
6035c811 to lmp-dev
* commit '
a3a29952f485cd2ebf521273a7b36aac586451cf':
MPEG4Source::fragmentedRead: check range before writing into buffers
Chong Zhang [Tue, 18 Aug 2015 18:31:22 +0000 (18:31 +0000)]
am
25c00122: am
4ce86e78: am
5d7a381b: am
877c76ac: Merge "stagefright: check IMemory::pointer() before using the allocation" into klp-dev
* commit '
25c00122a640ee311e6e72df401c362ec798617d':
stagefright: check IMemory::pointer() before using the allocation
Jon Larimer [Tue, 18 Aug 2015 18:31:21 +0000 (18:31 +0000)]
am
3e9ed500: am
8a1a5d17: am
9707195b: am
f97b6bee: Merge "Check integer overflow to prevent memory corruption" into klp-dev
* commit '
3e9ed500718386db2d70d555098fa1e931e75d28':
Check integer overflow to prevent memory corruption
Jon Larimer [Tue, 18 Aug 2015 18:31:21 +0000 (18:31 +0000)]
am
fc26577c: am
698ff79c: 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 '
fc26577c6023ac6861c1875e6ae02f23ce53afc0':
do not dequeue from native window after we hit fatal error -- DO NOT MERGE
Nick Kralevich [Tue, 18 Aug 2015 18:31:20 +0000 (18:31 +0000)]
am
4b153ff9: am
2f3c04a4: resolved conflicts for merge of
6035c811 to lmp-dev
* commit '
4b153ff9b5c979684ed0a53d52a3ad90ec7f7d22':
MPEG4Source::fragmentedRead: check range before writing into buffers
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:23:44 +0000 (18:23 +0000)]
am
4ce86e78: am
5d7a381b: am
877c76ac: Merge "stagefright: check IMemory::pointer() before using the allocation" into klp-dev
* commit '
4ce86e781bf5ac7ef047cdb81db858fae12fd334':
stagefright: check IMemory::pointer() before using the allocation
Jon Larimer [Tue, 18 Aug 2015 18:23:43 +0000 (18:23 +0000)]
am
8a1a5d17: am
9707195b: am
f97b6bee: Merge "Check integer overflow to prevent memory corruption" into klp-dev
* commit '
8a1a5d17ddc3ff902a9d9e1858713ed9406c45c8':
Check integer overflow to prevent memory corruption
Jon Larimer [Tue, 18 Aug 2015 18:23:42 +0000 (18:23 +0000)]
am
698ff79c: 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 '
698ff79c1e37f01678231eb4f57dc8f6574a7f83':
do not dequeue from native window after we hit fatal error -- DO NOT MERGE
Nick Kralevich [Tue, 18 Aug 2015 18:23:42 +0000 (18:23 +0000)]
am
2f3c04a4: resolved conflicts for merge of
6035c811 to lmp-dev
* commit '
2f3c04a4e92aabea09325cd6870d74a705d98dd8':
MPEG4Source::fragmentedRead: check range before writing into buffers
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
Marco Nelissen [Tue, 18 Aug 2015 16:55:24 +0000 (09:55 -0700)]
Sanity check padding/delay values for gapless playback
Bug:
23306638
Change-Id: I2b5160e0f58f90d3f67c3964f41f5734ec0da053
Jon Larimer [Tue, 18 Aug 2015 16:51:16 +0000 (16:51 +0000)]
am
6f0b1b3e: am
484ebc81: am
a1e462e5: am
0afecdeb: am
aa1cc741: Merge "Check buffer size before using it" into klp-dev
* commit '
6f0b1b3e25eb2db2e8465f13268c297fa9070012':
Check buffer size before using it
Abhishek Arya [Tue, 18 Aug 2015 16:51:15 +0000 (16:51 +0000)]
am
8a83ce9c: am
54ea6c02: am
5ff4bb7a: am
8026ad38: am
6efa86be: Merge "Check vector size before accessing" into klp-dev
* commit '
8a83ce9cf5487921596161c31714ae1a5e8db6b7':
Check vector size before accessing
Abhishek Arya [Tue, 18 Aug 2015 16:51:14 +0000 (16:51 +0000)]
am
3459ea26: am
de47cd3c: am
3b77e940: am
d146d466: am
6f561b93: Merge "MatroskaExtractor: detect infinite loop when parsing NALs" into klp-dev
* commit '
3459ea265ab8c61cca1b2ed97162fe3c3d05a698':
MatroskaExtractor: detect infinite loop when parsing NALs
Neel Mehta [Tue, 18 Aug 2015 16:51:13 +0000 (16:51 +0000)]
am
48bdf782: am
00887af1: am
e9a8362e: am
a2a68264: am
c37f7f6f: Fix for memory corruption in ID3::removeUnsynchronizationV2_4(). Bug:
23227354
* commit '
48bdf782f92a975f3597c40d175fa579adfd74d4':
Fix for memory corruption in ID3::removeUnsynchronizationV2_4(). Bug:
23227354
Abhishek Arya [Tue, 18 Aug 2015 16:51:13 +0000 (16:51 +0000)]
am
8b0660e0: am
3c803e7f: am
6afd8574: am
073a656d: am
deba0610: Merge "Revert "Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4"" into klp-dev
* commit '
8b0660e0b4335d1a594602715da92e7b52c66260':
Revert "Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4"
Abhishek Arya [Tue, 18 Aug 2015 16:51:12 +0000 (16:51 +0000)]
am
5d629bf2: am
93bc6176: am
01841c73: am
af46239a: am
9abb7401: Fix compile failure after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4
* commit '
5d629bf257ee2568d665d2c1d2a5a9fcd15c1ece':
Fix compile failure after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4
Wei Jia [Tue, 18 Aug 2015 16:51:11 +0000 (16:51 +0000)]
am
91c71293: am
91fc84f2: am
de5c4c46: am
43131299: am
1a09d352: Merge "libstagefright: check remaining data size before parsing it." into klp-dev
* commit '
91c712933ceb90d815f6447716409a4f1a2cc148':
libstagefright: check remaining data size before parsing it.
Abhishek Arya [Tue, 18 Aug 2015 16:51:10 +0000 (16:51 +0000)]
am
cc3411e3: am
0bf31aeb: am
9359e822: am
8a34499a: am
c23e3dd8: Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4
* commit '
cc3411e3539a6c762404ca2ca92a6649862745ba':
Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4
Wei Jia [Tue, 18 Aug 2015 16:51:09 +0000 (16:51 +0000)]
am
374e600c: am
0a427176: am
d3b0f865: am
ce380290: (-s ours) am
567b6551: Merge "SoftAVCEnc: check requested memory size before allocation." into klp-dev
* commit '
374e600c3e5d59b2f544a576ffadec1ffcf9c1c5':
SoftAVCEnc: check requested memory size before allocation.
Jon Larimer [Tue, 18 Aug 2015 16:47:06 +0000 (16:47 +0000)]
am
484ebc81: am
a1e462e5: am
0afecdeb: am
aa1cc741: Merge "Check buffer size before using it" into klp-dev
* commit '
484ebc81263a627b5e24e65373ab0752996ca0c8':
Check buffer size before using it
Abhishek Arya [Tue, 18 Aug 2015 16:47:04 +0000 (16:47 +0000)]
am
54ea6c02: am
5ff4bb7a: am
8026ad38: am
6efa86be: Merge "Check vector size before accessing" into klp-dev
* commit '
54ea6c02570ca87e94b03e0a8468dfc2f20536b7':
Check vector size before accessing
Abhishek Arya [Tue, 18 Aug 2015 16:47:03 +0000 (16:47 +0000)]
am
de47cd3c: am
3b77e940: am
d146d466: am
6f561b93: Merge "MatroskaExtractor: detect infinite loop when parsing NALs" into klp-dev
* commit '
de47cd3c5223bb0fdd7376f8ea21ba2f857bafbe':
MatroskaExtractor: detect infinite loop when parsing NALs
Neel Mehta [Tue, 18 Aug 2015 16:47:02 +0000 (16:47 +0000)]
am
00887af1: am
e9a8362e: am
a2a68264: am
c37f7f6f: Fix for memory corruption in ID3::removeUnsynchronizationV2_4(). Bug:
23227354
* commit '
00887af170d5302d1030e107ed3db969b05edcb4':
Fix for memory corruption in ID3::removeUnsynchronizationV2_4(). Bug:
23227354
Abhishek Arya [Tue, 18 Aug 2015 16:47:00 +0000 (16:47 +0000)]
am
3c803e7f: am
6afd8574: am
073a656d: am
deba0610: Merge "Revert "Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4"" into klp-dev
* commit '
3c803e7f777ad745b1b2cae0bdb2a31b11d47e80':
Revert "Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4"
Abhishek Arya [Tue, 18 Aug 2015 16:46:58 +0000 (16:46 +0000)]
am
93bc6176: am
01841c73: am
af46239a: am
9abb7401: Fix compile failure after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4
* commit '
93bc61764eb8417165de2bbaa6384165f7298a32':
Fix compile failure after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4
Wei Jia [Tue, 18 Aug 2015 16:46:56 +0000 (16:46 +0000)]
am
91fc84f2: am
de5c4c46: am
43131299: am
1a09d352: Merge "libstagefright: check remaining data size before parsing it." into klp-dev
* commit '
91fc84f2102f222607d402953d9c1d4383e15a71':
libstagefright: check remaining data size before parsing it.
Abhishek Arya [Tue, 18 Aug 2015 16:46:55 +0000 (16:46 +0000)]
am
0bf31aeb: am
9359e822: am
8a34499a: am
c23e3dd8: Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4
* commit '
0bf31aeb5b0e58cd167aaee2a6cb4d9248e0e66b':
Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4
Wei Jia [Tue, 18 Aug 2015 16:46:54 +0000 (16:46 +0000)]
am
0a427176: am
d3b0f865: am
ce380290: (-s ours) am
567b6551: Merge "SoftAVCEnc: check requested memory size before allocation." into klp-dev
* commit '
0a427176083f5b82f4c47031fbc51dd1801121da':
SoftAVCEnc: check requested memory size before allocation.
Jon Larimer [Tue, 18 Aug 2015 16:40:50 +0000 (16:40 +0000)]
am
a1e462e5: am
0afecdeb: am
aa1cc741: Merge "Check buffer size before using it" into klp-dev
* commit '
a1e462e5531db20d1dc70c3e24c82879a0a90870':
Check buffer size before using it
Abhishek Arya [Tue, 18 Aug 2015 16:40:49 +0000 (16:40 +0000)]
am
5ff4bb7a: am
8026ad38: am
6efa86be: Merge "Check vector size before accessing" into klp-dev
* commit '
5ff4bb7a65f0495c2cd79413ef3001b208ae7e2c':
Check vector size before accessing
Abhishek Arya [Tue, 18 Aug 2015 16:40:48 +0000 (16:40 +0000)]
am
3b77e940: am
d146d466: am
6f561b93: Merge "MatroskaExtractor: detect infinite loop when parsing NALs" into klp-dev
* commit '
3b77e940822e8a5ef4953b709bdae00fa1bcca43':
MatroskaExtractor: detect infinite loop when parsing NALs
Neel Mehta [Tue, 18 Aug 2015 16:40:47 +0000 (16:40 +0000)]
am
e9a8362e: am
a2a68264: am
c37f7f6f: Fix for memory corruption in ID3::removeUnsynchronizationV2_4(). Bug:
23227354
* commit '
e9a8362e1d379e90655e904ca49d6333e4218eda':
Fix for memory corruption in ID3::removeUnsynchronizationV2_4(). Bug:
23227354
Abhishek Arya [Tue, 18 Aug 2015 16:40:46 +0000 (16:40 +0000)]
am
6afd8574: am
073a656d: am
deba0610: Merge "Revert "Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4"" into klp-dev
* commit '
6afd8574d44ae158bed9cafe1c74dd1bfc5573b6':
Revert "Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4"
Abhishek Arya [Tue, 18 Aug 2015 16:40:45 +0000 (16:40 +0000)]
am
01841c73: am
af46239a: am
9abb7401: Fix compile failure after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4
* commit '
01841c73a5a824a34d794ec69e2769b088306485':
Fix compile failure after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4
Wei Jia [Tue, 18 Aug 2015 16:40:44 +0000 (16:40 +0000)]
am
de5c4c46: am
43131299: am
1a09d352: Merge "libstagefright: check remaining data size before parsing it." into klp-dev
* commit '
de5c4c4671f63457151fce7b4ad7963518f8ce36':
libstagefright: check remaining data size before parsing it.
Abhishek Arya [Tue, 18 Aug 2015 16:40:43 +0000 (16:40 +0000)]
am
9359e822: am
8a34499a: am
c23e3dd8: Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4
* commit '
9359e82213e6027b2390b76ba30e2e44f0d5cec6':
Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4
Wei Jia [Tue, 18 Aug 2015 16:40:43 +0000 (16:40 +0000)]
am
d3b0f865: am
ce380290: (-s ours) am
567b6551: Merge "SoftAVCEnc: check requested memory size before allocation." into klp-dev
* commit '
d3b0f865dcf66dfdf89e7e4d296e4a432a2e8a16':
SoftAVCEnc: check requested memory size before allocation.
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:19:20 +0000 (15:19 +0000)]
am
2ea335b1: am
fecbc5da: am
5b4a5cce: Merge "do not dequeue from native window after we hit fatal error -- DO NOT MERGE" into lmp-dev
* commit '
2ea335b11c1e328896a6c7a2e6d2bc190b7f06fc':
do not dequeue from native window after we hit fatal error -- DO NOT MERGE
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:13:19 +0000 (15:13 +0000)]
am
fecbc5da: am
5b4a5cce: Merge "do not dequeue from native window after we hit fatal error -- DO NOT MERGE" into lmp-dev
* commit '
fecbc5da64a992f91f74ef6c67a7e247b0da7777':
do not dequeue from native window after we hit fatal error -- DO NOT MERGE
Jon Larimer [Tue, 18 Aug 2015 15:08:53 +0000 (15:08 +0000)]
am
5b4a5cce: Merge "do not dequeue from native window after we hit fatal error -- DO NOT MERGE" into lmp-dev
* commit '
5b4a5cce6eb17ef5d0b37cfb4ad7e617eb978423':
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:56:51 +0000 (14:56 +0000)]
am
afa0e369: am
cad46fbd: am
f1a93e47: Merge "SoftOpus: Fix output buffer capacity." into lmp-dev
* commit '
afa0e3698355f341009a8042d62c82016f86a1c8':
SoftOpus: Fix output buffer capacity.
Jon Larimer [Tue, 18 Aug 2015 14:50:36 +0000 (14:50 +0000)]
am
cad46fbd: am
f1a93e47: Merge "SoftOpus: Fix output buffer capacity." into lmp-dev
* commit '
cad46fbde4961d5374c27f9d85cd8f2b6822ffa7':
SoftOpus: Fix output buffer capacity.
OSDN Git Service
