summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am bdb5e497: Merge "DO NOT MERGE - audio flinger: fix fuzz test crash" into l...Eric Laurent2015-08-183-7/+23
|\
| * Merge "DO NOT MERGE - audio flinger: fix fuzz test crash" into lmp-devEric Laurent2015-08-183-7/+23
| |\
| | * DO NOT MERGE - audio flinger: fix fuzz test crashEric Laurent2015-08-183-7/+23
* | | am 4ce86e78: am 5d7a381b: am 877c76ac: Merge "stagefright: check IMemory::poi...Chong Zhang2015-08-181-2/+6
|\ \ \ | |/ /
| * | am 5d7a381b: am 877c76ac: Merge "stagefright: check IMemory::pointer() before...Chong Zhang2015-08-181-2/+6
| |\ \
| | * \ am 877c76ac: Merge "stagefright: check IMemory::pointer() before using the al...Chong Zhang2015-08-181-2/+6
| | |\ \
| | | * \ Merge "stagefright: check IMemory::pointer() before using the allocation" int...Chong Zhang2015-08-181-2/+6
| | | |\ \
| | | | * | stagefright: check IMemory::pointer() before using the allocationChong Zhang2015-08-171-2/+6
* | | | | | am 8a1a5d17: am 9707195b: am f97b6bee: Merge "Check integer overflow to preve...Jon Larimer2015-08-181-1/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 9707195b: am f97b6bee: Merge "Check integer overflow to prevent memory cor...Jon Larimer2015-08-181-1/+2
| |\ \ \ \ \ | | |/ / / /
| | * | | | am f97b6bee: Merge "Check integer overflow to prevent memory corruption" into...Jon Larimer2015-08-181-1/+2
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge "Check integer overflow to prevent memory corruption" into klp-devJon Larimer2015-08-181-1/+2
| | | |\ \ \
| | | | * | | Check integer overflow to prevent memory corruptionJeff Tinker2015-08-161-1/+2
| | | | |/ /
* | | | | | am 698ff79c: am 27362395: (-s ours) am 2ed42aea: Merge "do not dequeue from n...Jon Larimer2015-08-180-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 27362395: (-s ours) am 2ed42aea: Merge "do not dequeue from native window ...Jon Larimer2015-08-180-0/+0
| |\ \ \ \ \ | | |/ / / /
| | * | | | am 2ed42aea: Merge "do not dequeue from native window after we hit fatal erro...Jon Larimer2015-08-182-0/+11
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge "do not dequeue from native window after we hit fatal error -- DO NOT M...Jon Larimer2015-08-182-0/+11
| | | |\ \ \
| | | | * | | do not dequeue from native window after we hit fatal error -- DO NOT MERGEChong Zhang2015-08-172-0/+11
| | | | |/ /
* | | | | | am 2f3c04a4: resolved conflicts for merge of 6035c811 to lmp-devNick Kralevich2015-08-181-8/+40
|\ \ \ \ \ \ | |/ / / / /
| * | | | | resolved conflicts for merge of 6035c811 to lmp-devNick Kralevich2015-08-181-8/+40
| |\ \ \ \ \ | | |/ / / /
| | * | | | am 0d46c937: Merge "MPEG4Source::fragmentedRead: check range before writing i...Jon Larimer2015-08-181-8/+40
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge "MPEG4Source::fragmentedRead: check range before writing into buffers" ...Jon Larimer2015-08-181-8/+40
| | | |\ \ \
| | | | * | | MPEG4Source::fragmentedRead: check range before writing into buffersRobert Shih2015-08-171-8/+40
* | | | | | | am a1e462e5: am 0afecdeb: am aa1cc741: Merge "Check buffer size before using ...Jon Larimer2015-08-181-0/+8
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 0afecdeb: am aa1cc741: Merge "Check buffer size before using it" into klp-devJon Larimer2015-08-181-0/+8
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am aa1cc741: Merge "Check buffer size before using it" into klp-devJon Larimer2015-08-181-0/+8
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge "Check buffer size before using it" into klp-devJon Larimer2015-08-181-0/+8
| | | |\ \ \ \
| | | | * | | | Check buffer size before using itMarco Nelissen2015-08-151-0/+8
| | | | | |/ / | | | | |/| |
* | | | | | | am 5ff4bb7a: am 8026ad38: am 6efa86be: Merge "Check vector size before access...Abhishek Arya2015-08-181-0/+9
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 8026ad38: am 6efa86be: Merge "Check vector size before accessing" into klp...Abhishek Arya2015-08-181-0/+9
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am 6efa86be: Merge "Check vector size before accessing" into klp-devAbhishek Arya2015-08-181-0/+9
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge "Check vector size before accessing" into klp-devAbhishek Arya2015-08-181-0/+9
| | | |\ \ \ \
| | | | * | | | Check vector size before accessingMarco Nelissen2015-08-151-0/+9
| | | | |/ / /
* | | | | | | am 3b77e940: am d146d466: am 6f561b93: Merge "MatroskaExtractor: detect infin...Abhishek Arya2015-08-181-1/+7
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am d146d466: am 6f561b93: Merge "MatroskaExtractor: detect infinite loop when...Abhishek Arya2015-08-181-1/+7
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am 6f561b93: Merge "MatroskaExtractor: detect infinite loop when parsing NALs...Abhishek Arya2015-08-181-1/+7
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge "MatroskaExtractor: detect infinite loop when parsing NALs" into klp-devAbhishek Arya2015-08-181-1/+7
| | | |\ \ \ \
| | | | * | | | MatroskaExtractor: detect infinite loop when parsing NALsRobert Shih2015-08-181-1/+7
* | | | | | | | am e9a8362e: am a2a68264: am c37f7f6f: Fix for memory corruption in ID3::remo...Neel Mehta2015-08-181-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am a2a68264: am c37f7f6f: Fix for memory corruption in ID3::removeUnsynchroni...Neel Mehta2015-08-181-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | am c37f7f6f: Fix for memory corruption in ID3::removeUnsynchronizationV2_4()....Neel Mehta2015-08-181-1/+1
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Fix for memory corruption in ID3::removeUnsynchronizationV2_4().Neel Mehta2015-08-181-1/+1
| | | |/ / / /
* | | | | | | am 6afd8574: am 073a656d: am deba0610: Merge "Revert "Fix compile after rI431...Abhishek Arya2015-08-182-5/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 073a656d: am deba0610: Merge "Revert "Fix compile after rI431aa2b7d30a9423...Abhishek Arya2015-08-182-5/+0
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am deba0610: Merge "Revert "Fix compile after rI431aa2b7d30a942350ab6d105451c...Abhishek Arya2015-08-182-5/+0
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge "Revert "Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4""...Abhishek Arya2015-08-182-5/+0
| | | |\ \ \ \
| | | | * | | | Revert "Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4"Abhishek Arya2015-08-172-5/+0
* | | | | | | | am 01841c73: am af46239a: am 9abb7401: Fix compile failure after rI431aa2b7d3...Abhishek Arya2015-08-182-0/+15
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am af46239a: am 9abb7401: Fix compile failure after rI431aa2b7d30a942350ab6d1...Abhishek Arya2015-08-182-0/+15
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | am 9abb7401: Fix compile failure after rI431aa2b7d30a942350ab6d105451c6b77e2f...Abhishek Arya2015-08-182-0/+15
| | |\ \ \ \ \ \ | | | |/ / / / /