OSDN Git Service
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
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)
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 20:49:57 +0000 (20:49 +0000)]
Merge "libmedia: clear reply data for IEffect command" into klp-dev
Nick Kralevich [Thu, 20 Aug 2015 16:56:39 +0000 (09:56 -0700)]
IMediaPlayer.cpp: make sure structures are initialized to 0
Credit https://code.google.com/p/android/issues/detail?id=183310
Bug:
23515142
Change-Id: Idbd66fb148bd0ac1dd78f8651d0164f2a41e2427
(cherry picked from commit
b73b826cc16291b33649402497efbe0f946413bd)
Andy Hung [Wed, 26 Aug 2015 23:34:33 +0000 (16:34 -0700)]
libmedia: clear reply data for IEffect command
Bug:
23540907
Change-Id: Ib89afc6b273b0eb310bbc5a1bd92b1e3d407c249
Abhishek Arya [Tue, 25 Aug 2015 04:00:04 +0000 (04:00 +0000)]
Merge "DO NOT MERGE - Fix software video decoder buffer size calculation" into klp-dev
Marco Nelissen [Tue, 16 Jun 2015 21:50:36 +0000 (14:50 -0700)]
DO NOT MERGE - Fix software video decoder buffer size calculation
Various software video decoders would specify the buffer size as if it were
fully cropped, which then failed a sanity check in SoftwareRenderer.
They now return the full buffer size.
Bug:
21717327
Bug:
21443020
Change-Id: I19fcd091827ebd52a95a5509281a07ccc156e0e5
(cherry picked from commit
3ecc9db40b1fb9c7f807a5892e5c9625aac1fb06)
Wei Jia [Mon, 8 Jun 2015 21:01:42 +0000 (14:01 -0700)]
DO NOT MERGE - SoftwareRenderer: sanity check buffer size before copying data.
Bug:
21443020
Change-Id: I63cf86217b8201fb41809c23e4b752b845a93ee2
(cherry picked from commit
760f92f8b6da9c9cf128cb18fe3c09402fdde6cd)
Wei Jia [Fri, 21 Aug 2015 23:49:51 +0000 (16:49 -0700)]
libstagefright: check overflow before memory allocation in OMXCodec.cpp
Bug:
23416608
Change-Id: I4dacd38ed42db8f4887c3ee386dc909451f4346f
Marco Nelissen [Thu, 4 Jun 2015 18:01:15 +0000 (11:01 -0700)]
Limit allocations to avoid out-of-memory
Corrupt files could cause very large allocations, limit them to something
more reasonable.
Bug:
17769851
Change-Id: Ib0f722fd6fddff873bd7a547aac456e608c34c84
Robert Shih [Sat, 22 Aug 2015 00:54:32 +0000 (00:54 +0000)]
Merge "Prevent integer issues in ID3::Iterator::findFrame" into klp-dev
Joshua J. Drake [Sat, 15 Aug 2015 13:17:03 +0000 (08:17 -0500)]
Prevent integer issues in ID3::Iterator::findFrame
Integer overflows could occur a few places within findFrame. These can lead to
out-of-bounds reads and potentially infinite loops. Ensure that arithmetic does
not wrap around to prevent these behaviors.
Bug:
23285192
Change-Id: I72a61df7d5719d1d3f2bd0b37fba86f0f4bbedee
Wei Jia [Thu, 25 Jun 2015 18:46:54 +0000 (11:46 -0700)]
DO NOT MERGE 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
4bce636865bdf0e2a79fc9a5d9a69107649c850d)
Change-Id: Ia0a963e9872f646791e75b710ff9e227a66af4f9
Jeff Tinker [Fri, 21 Aug 2015 16:58:12 +0000 (09:58 -0700)]
Fix build break DO NOT MERGE
related-to-bug:
23223325
Change-Id: I7b09712b5f18912abddd50b75f6edaf860e894c1
Jeff Tinker [Tue, 18 Aug 2015 00:57:47 +0000 (17:57 -0700)]
DO NOT MERGE Part of fix for libmedia OOB write anywhere
Clarify that decrypt destination is not a pointer for
secure case.
b/
23223325
Change-Id: I642dcf790a9eb9e32175f3e0d8f040c82228e3ac
(cherry picked from commit
ed555d70d80964f40563d89a4e6d6a80f83f4b89)
Marco Nelissen [Thu, 20 Aug 2015 20:17:34 +0000 (20:17 +0000)]
am
59bfb7aa: (-s ours) am
18a8124f: am
da0a48d2: (-s ours) am
6020f066: am
b294a97a: am
6cba5819: am
51bfaf6c: am
1afea551: am
ce73af07: DO NOT MERGE Fail more gracefully on allocation failure
* commit '
59bfb7aa42ce2404da2547e7852e1a1215c6af22':
DO NOT MERGE Fail more gracefully on allocation failure
Marco Nelissen [Thu, 20 Aug 2015 20:11:03 +0000 (20:11 +0000)]
am
18a8124f: am
da0a48d2: (-s ours) am
6020f066: am
b294a97a: am
6cba5819: am
51bfaf6c: am
1afea551: am
ce73af07: DO NOT MERGE Fail more gracefully on allocation failure
* commit '
18a8124f582e9d763670e3bcc6ef6b2b00c4d394':
DO NOT MERGE Fail more gracefully on allocation failure
Marco Nelissen [Thu, 20 Aug 2015 19:53:55 +0000 (19:53 +0000)]
am
da0a48d2: (-s ours) am
6020f066: am
b294a97a: am
6cba5819: am
51bfaf6c: am
1afea551: am
ce73af07: DO NOT MERGE Fail more gracefully on allocation failure
* commit '
da0a48d2704b231f13dbdb28cc4c4d12b08e3faf':
DO NOT MERGE Fail more gracefully on allocation failure
Marco Nelissen [Thu, 20 Aug 2015 19:46:41 +0000 (19:46 +0000)]
am
6020f066: am
b294a97a: am
6cba5819: am
51bfaf6c: am
1afea551: am
ce73af07: DO NOT MERGE Fail more gracefully on allocation failure
* commit '
6020f06633f8cac09f47e561cc389c5b9b152464':
DO NOT MERGE Fail more gracefully on allocation failure
Marco Nelissen [Thu, 20 Aug 2015 19:41:14 +0000 (19:41 +0000)]
am
b294a97a: am
6cba5819: am
51bfaf6c: am
1afea551: am
ce73af07: DO NOT MERGE Fail more gracefully on allocation failure
* commit '
b294a97a6fed15d379ce11084166780e7d9dd883':
DO NOT MERGE Fail more gracefully on allocation failure
Marco Nelissen [Thu, 20 Aug 2015 19:32:06 +0000 (19:32 +0000)]
am
6cba5819: am
51bfaf6c: am
1afea551: am
ce73af07: DO NOT MERGE Fail more gracefully on allocation failure
* commit '
6cba5819ab84cc58a8273428dcf9ae98c0c9bc42':
DO NOT MERGE Fail more gracefully on allocation failure
Marco Nelissen [Thu, 20 Aug 2015 19:25:42 +0000 (19:25 +0000)]
am
51bfaf6c: am
1afea551: am
ce73af07: DO NOT MERGE Fail more gracefully on allocation failure
* commit '
51bfaf6cf74498f92cd400e4d5b3d55b04fc7a06':
DO NOT MERGE Fail more gracefully on allocation failure
Marco Nelissen [Thu, 20 Aug 2015 19:18:30 +0000 (19:18 +0000)]
am
1afea551: am
ce73af07: DO NOT MERGE Fail more gracefully on allocation failure
* commit '
1afea5517477554f452396c29db375e34d108f89':
DO NOT MERGE Fail more gracefully on allocation failure
Marco Nelissen [Thu, 20 Aug 2015 19:12:29 +0000 (19:12 +0000)]
am
ce73af07: DO NOT MERGE Fail more gracefully on allocation failure
* commit '
ce73af077199122e0e5a80b019f949d0f181410f':
DO NOT MERGE Fail more gracefully on allocation failure
Marco Nelissen [Thu, 20 Aug 2015 18:05:08 +0000 (18:05 +0000)]
Merge "Fail more gracefully on allocation failure" into klp-dev
Marco Nelissen [Fri, 13 Jun 2014 21:13:44 +0000 (14:13 -0700)]
DO NOT MERGE 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
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
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: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 [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: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 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 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: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: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: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
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)
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)
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 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)
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)
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)
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 [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 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
Nick Kralevich [Tue, 11 Aug 2015 03:24:13 +0000 (03:24 +0000)]
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 '
0dbd0d7bfe340ac46271c7f87969431b62a023ed':
MPEG4Extractor.cpp: Add check for size == SIZE_MAX
Nick Kralevich [Tue, 11 Aug 2015 03:07:29 +0000 (03:07 +0000)]
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 '
c99244105803ac32f4cc698b5b2a85b225d925a2':
MPEG4Extractor.cpp: Add check for size == SIZE_MAX
Nick Kralevich [Tue, 11 Aug 2015 02:57:48 +0000 (02:57 +0000)]
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 '
2fe61ed032e083dc39265f3b88274fcb8fbeed9b':
MPEG4Extractor.cpp: Add check for size == SIZE_MAX
Nick Kralevich [Tue, 11 Aug 2015 02:49:10 +0000 (02:49 +0000)]
am
3b8d3fa0: am
186d1fb9: am
f4dfe12e: am
54d88fe2: am
aa8dab77: Merge "MPEG4Extractor.cpp: Add check for size == SIZE_MAX" into jb-dev
* commit '
3b8d3fa0dd97c05f77c4686986812e40203678d2':
MPEG4Extractor.cpp: Add check for size == SIZE_MAX
Nick Kralevich [Tue, 11 Aug 2015 02:37:17 +0000 (02:37 +0000)]
am
186d1fb9: am
f4dfe12e: am
54d88fe2: am
aa8dab77: Merge "MPEG4Extractor.cpp: Add check for size == SIZE_MAX" into jb-dev
* commit '
186d1fb9b72439c1c3317d72e4a0f52f466e6861':
MPEG4Extractor.cpp: Add check for size == SIZE_MAX
Nick Kralevich [Tue, 11 Aug 2015 02:32:49 +0000 (02:32 +0000)]
am
f4dfe12e: am
54d88fe2: am
aa8dab77: Merge "MPEG4Extractor.cpp: Add check for size == SIZE_MAX" into jb-dev
* commit '
f4dfe12ecd26e7d6965a2abc062709b6d7d942c4':
MPEG4Extractor.cpp: Add check for size == SIZE_MAX
Nick Kralevich [Tue, 11 Aug 2015 02:26:38 +0000 (02:26 +0000)]
am
54d88fe2: am
aa8dab77: Merge "MPEG4Extractor.cpp: Add check for size == SIZE_MAX" into jb-dev
* commit '
54d88fe2f17b1c5c6e4d0d1d1e36089fea3a1df0':
MPEG4Extractor.cpp: Add check for size == SIZE_MAX
Nick Kralevich [Tue, 11 Aug 2015 02:20:00 +0000 (02:20 +0000)]
am
aa8dab77: Merge "MPEG4Extractor.cpp: Add check for size == SIZE_MAX" into jb-dev
* commit '
aa8dab77aa9ef1bb6e5414ee5e773001de725bef':
MPEG4Extractor.cpp: Add check for size == SIZE_MAX
Nick Kralevich [Sat, 8 Aug 2015 16:41:15 +0000 (16:41 +0000)]
am
0080e03e: am
3ebcce0e: am
2c0f9591: am
fea5921b: am
9fff1d37: am
d9d35098: am
af6b3a6b: am
bce77a36: am
0e20b209: MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
* commit '
0080e03e2a69dcb5ecbcb2848f358ca73163714c':
MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
Nick Kralevich [Sat, 8 Aug 2015 16:34:15 +0000 (16:34 +0000)]
am
3ebcce0e: am
2c0f9591: am
fea5921b: am
9fff1d37: am
d9d35098: am
af6b3a6b: am
bce77a36: am
0e20b209: MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
* commit '
3ebcce0e3fda1ffae9453ca0cc389ee852e1d0a2':
MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
Nick Kralevich [Sat, 8 Aug 2015 16:23:51 +0000 (16:23 +0000)]
am
2c0f9591: am
fea5921b: am
9fff1d37: am
d9d35098: am
af6b3a6b: am
bce77a36: am
0e20b209: MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
* commit '
2c0f959112a1d9048e8dc527f2f9dc0cc3e490c9':
MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
Nick Kralevich [Sat, 8 Aug 2015 16:16:08 +0000 (16:16 +0000)]
am
fea5921b: am
9fff1d37: am
d9d35098: am
af6b3a6b: am
bce77a36: am
0e20b209: MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
* commit '
fea5921b975cf43c88b8f93d4f2500abde6088be':
MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
Nick Kralevich [Sat, 8 Aug 2015 16:08:43 +0000 (16:08 +0000)]
am
9fff1d37: am
d9d35098: am
af6b3a6b: am
bce77a36: am
0e20b209: MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
* commit '
9fff1d37d6129dfce7a6f89004ec4a9cea9c9cad':
MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
Nick Kralevich [Sat, 8 Aug 2015 16:01:24 +0000 (16:01 +0000)]
am
d9d35098: am
af6b3a6b: am
bce77a36: am
0e20b209: MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
* commit '
d9d35098aaaa546d79d0707734aac9b4b12c5be1':
MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
Nick Kralevich [Sat, 8 Aug 2015 15:19:26 +0000 (15:19 +0000)]
am
af6b3a6b: am
bce77a36: am
0e20b209: MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
* commit '
af6b3a6bc44e65e6dbf95c1e5dadf76aa78018d9':
MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
Nick Kralevich [Sat, 8 Aug 2015 14:55:23 +0000 (14:55 +0000)]
Merge "MPEG4Extractor.cpp: Add check for size == SIZE_MAX" into jb-dev
Marco Nelissen [Thu, 6 Aug 2015 15:03:47 +0000 (08:03 -0700)]
Fix Ogg album art
Bug:
23036083
Bug: https://code.google.com/p/android/issues/detail?id=182053
Change-Id: I1a5cbe06990900160c2addade238c1e9feab8f71
(cherry picked from commit
c63cc509404b9328aedd1be3adc4e87cd07b4eb1)
Marco Nelissen [Sat, 8 Aug 2015 00:59:49 +0000 (00:59 +0000)]
Merge "Extra sanity checks on sample size and resolution" into klp-dev
Nick Kralevich [Fri, 7 Aug 2015 23:09:03 +0000 (23:09 +0000)]
am
bce77a36: am
0e20b209: MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
* commit '
bce77a36125b25ce864b40bd5938ca89becea898':
MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
Nick Kralevich [Fri, 7 Aug 2015 18:41:28 +0000 (18:41 +0000)]
am
0e20b209: MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
* commit '
0e20b2093aa2bbc93afed8d68d3765d18a431b74':
MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
Nick Kralevich [Fri, 7 Aug 2015 18:19:24 +0000 (11:19 -0700)]
MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
chunk_size is a uint64_t, so it can legitimately be bigger
than SIZE_MAX, which would cause the subtraction to underflow.
https://code.google.com/p/android/issues/detail?id=182251
Bug:
23034759
Change-Id: Ic1637fb26bf6edb0feb1bcf2876fd370db1ed547
OSDN Git Service
