OSDN Git Service
Andy Hung [Thu, 10 Nov 2016 19:39:21 +0000 (19:39 +0000)]
Visualizer: Check capture size and latency parameters am:
9a2732ba0a am:
5e0822f704 am:
d21cc13ae6
am:
f658db43f4
Change-Id: I49efdaabce141af1014827dda6819c0d396094fb
Andy Hung [Thu, 10 Nov 2016 19:32:51 +0000 (19:32 +0000)]
Visualizer: Check capture size and latency parameters am:
9a2732ba0a am:
5e0822f704
am:
d21cc13ae6
Change-Id: Iee4e5fe706eaafbf1cd36b864c53173a16151c0c
Andy Hung [Thu, 10 Nov 2016 19:26:20 +0000 (19:26 +0000)]
Visualizer: Check capture size and latency parameters am:
9a2732ba0a
am:
5e0822f704
Change-Id: I5dffff4e104307e4d9baf7652935a9a361bd51ce
Andy Hung [Thu, 10 Nov 2016 19:19:21 +0000 (19:19 +0000)]
Visualizer: Check capture size and latency parameters
am:
9a2732ba0a
Change-Id: I3e08e2106d1d1ccc6974e7036dea4617fb8c04f5
Ricardo Garcia [Wed, 9 Nov 2016 19:59:35 +0000 (19:59 +0000)]
Merge "Fix security vulnerability: Equalizer command might allow negative indexes" into klp-dev am:
fc6faebb08 am:
ef01da120b am:
dc3b5edb63 am:
1b035a25ca am:
048e810776 am:
dcb2148635
am:
366f6b58bd
Change-Id: I20e9fc720c1ad57989fb52b0ab3dc2b24e471823
rago [Wed, 9 Nov 2016 19:59:20 +0000 (19:59 +0000)]
Fix security vulnerability: Equalizer command might allow negative indexes am:
e981cca9ff am:
8fb8275471 am:
6b4cf2c0d3 am:
dd060b3bb4 am:
4bcf2e6fbe am:
81e0914473
am:
3d16a9c4b4
Change-Id: Ie5117ea6b3f54b6ce0ae4b187166dd9660d70ac4
Ricardo Garcia [Wed, 9 Nov 2016 19:53:36 +0000 (19:53 +0000)]
Merge "Fix security vulnerability: Equalizer command might allow negative indexes" into klp-dev am:
fc6faebb08 am:
ef01da120b am:
dc3b5edb63 am:
1b035a25ca am:
048e810776
am:
dcb2148635
Change-Id: I1322f347fecadf1b671f8e7121ff7552418da5ec
rago [Wed, 9 Nov 2016 19:53:20 +0000 (19:53 +0000)]
Fix security vulnerability: Equalizer command might allow negative indexes am:
e981cca9ff am:
8fb8275471 am:
6b4cf2c0d3 am:
dd060b3bb4 am:
4bcf2e6fbe
am:
81e0914473
Change-Id: Ia098ff7b7e1761e4af3ee256110f736f31860256
Ricardo Garcia [Wed, 9 Nov 2016 19:47:32 +0000 (19:47 +0000)]
Merge "Fix security vulnerability: Equalizer command might allow negative indexes" into klp-dev am:
fc6faebb08 am:
ef01da120b am:
dc3b5edb63 am:
1b035a25ca
am:
048e810776
Change-Id: I3ebb1456893a4ee624f2ca009d71e6431d3d83d5
rago [Wed, 9 Nov 2016 19:47:18 +0000 (19:47 +0000)]
Fix security vulnerability: Equalizer command might allow negative indexes am:
e981cca9ff am:
8fb8275471 am:
6b4cf2c0d3 am:
dd060b3bb4
am:
4bcf2e6fbe
Change-Id: If429c65b08422dffa2ffc83c47e647db42ba9165
Ricardo Garcia [Wed, 9 Nov 2016 19:42:05 +0000 (19:42 +0000)]
Merge "Fix security vulnerability: Equalizer command might allow negative indexes" into klp-dev am:
fc6faebb08 am:
ef01da120b am:
dc3b5edb63
am:
1b035a25ca
Change-Id: I3c6fe49fc7cccebe92a9cf0a3120123ab678fba0
rago [Wed, 9 Nov 2016 19:41:48 +0000 (19:41 +0000)]
Fix security vulnerability: Equalizer command might allow negative indexes am:
e981cca9ff am:
8fb8275471 am:
6b4cf2c0d3
am:
dd060b3bb4
Change-Id: If6848a77e1f2a785c017d2e5d77f770c34a97d4c
Ricardo Garcia [Wed, 9 Nov 2016 19:36:32 +0000 (19:36 +0000)]
Merge "Fix security vulnerability: Equalizer command might allow negative indexes" into klp-dev am:
fc6faebb08 am:
ef01da120b
am:
dc3b5edb63
Change-Id: Ic7eaa2e7cc04107dd9eac4674aa3f8d7bfd283a3
rago [Wed, 9 Nov 2016 19:36:16 +0000 (19:36 +0000)]
Fix security vulnerability: Equalizer command might allow negative indexes am:
e981cca9ff am:
8fb8275471
am:
6b4cf2c0d3
Change-Id: I88ed7d46bb8d54dcb2309b103dd6fcf787ba3269
Ricardo Garcia [Wed, 9 Nov 2016 19:31:02 +0000 (19:31 +0000)]
Merge "Fix security vulnerability: Equalizer command might allow negative indexes" into klp-dev am:
fc6faebb08
am:
ef01da120b
Change-Id: I6cf6ce34535fd3120b9865c27dce39b043e595fc
rago [Wed, 9 Nov 2016 19:30:47 +0000 (19:30 +0000)]
Fix security vulnerability: Equalizer command might allow negative indexes am:
e981cca9ff
am:
8fb8275471
Change-Id: Iba4ca7302804912646e8c510d2e436ebbf8373aa
Ricardo Garcia [Wed, 9 Nov 2016 19:25:17 +0000 (19:25 +0000)]
Merge "Fix security vulnerability: Equalizer command might allow negative indexes" into klp-dev
am:
fc6faebb08
Change-Id: I8f81e75106cecd69eb8942dea1c375ce7aa729fd
rago [Wed, 9 Nov 2016 19:25:16 +0000 (19:25 +0000)]
Fix security vulnerability: Equalizer command might allow negative indexes
am:
e981cca9ff
Change-Id: I8355da91fab0d63fab72e05ba907708a3f3fe9c8
Ricardo Garcia [Wed, 9 Nov 2016 19:14:34 +0000 (19:14 +0000)]
Merge "Fix security vulnerability: Equalizer command might allow negative indexes" into klp-dev
Ray Essick [Wed, 9 Nov 2016 18:56:14 +0000 (18:56 +0000)]
DO NOT MERGE: defensive parsing of mp3 album art information am:
2ff80538b7 am:
c3819cfda9 am:
c696d76d98 -s ours am:
1e036d883e -s ours am:
8326a5bd4f am:
c7bbcd1bb8 -s ours
am:
4978d974e2
Change-Id: I50f5187189d1ffb7104b7cf9d9a2412a0afcb112
Ray Essick [Wed, 9 Nov 2016 18:50:14 +0000 (18:50 +0000)]
DO NOT MERGE: defensive parsing of mp3 album art information am:
2ff80538b7 am:
c3819cfda9 am:
c696d76d98 -s ours am:
1e036d883e -s ours am:
8326a5bd4f
am:
c7bbcd1bb8 -s ours
Change-Id: Ic4cdb51567e719b1c44788f8e688df3e55797c56
Ray Essick [Wed, 9 Nov 2016 18:44:43 +0000 (18:44 +0000)]
DO NOT MERGE: defensive parsing of mp3 album art information am:
2ff80538b7 am:
c3819cfda9 am:
c696d76d98 -s ours am:
1e036d883e -s ours
am:
8326a5bd4f
Change-Id: I7e4df7a200ec1a9945e9371bedacbc880fb9c7cb
Ray Essick [Wed, 9 Nov 2016 18:38:42 +0000 (18:38 +0000)]
DO NOT MERGE: defensive parsing of mp3 album art information am:
2ff80538b7 am:
c3819cfda9 am:
c696d76d98 -s ours
am:
1e036d883e -s ours
Change-Id: I72ef099cc16c44823320453729da9c036d7fdca8
Ray Essick [Wed, 9 Nov 2016 18:38:42 +0000 (18:38 +0000)]
DO NOT MERGE: defensive parsing of mp3 album art information am:
52d02b97a4 -s ours am:
d4bce2cc70 am:
64e37f54f5 -s ours
am:
5aa1034968
Change-Id: I79122e5bf263ebe54edd8a55f89f1c2f985a7029
Ray Essick [Wed, 9 Nov 2016 18:33:12 +0000 (18:33 +0000)]
DO NOT MERGE: defensive parsing of mp3 album art information am:
2ff80538b7 am:
c3819cfda9
am:
c696d76d98 -s ours
Change-Id: I80f50a474af40a2ea3c732604e77caef6afadf46
Ray Essick [Wed, 9 Nov 2016 18:33:12 +0000 (18:33 +0000)]
DO NOT MERGE: defensive parsing of mp3 album art information am:
52d02b97a4 -s ours am:
d4bce2cc70
am:
64e37f54f5 -s ours
Change-Id: I601737a43f54be37d5e8395cfa738fe35692cbe7
Ray Essick [Wed, 9 Nov 2016 18:27:11 +0000 (18:27 +0000)]
DO NOT MERGE: defensive parsing of mp3 album art information am:
2ff80538b7
am:
c3819cfda9
Change-Id: I2a98a164f3c1d728e0f5bec906116cd1bffac19a
Ray Essick [Wed, 9 Nov 2016 18:27:11 +0000 (18:27 +0000)]
DO NOT MERGE: defensive parsing of mp3 album art information am:
52d02b97a4 -s ours
am:
d4bce2cc70
Change-Id: I4bbe609b4fd188182305136c7005fc5aebf33827
Ray Essick [Wed, 9 Nov 2016 18:21:12 +0000 (18:21 +0000)]
DO NOT MERGE: defensive parsing of mp3 album art information
am:
2ff80538b7
Change-Id: I864307c871b8ab48fd0fe2ddaba2e6ead0f0233a
Ray Essick [Wed, 9 Nov 2016 18:21:12 +0000 (18:21 +0000)]
DO NOT MERGE: defensive parsing of mp3 album art information
am:
52d02b97a4 -s ours
Change-Id: I6951ac809d45ac97e3f6d57ec6c978b086dc1f31
Ray Essick [Wed, 9 Nov 2016 18:21:12 +0000 (18:21 +0000)]
Merge "DO NOT MERGE: defensive parsing of mp3 album art information" into mnc-dev
am:
3453aa5e56
Change-Id: Ifccba29a49c395e7ab81412c3e22b8feafd7c2e6
Ray Essick [Wed, 9 Nov 2016 18:21:11 +0000 (18:21 +0000)]
DO NOT MERGE: defensive parsing of mp3 album art information
am:
21f2814260
Change-Id: Ib71918ef91b50ec3a7b93b6c40e0af18df9fc5d2
Ray Essick [Wed, 9 Nov 2016 18:16:39 +0000 (18:16 +0000)]
Merge "DO NOT MERGE: defensive parsing of mp3 album art information" into mnc-dev
Lajos Molnar [Wed, 2 Nov 2016 23:20:25 +0000 (23:20 +0000)]
IOMX: convert ANWB to Gralloc meta if using useBuffer in the same process
am:
4fb1e42a16
Change-Id: I8878bbd684459fc2381c6b0a07ff451efab45dd8
Lajos Molnar [Wed, 2 Nov 2016 21:59:03 +0000 (14:59 -0700)]
IOMX: convert ANWB to Gralloc meta if using useBuffer in the same process
This was disabled by a previous commit.
Bug:
32436178
Change-Id: I9f9c6a372a039226d61f3651be3af207fed63e60
Ray Essick [Wed, 2 Nov 2016 21:17:06 +0000 (14:17 -0700)]
DO NOT MERGE: defensive parsing of mp3 album art information
several points in stagefrights mp3 album art code
used strlen() to parse user-supplied strings that may be
unterminated, resulting in reading beyond the end of a buffer.
This changes the code to use strnlen() for 8-bit encodings and
strengthens the parsing of 16-bit encodings similarly. It also
reworks how we watch for the end-of-buffer to avoid all over-reads.
Bug:
32377688
Test: crafted mp3's w/ good/bad cover art. See what showed in play music
Change-Id: Ib46cd1b5a3e1707c343d395f235bedb82764e184
Ray Essick [Wed, 2 Nov 2016 21:16:28 +0000 (14:16 -0700)]
DO NOT MERGE: defensive parsing of mp3 album art information
several points in stagefrights mp3 album art code
used strlen() to parse user-supplied strings that may be
unterminated, resulting in reading beyond the end of a buffer.
This changes the code to use strnlen() for 8-bit encodings and
strengthens the parsing of 16-bit encodings similarly. It also
reworks how we watch for the end-of-buffer to avoid all over-reads.
Bug:
32377688
Test: crafted mp3's w/ good/bad cover art. See what showed in play music
Change-Id: I479d51e88d3180461cb6ea5540974671cfd84201
Ray Essick [Wed, 2 Nov 2016 21:15:43 +0000 (14:15 -0700)]
DO NOT MERGE: defensive parsing of mp3 album art information
several points in stagefrights mp3 album art code
used strlen() to parse user-supplied strings that may be
unterminated, resulting in reading beyond the end of a buffer.
This changes the code to use strnlen() for 8-bit encodings and
strengthens the parsing of 16-bit encodings similarly. It also
reworks how we watch for the end-of-buffer to avoid all over-reads.
Bug:
32377688
Test: crafted mp3's w/ good/bad cover art. See what showed in play music
Change-Id: Idbaf221fa2283b33e83f399562a3323dd095cc2c
rago [Mon, 31 Oct 2016 19:50:20 +0000 (12:50 -0700)]
Fix security vulnerability: Equalizer command might allow negative indexes
Bug:
32247948
Bug:
32438598
Bug:
32436341
Test: use POC on bug or cts security test
Change-Id: I91bd6aadb6c7410163e03101f365db767f4cd2a3
(cherry picked from commit
0872b65cff9129633471945431b9a5a28418049c)
Lajos Molnar [Mon, 31 Oct 2016 19:05:36 +0000 (19:05 +0000)]
stagefright: remove allottedSize equality check in IOMX::useBuffer
am:
58388aa7be
Change-Id: I828fa720f61e8f823ddec7c33b0db05683b76058
Lajos Molnar [Thu, 27 Oct 2016 00:41:56 +0000 (17:41 -0700)]
stagefright: remove allottedSize equality check in IOMX::useBuffer
This was meant for buffers shared cross-process, but we are not gaining
anything from this check even if it was at the correct place.
Bug:
32436178
Change-Id: I6919e8ac6e35092273e171f49f6711ba577ba2e6
Andy Hung [Wed, 19 Oct 2016 00:13:09 +0000 (17:13 -0700)]
Visualizer: Check capture size and latency parameters
Bug:
31781965
Change-Id: I1c439a0d0f6aa0057b3c651499f28426e1e1f5e4
Marco Nelissen [Sat, 15 Oct 2016 02:09:51 +0000 (02:09 +0000)]
Merge "DO NOT MERGE Fix divide by zero" into lmp-mr1-dev am:
b6cf6d6a30 am:
4c31eb2675 -s ours
am:
db358e20c6
Change-Id: I69d377350a4ec37bf910b4676553dff504524e65
Marco Nelissen [Sat, 15 Oct 2016 02:09:36 +0000 (02:09 +0000)]
DO NOT MERGE Fix divide by zero am:
bc08b17c57 am:
7525a44f22 -s ours
am:
9c6eda244c
Change-Id: I85cbe982109b75eaec1e1a17ba7868a4ffeb8aa6
Marco Nelissen [Sat, 15 Oct 2016 02:05:19 +0000 (02:05 +0000)]
Merge "DO NOT MERGE Fix divide by zero" into lmp-mr1-dev am:
b6cf6d6a30
am:
4c31eb2675 -s ours
Change-Id: Ibc0f32ba1c4701f8c30f82b5b6c281ded3c628c7
Marco Nelissen [Sat, 15 Oct 2016 02:05:05 +0000 (02:05 +0000)]
DO NOT MERGE Fix divide by zero am:
bc08b17c57
am:
7525a44f22 -s ours
Change-Id: I52724e5697ec42b4ad1f0b2c2550408cd19b5143
Marco Nelissen [Sat, 15 Oct 2016 02:01:07 +0000 (02:01 +0000)]
Merge "DO NOT MERGE Fix divide by zero" into lmp-mr1-dev
am:
b6cf6d6a30
Change-Id: Iabf62a27be889aad1ca4587c874571c2740914dd
Marco Nelissen [Sat, 15 Oct 2016 02:01:06 +0000 (02:01 +0000)]
DO NOT MERGE Fix divide by zero
am:
bc08b17c57
Change-Id: I47cdf22bd60fd62ffcf5118c5c846c409eca960a
Marco Nelissen [Sat, 15 Oct 2016 01:56:00 +0000 (01:56 +0000)]
Merge "DO NOT MERGE Fix divide by zero" into lmp-mr1-dev
Marco Nelissen [Fri, 14 Oct 2016 22:48:36 +0000 (22:48 +0000)]
Merge "Fix divide by zero" into lmp-dev am:
ef6934cdf9 am:
cd1950301d am:
79a5c7031e
am:
d066317386
Change-Id: I403238ef299fae85216a190035fd4335451560af
Marco Nelissen [Fri, 14 Oct 2016 22:48:21 +0000 (22:48 +0000)]
Fix divide by zero am:
12416c4125 -s ours am:
e1fff04cd9 am:
fee873d950
am:
45c32466f8
Change-Id: Id452573484ab3a0fc29b38282c5d06678ce07e66
Marco Nelissen [Fri, 14 Oct 2016 22:45:11 +0000 (22:45 +0000)]
Merge "Fix divide by zero" into lmp-dev am:
ef6934cdf9 am:
cd1950301d
am:
79a5c7031e
Change-Id: I469e756acfb69299e2ade43d3123cdb3e9872a0d
Marco Nelissen [Fri, 14 Oct 2016 22:44:50 +0000 (22:44 +0000)]
Fix divide by zero am:
12416c4125 -s ours am:
e1fff04cd9
am:
fee873d950
Change-Id: I2209f54ecafbb7a514c83407ecef52e87721429d
Marco Nelissen [Fri, 14 Oct 2016 22:41:04 +0000 (22:41 +0000)]
Merge "Fix divide by zero" into lmp-dev am:
ef6934cdf9
am:
cd1950301d
Change-Id: I299c0895349b4aa9439814d5040dceb3e2485ee8
Marco Nelissen [Fri, 14 Oct 2016 22:40:50 +0000 (22:40 +0000)]
Fix divide by zero am:
12416c4125 -s ours
am:
e1fff04cd9
Change-Id: I6f5a0824341993c97d0cefc5e43e6b3e26c9b9ab
Marco Nelissen [Thu, 6 Oct 2016 22:31:52 +0000 (15:31 -0700)]
DO NOT MERGE Fix divide by zero
and be stricter about the layout of various boxes in mp4 files.
Bug:
31318219
Change-Id: I935bf2a6f29c5c7990acbb0cc8386f40144b14fc
Marco Nelissen [Fri, 14 Oct 2016 22:36:51 +0000 (22:36 +0000)]
Merge "Fix divide by zero" into lmp-dev
am:
ef6934cdf9
Change-Id: I7e4de9437a7ba41e239a1906e58465cf312a6539
Marco Nelissen [Fri, 14 Oct 2016 22:36:50 +0000 (22:36 +0000)]
Fix divide by zero
am:
12416c4125 -s ours
Change-Id: Iaa88e621286dbe41deddd2e2fa62b30bfbdfaa21
Marco Nelissen [Fri, 14 Oct 2016 22:02:31 +0000 (22:02 +0000)]
Merge "Fix divide by zero" into lmp-dev
Marco Nelissen [Thu, 13 Oct 2016 23:42:06 +0000 (23:42 +0000)]
Merge "DO NOT MERGE Fix divide by zero" into klp-dev am:
2c28e5b126 am:
a5477b11be am:
913b7564c4 -s ours am:
391b2806b5 -s ours am:
172fa07944 am:
8f8e719106 -s ours
am:
2f6c5b05f9
Change-Id: I8da8b15efed6263ca8afd5acbda500a8fc9c12a6
Marco Nelissen [Thu, 13 Oct 2016 23:41:49 +0000 (23:41 +0000)]
DO NOT MERGE Fix divide by zero am:
febbd52cd9 am:
55ce7e5d1e am:
1b3f61ceaf -s ours am:
76bc4166ce -s ours am:
609964004e am:
93590752b1 -s ours
am:
a49626e9f9
Change-Id: I02a6038cff8444cefba8c8c35bf132ddbd3a6b9c
Marco Nelissen [Thu, 13 Oct 2016 23:38:30 +0000 (23:38 +0000)]
Merge "DO NOT MERGE Fix divide by zero" into klp-dev am:
2c28e5b126 am:
a5477b11be am:
913b7564c4 -s ours am:
391b2806b5 -s ours am:
172fa07944
am:
8f8e719106 -s ours
Change-Id: I18196452f6a19fe21fc4cad76c8df2165a044353
Marco Nelissen [Thu, 13 Oct 2016 23:38:17 +0000 (23:38 +0000)]
DO NOT MERGE Fix divide by zero am:
febbd52cd9 am:
55ce7e5d1e am:
1b3f61ceaf -s ours am:
76bc4166ce -s ours am:
609964004e
am:
93590752b1 -s ours
Change-Id: I37e4ad9cca606117a774e544f44304ec46d496e3
Marco Nelissen [Thu, 13 Oct 2016 23:35:32 +0000 (23:35 +0000)]
Merge "DO NOT MERGE Fix divide by zero" into klp-dev am:
2c28e5b126 am:
a5477b11be am:
913b7564c4 -s ours am:
391b2806b5 -s ours
am:
172fa07944
Change-Id: Ice1b8c59d1546f09c33fe1e077b30a8bab3fd137
Marco Nelissen [Thu, 13 Oct 2016 23:35:17 +0000 (23:35 +0000)]
DO NOT MERGE Fix divide by zero am:
febbd52cd9 am:
55ce7e5d1e am:
1b3f61ceaf -s ours am:
76bc4166ce -s ours
am:
609964004e
Change-Id: I77963b757d4d603903d14505139916718af13687
Marco Nelissen [Thu, 13 Oct 2016 23:33:31 +0000 (23:33 +0000)]
Merge "DO NOT MERGE Fix divide by zero" into klp-dev am:
2c28e5b126 am:
a5477b11be am:
913b7564c4 -s ours
am:
391b2806b5 -s ours
Change-Id: I3c550edd11e9c03937b7b9323de9e567574f6bac
Marco Nelissen [Thu, 13 Oct 2016 23:33:18 +0000 (23:33 +0000)]
DO NOT MERGE Fix divide by zero am:
febbd52cd9 am:
55ce7e5d1e am:
1b3f61ceaf -s ours
am:
76bc4166ce -s ours
Change-Id: I27a5014657a36dd1626578e17ebc36f6362ca4bd
Marco Nelissen [Thu, 13 Oct 2016 23:30:30 +0000 (23:30 +0000)]
Merge "DO NOT MERGE Fix divide by zero" into klp-dev am:
2c28e5b126 am:
a5477b11be
am:
913b7564c4 -s ours
Change-Id: I9698f264d5285632c8f7f7d83726da35499f290e
Marco Nelissen [Thu, 13 Oct 2016 23:30:16 +0000 (23:30 +0000)]
DO NOT MERGE Fix divide by zero am:
febbd52cd9 am:
55ce7e5d1e
am:
1b3f61ceaf -s ours
Change-Id: Iaf8f9526bbb01eca75ded491f2dd43baabaee22e
Marco Nelissen [Thu, 13 Oct 2016 23:28:29 +0000 (23:28 +0000)]
Merge "DO NOT MERGE Fix divide by zero" into klp-dev am:
2c28e5b126
am:
a5477b11be
Change-Id: I23bc38094b99e0563a4aeeb7df08631212d0b73a
Marco Nelissen [Thu, 13 Oct 2016 23:28:17 +0000 (23:28 +0000)]
DO NOT MERGE Fix divide by zero am:
febbd52cd9
am:
55ce7e5d1e
Change-Id: I792667b35aacfa1b910a332d855f002615041408
Marco Nelissen [Thu, 13 Oct 2016 23:25:47 +0000 (23:25 +0000)]
Merge "DO NOT MERGE Fix divide by zero" into klp-dev
am:
2c28e5b126
Change-Id: Ic69824aeaf760eb6b5e79fef78be41c2cb4d749e
Marco Nelissen [Thu, 13 Oct 2016 23:25:47 +0000 (23:25 +0000)]
Merge "DO NOT MERGE Fix divide by zero" into mnc-dev
am:
ec206acb99
Change-Id: Id2100166f21c42cacdfb26c82fe32a07c95caa82
Marco Nelissen [Thu, 13 Oct 2016 23:25:47 +0000 (23:25 +0000)]
DO NOT MERGE Fix divide by zero
am:
febbd52cd9
Change-Id: I229ab9fee73b63493c4e61493de6183857ef886a
Marco Nelissen [Thu, 13 Oct 2016 23:25:46 +0000 (23:25 +0000)]
DO NOT MERGE Fix divide by zero
am:
2e211d38a3
Change-Id: I774eeec61319489b2976d6bd1474c7d8f7ef4e93
Marco Nelissen [Thu, 6 Oct 2016 22:31:52 +0000 (15:31 -0700)]
Fix divide by zero
and be stricter about the layout of various boxes in mp4 files.
Bug:
31318219
Change-Id: I50034d5b6b1967ca6e88aabeacf49f26ba3c0d32
Marco Nelissen [Thu, 13 Oct 2016 23:21:06 +0000 (23:21 +0000)]
Merge "DO NOT MERGE Fix divide by zero" into mnc-dev
Marco Nelissen [Thu, 13 Oct 2016 23:19:54 +0000 (23:19 +0000)]
Merge "DO NOT MERGE Fix divide by zero" into klp-dev
Ricardo Garcia [Thu, 13 Oct 2016 02:01:36 +0000 (02:01 +0000)]
Merge "Fix potential NULL dereference in Visualizer effect" into klp-dev am:
eee86b009e am:
6732f45ee9 am:
24566f2939 am:
25a681e678 am:
73895e0b02 am:
c4605f157b
am:
78188fec0f
Change-Id: I171ee6509854311dd71183c1b2226d8f4fa02171
rago [Thu, 13 Oct 2016 02:01:21 +0000 (02:01 +0000)]
Fix potential NULL dereference in Visualizer effect am:
874f9e0b8e am:
f060479b9a am:
bcc7230bb9 am:
f4a63f6765 am:
ecfd198cda am:
bae68c9e15
am:
d36ebed01e
Change-Id: Icc846170a93c7f1aa348645609f57b28e8a8c76c
Ricardo Garcia [Thu, 13 Oct 2016 01:55:06 +0000 (01:55 +0000)]
Merge "Fix potential NULL dereference in Visualizer effect" into klp-dev am:
eee86b009e am:
6732f45ee9 am:
24566f2939 am:
25a681e678 am:
73895e0b02
am:
c4605f157b
Change-Id: Ic6f21e4536be81b17fd41ebe78515a3a93ea9a8f
rago [Thu, 13 Oct 2016 01:54:51 +0000 (01:54 +0000)]
Fix potential NULL dereference in Visualizer effect am:
874f9e0b8e am:
f060479b9a am:
bcc7230bb9 am:
f4a63f6765 am:
ecfd198cda
am:
bae68c9e15
Change-Id: I8e71eeb1a3b6c9adaa494578327e3984364b7ace
Ricardo Garcia [Thu, 13 Oct 2016 01:48:06 +0000 (01:48 +0000)]
Merge "Fix potential NULL dereference in Visualizer effect" into klp-dev am:
eee86b009e am:
6732f45ee9 am:
24566f2939 am:
25a681e678
am:
73895e0b02
Change-Id: I5770281efd6e83a2cb0ed40b16436625b3c10da8
rago [Thu, 13 Oct 2016 01:47:50 +0000 (01:47 +0000)]
Fix potential NULL dereference in Visualizer effect am:
874f9e0b8e am:
f060479b9a am:
bcc7230bb9 am:
f4a63f6765
am:
ecfd198cda
Change-Id: Ie96acf726e282e014339b2817ad6aa0634378ca9
Pawin Vongmasa [Thu, 13 Oct 2016 01:41:07 +0000 (01:41 +0000)]
Merge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing." into klp-dev am:
8caef85235 am:
b512f4ab42 am:
d18d8fac61 -s ours am:
54c0001dc9 -s ours am:
253e3ae0ba am:
42e8d24ca9 -s ours
am:
0bed5b7803
Change-Id: Id96fd8055b8f4e22b8d90fc827eb02698aef4d4e
Ricardo Garcia [Thu, 13 Oct 2016 01:41:05 +0000 (01:41 +0000)]
Merge "Fix potential NULL dereference in Visualizer effect" into klp-dev am:
eee86b009e am:
6732f45ee9 am:
24566f2939
am:
25a681e678
Change-Id: I658364d7223918d5757d61e2e9ce9f905e6a7627
rago [Thu, 13 Oct 2016 01:40:51 +0000 (01:40 +0000)]
Fix potential NULL dereference in Visualizer effect am:
874f9e0b8e am:
f060479b9a am:
bcc7230bb9
am:
f4a63f6765
Change-Id: I6a360ed595632dbb9d8e370c4561ec41d07c173f
Pawin Vongmasa [Thu, 13 Oct 2016 01:40:51 +0000 (01:40 +0000)]
DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing. am:
de84a76b86 am:
2c76c56d56 am:
f1e84ca858 -s ours am:
7b9756261d -s ours am:
d676f1bfeb am:
0ce582e5c4 -s ours
am:
e843c53efa
Change-Id: Ib3ceca0ff50fdd4f6bf586d39ef84474ae0e6769
Pawin Vongmasa [Thu, 13 Oct 2016 01:33:37 +0000 (01:33 +0000)]
Merge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing." into klp-dev am:
8caef85235 am:
b512f4ab42 am:
d18d8fac61 -s ours am:
54c0001dc9 -s ours am:
253e3ae0ba
am:
42e8d24ca9 -s ours
Change-Id: If2db282f155963e46adcff5fcc05bfc8eba5d59a
Ricardo Garcia [Thu, 13 Oct 2016 01:33:30 +0000 (01:33 +0000)]
Merge "Fix potential NULL dereference in Visualizer effect" into klp-dev am:
eee86b009e am:
6732f45ee9
am:
24566f2939
Change-Id: Ibfc04cf102256f0a114b9670550beee44254be14
Pawin Vongmasa [Thu, 13 Oct 2016 01:33:22 +0000 (01:33 +0000)]
DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing. am:
de84a76b86 am:
2c76c56d56 am:
f1e84ca858 -s ours am:
7b9756261d -s ours am:
d676f1bfeb
am:
0ce582e5c4 -s ours
Change-Id: Ib4c116449fa9a43f7a4c1b46c793c5de2d0cbac3
rago [Thu, 13 Oct 2016 01:33:18 +0000 (01:33 +0000)]
Fix potential NULL dereference in Visualizer effect am:
874f9e0b8e am:
f060479b9a
am:
bcc7230bb9
Change-Id: If5d6fefb276341472d827bac3f349561f7d1d990
Pawin Vongmasa [Thu, 13 Oct 2016 01:27:04 +0000 (01:27 +0000)]
Merge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing." into klp-dev am:
8caef85235 am:
b512f4ab42 am:
d18d8fac61 -s ours am:
54c0001dc9 -s ours
am:
253e3ae0ba
Change-Id: I74873bdd367f238277c74fec12edf7275ee14435
Ricardo Garcia [Thu, 13 Oct 2016 01:26:59 +0000 (01:26 +0000)]
Merge "Fix potential NULL dereference in Visualizer effect" into klp-dev am:
eee86b009e
am:
6732f45ee9
Change-Id: Ic59a0ab61486e1a420988653e4276b3f5e660729
Pawin Vongmasa [Thu, 13 Oct 2016 01:26:48 +0000 (01:26 +0000)]
DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing. am:
de84a76b86 am:
2c76c56d56 am:
f1e84ca858 -s ours am:
7b9756261d -s ours
am:
d676f1bfeb
Change-Id: I0f8ec51bbc0e26aae780f20668f5ac03d5a8da42
rago [Thu, 13 Oct 2016 01:26:47 +0000 (01:26 +0000)]
Fix potential NULL dereference in Visualizer effect am:
874f9e0b8e
am:
f060479b9a
Change-Id: I69eb3819f246e6d807af099f9a0260146cd06fd2
Pawin Vongmasa [Thu, 13 Oct 2016 01:20:04 +0000 (01:20 +0000)]
Merge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing." into lmp-dev am:
b6ba3d7e47 -s ours am:
37e3ea354a am:
ea136eb981 -s ours
am:
2456e12801
Change-Id: Ic7b4cf9994060ed34e4ad3c13f09a5f28f635ab1
Pawin Vongmasa [Thu, 13 Oct 2016 01:20:03 +0000 (01:20 +0000)]
Merge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing." into klp-dev am:
8caef85235 am:
b512f4ab42 am:
d18d8fac61 -s ours
am:
54c0001dc9 -s ours
Change-Id: I6bb100ce240464dff699c5d37227a93e085a2f74
Ricardo Garcia [Thu, 13 Oct 2016 01:19:49 +0000 (01:19 +0000)]
Merge "Fix potential NULL dereference in Visualizer effect" into klp-dev
am:
eee86b009e
Change-Id: Id6c3168ccbf272646f123090ab4fadab34b0f728
rago [Thu, 13 Oct 2016 01:19:48 +0000 (01:19 +0000)]
Fix potential NULL dereference in Visualizer effect
am:
874f9e0b8e
Change-Id: I382b8cc3799b52e085aac0ccec7dcb668a4933ec