OSDN Git Service
Marco Nelissen [Thu, 20 Aug 2015 19:01:36 +0000 (19:01 +0000)]
am
d4f0d88e: resolved conflicts for merge of
eb10ccbc to lmp-dev
* commit '
d4f0d88e701f5323621bd352cf4cbcd14bc349c4':
Fail more gracefully on allocation failure
Marco Nelissen [Thu, 20 Aug 2015 18:45:19 +0000 (11:45 -0700)]
resolved conflicts for merge of
eb10ccbc to lmp-dev
Change-Id: I1d3220bcfe53ab6ad9dba87ef8e41b52f3bb1f30
Marco Nelissen [Thu, 20 Aug 2015 18:29:58 +0000 (11:29 -0700)]
resolved conflicts for merge of
8a064aa8 to klp-modular-dev
Change-Id: If031955c9edca657401831fbfa5a128f0b4c6d86
Nick Kralevich [Thu, 20 Aug 2015 18:18:58 +0000 (18:18 +0000)]
am
ef87594b: Merge "libstagefright: Fix crash in convertMetaDataToMessage" into lmp-dev
* commit '
ef87594bd821520cdc46e30036c16ee2eb5becb3':
libstagefright: Fix crash in convertMetaDataToMessage
Nick Kralevich [Thu, 20 Aug 2015 18:09:48 +0000 (18:09 +0000)]
Merge "libstagefright: Fix crash in convertMetaDataToMessage" into lmp-dev
Marco Nelissen [Thu, 20 Aug 2015 18:05:08 +0000 (18:05 +0000)]
Merge "Fail more gracefully on allocation failure" into klp-dev
Wei Jia [Thu, 20 Aug 2015 17:58:53 +0000 (17:58 +0000)]
am
b53cdf49: am
d7c205fe: am
522019f1: Merge "libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable." into klp-dev
* commit '
b53cdf492fafd31763631c9664874f10325b6ff7':
libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable.
Abhishek Arya [Thu, 20 Aug 2015 17:58:52 +0000 (17:58 +0000)]
am
2fd79fa3: am
cb2acbfe: am
635d38a8: Merge "Check RTSP payload length" into klp-dev
* commit '
2fd79fa39a0ec347a80ceb5b056ed5053002f59e':
Check RTSP payload length
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
Wei Jia [Thu, 20 Aug 2015 17:51:08 +0000 (17:51 +0000)]
am
d7c205fe: am
522019f1: Merge "libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable." into klp-dev
* commit '
d7c205fe1f7cda2cdcb3062b548c0777402bab38':
libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable.
Abhishek Arya [Thu, 20 Aug 2015 17:51:05 +0000 (17:51 +0000)]
am
cb2acbfe: am
635d38a8: Merge "Check RTSP payload length" into klp-dev
* commit '
cb2acbfed69d18aa4693c03d8a77cd45daf8af8d':
Check RTSP payload length
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:04:07 +0000 (17:04 +0000)]
am
522019f1: Merge "libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable." into klp-dev
* commit '
522019f15b3c191b73d1a0ddb56aeb3dd6b7ce31':
libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable.
Abhishek Arya [Thu, 20 Aug 2015 17:04:06 +0000 (17:04 +0000)]
am
635d38a8: Merge "Check RTSP payload length" into klp-dev
* commit '
635d38a84414e26aaf6c4b5df7859fde196adeaf':
Check RTSP payload length
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: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:27:23 +0000 (04:27 +0000)]
Merge "libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable." into klp-dev
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: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:10:51 +0000 (04:10 +0000)]
Merge "Check RTSP payload length" into klp-dev
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)
Marco Nelissen [Wed, 19 Aug 2015 22:36:12 +0000 (15:36 -0700)]
Check RTSP payload length
Bug:
23346388
Change-Id: Ifd918cefc90527c2f52177c3ce0da7a13259ad08
Wei Jia [Thu, 25 Jun 2015 18:46:54 +0000 (11:46 -0700)]
libstagefright: Fix crash in convertMetaDataToMessage
- The ABuffer used for the Message has a preset value of 1024, if
flattening the meta data exceeds this value, a check fails hence
the crash.
- This change creates a new ABuffer if the buffer size would exceed
the buffer capacity.
Bug:
22771132
CRs-Fixed: 857850
(cherry picked from commit
9c170c076382096b9e767da0e3f9f37dafa76546)
Change-Id: I056ade2f95bc8d82dfe092de7ecddba588cc5b72
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)
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)
Marco Nelissen [Fri, 13 Jun 2014 21:13:44 +0000 (14:13 -0700)]
Fail more gracefully on allocation failure
Check allocations when the size is read from a file and might therefore
be invalid.
b/
14388161
Change-Id: Ia08cc0a6107f275a70e793ef3b50c0ce16ceeee0
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
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: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: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: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:45:26 +0000 (14:45 +0000)]
am
f1a93e47: Merge "SoftOpus: Fix output buffer capacity." into lmp-dev
* commit '
f1a93e4720a71c308c3d88a9f751555ff532a01c':
SoftOpus: Fix output buffer capacity.
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:14:57 +0000 (13:14 +0000)]
am
33235986: am
09c29ec4: am
94c1969c: Merge "libstagefright: check memory size for overflow before allocation." into klp-dev
* commit '
33235986a7490b569c859e5555328cbe1bae2748':
libstagefright: check memory size for overflow before allocation.
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 13:04:50 +0000 (13:04 +0000)]
am
45e493e4: Merge "Merge commit \'
5a289b87\' into HEAD" into lmp-dev
* commit '
45e493e40ca5497cc7c21c3c683145d87bd37364':
ABuffer: reset members when memory allocation fails.
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:33:01 +0000 (02:33 +0000)]
am
9cebcc5f: Merge "SoftAVCEncoder: fix mismatched type for comparison." into lmp-dev
* commit '
9cebcc5f7992ded7fa686575914830b6554cd6c9':
SoftAVCEncoder: fix mismatched type for comparison.
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:59:47 +0000 (01:59 +0000)]
am
7d113a23: am
6d59c11c: (-s ours) am
fc8c226b: Merge "Revert "SoftAVCEnc: check requested memory size before allocation."" into klp-dev
* commit '
7d113a238871413e9bef15a2aa40731e56127a40':
Revert "SoftAVCEnc: check requested memory size before allocation."
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"