OSDN Git Service
Ricardo Garcia [Tue, 15 Nov 2016 23:49:57 +0000 (23:49 +0000)]
Merge "Fix security vulnerability: Effect command might allow negative indexes" into klp-dev am:
501aee7a54 am:
dd269152c4 am:
756f8dcdc1
am:
8b850ec8d5
Change-Id: I1cf21ca7d1124a986f390b103f4c641b67e807a9
rago [Tue, 15 Nov 2016 23:49:38 +0000 (23:49 +0000)]
Fix security vulnerability: Effect command might allow negative indexes am:
01183402d7 am:
94e3424b74 am:
9bf3487e7a
am:
d4881f8406
Change-Id: I4786037f49f5da37a1a363f7cb01c9c086776624
Ricardo Garcia [Tue, 15 Nov 2016 23:43:28 +0000 (23:43 +0000)]
Merge "Fix security vulnerability: Effect command might allow negative indexes" into klp-dev am:
501aee7a54 am:
dd269152c4
am:
756f8dcdc1
Change-Id: I9ce75a77ed741953c3476576387eebf77e21f784
rago [Tue, 15 Nov 2016 23:43:09 +0000 (23:43 +0000)]
Fix security vulnerability: Effect command might allow negative indexes am:
01183402d7 am:
94e3424b74
am:
9bf3487e7a
Change-Id: Ia36571a591829777096ad41316b7edf169ce9a6c
Ricardo Garcia [Tue, 15 Nov 2016 23:35:55 +0000 (23:35 +0000)]
Merge "Fix security vulnerability: Effect command might allow negative indexes" into klp-dev am:
501aee7a54
am:
dd269152c4
Change-Id: I336c76f311fc09cd81ccd22a35dada99d0b76be7
rago [Tue, 15 Nov 2016 23:35:37 +0000 (23:35 +0000)]
Fix security vulnerability: Effect command might allow negative indexes am:
01183402d7
am:
94e3424b74
Change-Id: Id0353ac5716377b45e3a967110d43d9baf744be8
Ricardo Garcia [Tue, 15 Nov 2016 23:28:07 +0000 (23:28 +0000)]
Merge "Fix security vulnerability: Effect command might allow negative indexes" into klp-dev
am:
501aee7a54
Change-Id: I7386c90f91d41d2b6df3efc28cfa6e4b4f79608a
rago [Tue, 15 Nov 2016 23:28:06 +0000 (23:28 +0000)]
Fix security vulnerability: Effect command might allow negative indexes
am:
01183402d7
Change-Id: I13603ac1cdb57b844ca7d03f119adda832825f34
Ricardo Garcia [Tue, 15 Nov 2016 23:19:20 +0000 (23:19 +0000)]
Merge "Fix security vulnerability: Effect command might allow negative indexes" into klp-dev
rago [Mon, 14 Nov 2016 22:58:34 +0000 (14:58 -0800)]
Fix security vulnerability: Effect command might allow negative indexes
Bug:
32448258
Bug:
32095626
Test: Use POC bug or cts security test
Change-Id: I69f24eac5866f8d9090fc4c0ebe58c2c297b63df
Ray Essick [Mon, 14 Nov 2016 20:56:52 +0000 (20:56 +0000)]
Merge "DO NOT MERGE: defensive parsing of mp3 album art information" into lmp-mr1-dev
Marco Nelissen [Mon, 14 Nov 2016 20:35:04 +0000 (20:35 +0000)]
Make VBRISeeker more robust am:
7fdd36418e am:
ae0cffaced am:
82642824a5
am:
c236ae3ad0
Change-Id: If2f8a18bd63204d336f5de1862f8226b3c74a407
Marco Nelissen [Mon, 14 Nov 2016 20:27:34 +0000 (20:27 +0000)]
Make VBRISeeker more robust am:
7fdd36418e am:
ae0cffaced
am:
82642824a5
Change-Id: Ia7eb6656c3034793e8caea2b417d99fa0702d05d
Marco Nelissen [Mon, 14 Nov 2016 20:21:03 +0000 (20:21 +0000)]
Make VBRISeeker more robust am:
7fdd36418e
am:
ae0cffaced
Change-Id: I3e6fdf30fc372fb32cfbd24a37814d0946eaca2f
Marco Nelissen [Mon, 14 Nov 2016 20:13:03 +0000 (20:13 +0000)]
Make VBRISeeker more robust
am:
7fdd36418e
Change-Id: I0138de501cd433986e77927e27a527606b61ea25
Marco Nelissen [Fri, 11 Nov 2016 17:20:00 +0000 (09:20 -0800)]
Make VBRISeeker more robust
Bug:
32577290
Change-Id: I9bcc9422ae7dd3ae4a38df330c9dcd7ac4941ec8
Andy Hung [Thu, 10 Nov 2016 19:40:08 +0000 (19:40 +0000)]
Merge "Effects: Check get parameter command size" into klp-dev am:
c5768d0921 am:
cfe5d97cf3 am:
a74f0af62b
am:
4f58afc951
Change-Id: I67d6ab6c8083e4b509c6f065cb11de0a0c3101d7
Andy Hung [Thu, 10 Nov 2016 19:39:52 +0000 (19:39 +0000)]
Effects: Check get parameter command size am:
3d34cc76e3 am:
59920bf785 am:
14d87911d7
am:
79a088a065
Change-Id: I9d46fdc8a919d5339dddac558f1f5496f35b498a
Andy Hung [Thu, 10 Nov 2016 19:39:36 +0000 (19:39 +0000)]
Merge "DO NOT MERGE: Visualizer: Check capture size and latency parameters" into klp-dev am:
f89590d009 am:
50f9a9faea am:
684314f196 -s ours
am:
354864c443 -s ours
Change-Id: I4c6ac6e018ab04a83e94a58d040a765efd1e8546
Andy Hung [Thu, 10 Nov 2016 19:39:21 +0000 (19:39 +0000)]
DO NOT MERGE: Visualizer: Check capture size and latency parameters am:
86cbc180f4 am:
ce8b7cd373 am:
34ce18d4e7 -s ours
am:
eee2d5eed2 -s ours
Change-Id: I576b1d3716c599050a04752e0a14d8203457177f
Andy Hung [Thu, 10 Nov 2016 19:33:37 +0000 (19:33 +0000)]
Merge "Effects: Check get parameter command size" into klp-dev am:
c5768d0921 am:
cfe5d97cf3
am:
a74f0af62b
Change-Id: Ib5c23b1eb3919d9f849ec75fe5a46922d08ae12b
Andy Hung [Thu, 10 Nov 2016 19:33:22 +0000 (19:33 +0000)]
Effects: Check get parameter command size am:
3d34cc76e3 am:
59920bf785
am:
14d87911d7
Change-Id: Icbc43a1d34af774dcf500cdb3548d0399f0b6943
Andy Hung [Thu, 10 Nov 2016 19:33:06 +0000 (19:33 +0000)]
Merge "DO NOT MERGE: Visualizer: Check capture size and latency parameters" into klp-dev am:
f89590d009 am:
50f9a9faea
am:
684314f196 -s ours
Change-Id: I77de3ae3c9b9032b622b2502b4cda1bf0e0bfaea
Andy Hung [Thu, 10 Nov 2016 19:32:51 +0000 (19:32 +0000)]
DO NOT MERGE: Visualizer: Check capture size and latency parameters am:
86cbc180f4 am:
ce8b7cd373
am:
34ce18d4e7 -s ours
Change-Id: Icd8dd8dc6674729ab735d09d0b15f18e6fe28bdb
Andy Hung [Thu, 10 Nov 2016 19:26:36 +0000 (19:26 +0000)]
Merge "Effects: Check get parameter command size" into klp-dev am:
c5768d0921
am:
cfe5d97cf3
Change-Id: I748c867f0259d70eddec229457ca68ac7581dc09
Andy Hung [Thu, 10 Nov 2016 19:26:21 +0000 (19:26 +0000)]
Effects: Check get parameter command size am:
3d34cc76e3
am:
59920bf785
Change-Id: I2d90659faa7d0085b33d0f527a97fa6dc82a70d7
Andy Hung [Thu, 10 Nov 2016 19:26:06 +0000 (19:26 +0000)]
Merge "DO NOT MERGE: Visualizer: Check capture size and latency parameters" into klp-dev am:
f89590d009
am:
50f9a9faea
Change-Id: I2768ab9532953fde21bd10fcca5a509602e80553
Andy Hung [Thu, 10 Nov 2016 19:25:50 +0000 (19:25 +0000)]
DO NOT MERGE: Visualizer: Check capture size and latency parameters am:
86cbc180f4
am:
ce8b7cd373
Change-Id: I2afd4ba46fd6d62c3e89e49ec826ef7d683b324a
Andy Hung [Thu, 10 Nov 2016 19:20:32 +0000 (19:20 +0000)]
Merge "Effects: Check get parameter command size" into klp-dev
am:
c5768d0921
Change-Id: Ibd53fe698f492b7b4bb02181c8dda355a7485990
Andy Hung [Thu, 10 Nov 2016 19:20:29 +0000 (19:20 +0000)]
Effects: Check get parameter command size
am:
3d34cc76e3
Change-Id: Iacc05ef6b8fd1e906daaa3fd0b39c39049b47a0c
Andy Hung [Thu, 10 Nov 2016 19:19:52 +0000 (19:19 +0000)]
Merge "DO NOT MERGE: Visualizer: Check capture size and latency parameters" into klp-dev
am:
f89590d009
Change-Id: I8a9006c295b1a4b5759be649432a93851d66efc6
Andy Hung [Thu, 10 Nov 2016 19:19:51 +0000 (19:19 +0000)]
DO NOT MERGE: Visualizer: Check capture size and latency parameters
am:
86cbc180f4
Change-Id: Ieefd729dc4b90ecaba5bd7684b940ec70f9203b5
Andy Hung [Thu, 10 Nov 2016 19:19:22 +0000 (19:19 +0000)]
Merge "Visualizer: Check capture size and latency parameters" into lmp-dev
am:
565394b1da
Change-Id: I117666052e68605024d833a3d4a74fef7d21e3c1
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
Andy Hung [Thu, 10 Nov 2016 19:16:40 +0000 (19:16 +0000)]
Merge "Effects: Check get parameter command size" into klp-dev
Andy Hung [Thu, 10 Nov 2016 19:15:01 +0000 (19:15 +0000)]
Merge "Visualizer: Check capture size and latency parameters" into lmp-dev
Andy Hung [Thu, 10 Nov 2016 19:13:24 +0000 (19:13 +0000)]
Merge "DO NOT MERGE: Visualizer: Check capture size and latency parameters" into klp-dev
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: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: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: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: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, 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
(cherry picked from commit
52d02b97a4dc54cff9c4f058eeeab6753c2230a0)
Andy Hung [Sat, 5 Nov 2016 02:40:53 +0000 (19:40 -0700)]
Effects: Check get parameter command size
Test: Custom test.
Bug:
32438594
Bug:
32624850
Bug:
32635664
Change-Id: I9b1315e2c02f11bea395bfdcf5c1ccddccbad8a6
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)
Andy Hung [Wed, 19 Oct 2016 00:13:09 +0000 (17:13 -0700)]
DO NOT MERGE: Visualizer: Check capture size and latency parameters
Bug:
31781965
Change-Id: I1c439a0d0f6aa0057b3c651499f28426e1e1f5e4
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 01:56:00 +0000 (01:56 +0000)]
Merge "DO NOT MERGE Fix divide by zero" into lmp-mr1-dev
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: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)]
DO NOT MERGE Fix divide by zero
am:
febbd52cd9
Change-Id: I229ab9fee73b63493c4e61493de6183857ef886a
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:19:54 +0000 (23:19 +0000)]
Merge "DO NOT MERGE Fix divide by zero" into klp-dev
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
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
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
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
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: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
Pawin Vongmasa [Thu, 13 Oct 2016 01:19:47 +0000 (01:19 +0000)]
DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing. am:
de84a76b86 am:
2c76c56d56 am:
f1e84ca858 -s ours
am:
7b9756261d -s ours
Change-Id: I016c0378320af03c05a01059de8c6edeabd84130
Ricardo Garcia [Thu, 13 Oct 2016 01:13:46 +0000 (01:13 +0000)]
Merge "Fix potential NULL dereference in Visualizer effect" into klp-dev
Pawin Vongmasa [Thu, 13 Oct 2016 01:12:59 +0000 (01:12 +0000)]
Merge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing." into klp-dev am:
8caef85235 am:
b512f4ab42
am:
d18d8fac61 -s ours
Change-Id: I4b99c669b012bde7631699d5e7ef0da874cc14d4
Pawin Vongmasa [Thu, 13 Oct 2016 01:12:46 +0000 (01:12 +0000)]
DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing. am:
de84a76b86 am:
2c76c56d56
am:
f1e84ca858 -s ours
Change-Id: I7b0abee027d5cc3e697b3afcbf8412641f963ad3
Pawin Vongmasa [Thu, 13 Oct 2016 01:06:30 +0000 (01:06 +0000)]
Merge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing." into klp-dev am:
8caef85235
am:
b512f4ab42
Change-Id: Ic852128c935782783fc03175be9968da6e894e90
Pawin Vongmasa [Thu, 13 Oct 2016 01:06:16 +0000 (01:06 +0000)]
DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing. am:
de84a76b86
am:
2c76c56d56
Change-Id: I24c8963da1f34e724213bbb896722a06d1eca378
Pawin Vongmasa [Thu, 13 Oct 2016 00:59:47 +0000 (00:59 +0000)]
Merge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing." into klp-dev
am:
8caef85235
Change-Id: I9b4b155c4a720b27120428ea995833c426a65fef
Pawin Vongmasa [Thu, 13 Oct 2016 00:59:47 +0000 (00:59 +0000)]
Merge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing." into lmp-dev
am:
b6ba3d7e47 -s ours
Change-Id: Iab547a3c17869e99ec58022b11a27eeb2777c729
Pawin Vongmasa [Thu, 13 Oct 2016 00:59:46 +0000 (00:59 +0000)]
DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing.
am:
de84a76b86
Change-Id: I7bfde467167616b191ac1d75f3ea08f1ba78089b
Pawin Vongmasa [Thu, 13 Oct 2016 00:59:46 +0000 (00:59 +0000)]
DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing.
am:
0338b14e28 -s ours
Change-Id: Idc7eaeacd94e4499b75aaa1213bf6848ae9206c1
Pawin Vongmasa [Thu, 13 Oct 2016 00:47:52 +0000 (00:47 +0000)]
Merge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing." into lmp-mr1-dev
Pawin Vongmasa [Thu, 13 Oct 2016 00:47:49 +0000 (00:47 +0000)]
Merge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing." into lmp-dev
Pawin Vongmasa [Thu, 13 Oct 2016 00:47:33 +0000 (00:47 +0000)]
Merge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing." into klp-dev
rago [Sat, 8 Oct 2016 01:16:09 +0000 (18:16 -0700)]
Fix potential NULL dereference in Visualizer effect
Bug:
30229821
Test: fixing CL. Existing unit tests still pass.
Change-Id: I6e4abd759d5d2abc3b391e92e2e18f060cab7af0
Lajos Molnar [Tue, 11 Oct 2016 23:10:12 +0000 (23:10 +0000)]
stagefright: don't fail MediaCodec.configure if clients use store-meta key am:
afb20c3102 am:
d9f6b22189 am:
1c44a2ed66
am:
efe63962a7
Change-Id: Id22c6f78db4d457c281ab9db7c214236c2bdb18d
Lajos Molnar [Tue, 11 Oct 2016 23:04:42 +0000 (23:04 +0000)]
stagefright: don't fail MediaCodec.configure if clients use store-meta key am:
afb20c3102 am:
d9f6b22189
am:
1c44a2ed66
Change-Id: I5ef2909336c4264e22c4216b64fccc46ea654c19
Lajos Molnar [Tue, 11 Oct 2016 22:58:40 +0000 (22:58 +0000)]
stagefright: don't fail MediaCodec.configure if clients use store-meta key am:
afb20c3102
am:
d9f6b22189
Change-Id: If02cd075a28e4b96fa1c311547a8837d67e848d5
Lajos Molnar [Tue, 11 Oct 2016 22:53:10 +0000 (22:53 +0000)]
stagefright: don't fail MediaCodec.configure if clients use store-meta key
am:
afb20c3102
Change-Id: Ia68b31d3e1781cb24e0c16f669a6b26644f33d46
OSDN Git Service
