OSDN Git Service
Chien-Yu Chen [Tue, 1 Sep 2015 21:16:44 +0000 (14:16 -0700)]
Camera: Fix flashlight deadlock
Use a dedicated mutex for torch UID map so it won't cause a deadlock
after flashlight app gets killed while the torch is on.
Bug:
23722318
Change-Id: I228377aa0412052d56b6b948361d9abaecbbc686
Jeff Tinker [Fri, 28 Aug 2015 23:34:26 +0000 (23:34 +0000)]
Merge "Fix for security vulnerability in media server" into mnc-dev
Andy Hung [Fri, 28 Aug 2015 22:07:09 +0000 (22:07 +0000)]
am
dbf995ce: am
6b203f06: am
66b24004: am
0ea9e276: am
184ad88d: am
fba72ab0: am
f394f121: Merge "libmedia: clear reply data for IEffect command" into klp-dev
* commit '
dbf995cecdbfcb74437cf2b6b123b10821371f82':
libmedia: clear reply data for IEffect command
Andy Hung [Fri, 28 Aug 2015 21:56:32 +0000 (21:56 +0000)]
am
6b203f06: am
66b24004: am
0ea9e276: am
184ad88d: am
fba72ab0: am
f394f121: Merge "libmedia: clear reply data for IEffect command" into klp-dev
* commit '
6b203f06b969ba92181dbf781544b40cc2c41b7c':
libmedia: clear reply data for IEffect command
Andy Hung [Fri, 28 Aug 2015 21:48:10 +0000 (21:48 +0000)]
am
66b24004: am
0ea9e276: am
184ad88d: am
fba72ab0: am
f394f121: Merge "libmedia: clear reply data for IEffect command" into klp-dev
* commit '
66b24004345ff8a688e8548409b0b7d5a8902232':
libmedia: clear reply data for IEffect command
Andy Hung [Fri, 28 Aug 2015 21:39:52 +0000 (21:39 +0000)]
am
0ea9e276: am
184ad88d: am
fba72ab0: am
f394f121: Merge "libmedia: clear reply data for IEffect command" into klp-dev
* commit '
0ea9e2761a04c4f592d854dbde2749395735fe56':
libmedia: clear reply data for IEffect command
Andy Hung [Fri, 28 Aug 2015 21:26:29 +0000 (21:26 +0000)]
am
184ad88d: am
fba72ab0: am
f394f121: Merge "libmedia: clear reply data for IEffect command" into klp-dev
* commit '
184ad88ddd6bbdf01e131e8e5b75bef5be67b29b':
libmedia: clear reply data for IEffect command
Andy Hung [Fri, 28 Aug 2015 21:16:40 +0000 (21:16 +0000)]
am
fba72ab0: am
f394f121: Merge "libmedia: clear reply data for IEffect command" into klp-dev
* commit '
fba72ab0fcf7298492dcd9e3045913435d30d3a9':
libmedia: clear reply data for IEffect command
Andy Hung [Fri, 28 Aug 2015 21:08:45 +0000 (21:08 +0000)]
am
f394f121: Merge "libmedia: clear reply data for IEffect command" into klp-dev
* commit '
f394f12167fddbc755855d06b615509517c99f14':
libmedia: clear reply data for IEffect command
Andy Hung [Fri, 28 Aug 2015 20:49:57 +0000 (20:49 +0000)]
Merge "libmedia: clear reply data for IEffect command" into klp-dev
Wei Jia [Fri, 28 Aug 2015 15:49:42 +0000 (15:49 +0000)]
Merge "NuPlayer: do not create audio decoder if the player is still in shutdown process." into mnc-dev
Nick Kralevich [Thu, 27 Aug 2015 22:27:27 +0000 (22:27 +0000)]
am
608c349d: am
4e861bf5: am
e1dc15ec: am
762c7139: am
b04cfdf5: am
d437c777: am
0981df6e: IMediaPlayer.cpp: make sure structures are initialized to 0
* commit '
608c349d611e03e0143c23c3f77ddc62b137e354':
IMediaPlayer.cpp: make sure structures are initialized to 0
Jeff Tinker [Thu, 27 Aug 2015 03:22:39 +0000 (20:22 -0700)]
Fix for security vulnerability in media server
bug:
23540426
Change-Id: Ifb12ac3350410a49ba7d81d1bde12822c3008cd5
Nick Kralevich [Thu, 27 Aug 2015 22:22:33 +0000 (22:22 +0000)]
am
4e861bf5: am
e1dc15ec: am
762c7139: am
b04cfdf5: am
d437c777: am
0981df6e: IMediaPlayer.cpp: make sure structures are initialized to 0
* commit '
4e861bf5d43eae00ae4cb8727c5a408c3728288b':
IMediaPlayer.cpp: make sure structures are initialized to 0
Nick Kralevich [Thu, 27 Aug 2015 22:15:02 +0000 (22:15 +0000)]
am
e1dc15ec: am
762c7139: am
b04cfdf5: am
d437c777: am
0981df6e: IMediaPlayer.cpp: make sure structures are initialized to 0
* commit '
e1dc15ecfaa5bbbda28647749bad51e6d18d0c79':
IMediaPlayer.cpp: make sure structures are initialized to 0
Nick Kralevich [Thu, 27 Aug 2015 22:07:00 +0000 (22:07 +0000)]
am
762c7139: am
b04cfdf5: am
d437c777: am
0981df6e: IMediaPlayer.cpp: make sure structures are initialized to 0
* commit '
762c713900bd764570c8fda4e238497200da66d6':
IMediaPlayer.cpp: make sure structures are initialized to 0
Nick Kralevich [Thu, 27 Aug 2015 21:59:43 +0000 (21:59 +0000)]
am
b04cfdf5: am
d437c777: am
0981df6e: IMediaPlayer.cpp: make sure structures are initialized to 0
* commit '
b04cfdf51746dea51d2bb2f56fe9ef789fd30bd9':
IMediaPlayer.cpp: make sure structures are initialized to 0
Nick Kralevich [Thu, 27 Aug 2015 21:51:52 +0000 (21:51 +0000)]
am
d437c777: am
0981df6e: IMediaPlayer.cpp: make sure structures are initialized to 0
* commit '
d437c77716fcf454d99b8424bb01f37643b970cc':
IMediaPlayer.cpp: make sure structures are initialized to 0
Nick Kralevich [Thu, 27 Aug 2015 21:45:45 +0000 (21:45 +0000)]
am
0981df6e: IMediaPlayer.cpp: make sure structures are initialized to 0
* commit '
0981df6e3db106bfb7a56a2b668c012fcc34dd2c':
IMediaPlayer.cpp: make sure structures are initialized to 0
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)
Wei Jia [Thu, 27 Aug 2015 20:59:30 +0000 (13:59 -0700)]
NuPlayer: do not create audio decoder if the player is still in shutdown process.
Bug:
23350795
Change-Id: I46b02cf31d7d4447806910a9ecd8c3bda05f2f5b
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
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 [Wed, 26 Aug 2015 20:31:00 +0000 (20:31 +0000)]
am
f67f894f: (-s ours) am
ff9a97f6: am
92aa0532: am
5e47eb95: am
35a7b54e: am
f9a51893: (-s ours) am
9a2be5d4: Merge "DO NOT MERGE - Fix software video decoder buffer size calculation" into klp-dev
* commit '
f67f894fead9065dcffda03a127cee7d746c9226':
DO NOT MERGE - Fix software video decoder buffer size calculation
Wei Jia [Wed, 26 Aug 2015 20:30:59 +0000 (20:30 +0000)]
am
529c5cbf: (-s ours) am
1fd9995c: am
196a8a9f: am
c4757a87: am
b504ca53: am
3a7ff4c7: (-s ours) am
a5f50e98: DO NOT MERGE - SoftwareRenderer: sanity check buffer size before copying data.
* commit '
529c5cbf4e3df3cf4a0d1feaba547d314d53c3d3':
DO NOT MERGE - SoftwareRenderer: sanity check buffer size before copying data.
Abhishek Arya [Wed, 26 Aug 2015 20:30:58 +0000 (20:30 +0000)]
am
f1dc8e29: (-s ours) am
524f9946: am
76b3fb29: am
4fd0696a: am
4f797b92: Merge "DO NOT MERGE - Fix software video decoder buffer size calculation" into lmp-dev
* commit '
f1dc8e29649b51010bdac55d4f509b2a1fdad922':
DO NOT MERGE - Fix software video decoder buffer size calculation
Wei Jia [Wed, 26 Aug 2015 20:30:57 +0000 (20:30 +0000)]
am
74d08b26: (-s ours) am
fb385ac6: am
571d9731: Merge commit \'
c642d411\' into HEAD
* commit '
74d08b264718cd4026ec3acb918ae5c72adbb68f':
DO NOT MERGE - SoftwareRenderer: sanity check buffer size before copying data.
Abhishek Arya [Tue, 25 Aug 2015 23:25:19 +0000 (23:25 +0000)]
am
ff9a97f6: am
92aa0532: am
5e47eb95: am
35a7b54e: am
f9a51893: (-s ours) am
9a2be5d4: Merge "DO NOT MERGE - Fix software video decoder buffer size calculation" into klp-dev
* commit '
ff9a97f62344dc318b90c5b62ae3c7d3be5ab90e':
DO NOT MERGE - Fix software video decoder buffer size calculation
Wei Jia [Tue, 25 Aug 2015 23:25:18 +0000 (23:25 +0000)]
am
1fd9995c: am
196a8a9f: am
c4757a87: am
b504ca53: am
3a7ff4c7: (-s ours) am
a5f50e98: DO NOT MERGE - SoftwareRenderer: sanity check buffer size before copying data.
* commit '
1fd9995cad1c774c907480d0e4f4d201e81c3e8f':
DO NOT MERGE - SoftwareRenderer: sanity check buffer size before copying data.
Abhishek Arya [Tue, 25 Aug 2015 23:25:17 +0000 (23:25 +0000)]
am
524f9946: am
76b3fb29: am
4fd0696a: am
4f797b92: Merge "DO NOT MERGE - Fix software video decoder buffer size calculation" into lmp-dev
* commit '
524f99469df44f47fd21d160b8434d40dd11bd65':
DO NOT MERGE - Fix software video decoder buffer size calculation
Wei Jia [Tue, 25 Aug 2015 23:25:11 +0000 (23:25 +0000)]
am
fb385ac6: am
571d9731: Merge commit \'
c642d411\' into HEAD
* commit '
fb385ac653b4850fbb4565118c828aa285176a3e':
DO NOT MERGE - SoftwareRenderer: sanity check buffer size before copying data.
Abhishek Arya [Tue, 25 Aug 2015 16:32:47 +0000 (16:32 +0000)]
am
92aa0532: am
5e47eb95: am
35a7b54e: am
f9a51893: (-s ours) am
9a2be5d4: Merge "DO NOT MERGE - Fix software video decoder buffer size calculation" into klp-dev
* commit '
92aa0532ab7cfd70011f70bc909249b894a840d0':
DO NOT MERGE - Fix software video decoder buffer size calculation
Wei Jia [Tue, 25 Aug 2015 16:32:46 +0000 (16:32 +0000)]
am
196a8a9f: am
c4757a87: am
b504ca53: am
3a7ff4c7: (-s ours) am
a5f50e98: DO NOT MERGE - SoftwareRenderer: sanity check buffer size before copying data.
* commit '
196a8a9fc741544dacdced22734d8f87f581b375':
DO NOT MERGE - SoftwareRenderer: sanity check buffer size before copying data.
Abhishek Arya [Tue, 25 Aug 2015 16:32:45 +0000 (16:32 +0000)]
am
76b3fb29: am
4fd0696a: am
4f797b92: Merge "DO NOT MERGE - Fix software video decoder buffer size calculation" into lmp-dev
* commit '
76b3fb292dcda8f56543be10b9e135cce117e210':
DO NOT MERGE - Fix software video decoder buffer size calculation
Wei Jia [Tue, 25 Aug 2015 16:27:08 +0000 (16:27 +0000)]
am
571d9731: Merge commit \'
c642d411\' into HEAD
* commit '
571d9731c06decc19b55617be85eb0df70fa94cb':
DO NOT MERGE - SoftwareRenderer: sanity check buffer size before copying data.
Abhishek Arya [Tue, 25 Aug 2015 16:26:22 +0000 (16:26 +0000)]
am
5e47eb95: am
35a7b54e: am
f9a51893: (-s ours) am
9a2be5d4: Merge "DO NOT MERGE - Fix software video decoder buffer size calculation" into klp-dev
* commit '
5e47eb9512890ea443977d3b54125b33f8259f63':
DO NOT MERGE - Fix software video decoder buffer size calculation
Wei Jia [Tue, 25 Aug 2015 16:26:20 +0000 (16:26 +0000)]
am
c4757a87: am
b504ca53: am
3a7ff4c7: (-s ours) am
a5f50e98: DO NOT MERGE - SoftwareRenderer: sanity check buffer size before copying data.
* commit '
c4757a8741aa43aba2a62b5e4171dcf3a7fc65e6':
DO NOT MERGE - SoftwareRenderer: sanity check buffer size before copying data.
Abhishek Arya [Tue, 25 Aug 2015 16:26:19 +0000 (16:26 +0000)]
am
4fd0696a: am
4f797b92: Merge "DO NOT MERGE - Fix software video decoder buffer size calculation" into lmp-dev
* commit '
4fd0696a8f849d80c725322739ba260421299e0b':
DO NOT MERGE - Fix software video decoder buffer size calculation
Wei Jia [Tue, 25 Aug 2015 16:10:32 +0000 (09:10 -0700)]
Merge commit '
c642d411' into HEAD
DO NOT MERGE - SoftwareRenderer: sanity check buffer size before copying data.
Bug:
21443020
(cherry picked from commit
760f92f8b6da9c9cf128cb18fe3c09402fdde6cd)
Change-Id: I5bc68e3e7f0278b8bbbe0ad5b87d6e8e2dbabd42
Abhishek Arya [Tue, 25 Aug 2015 05:35:57 +0000 (05:35 +0000)]
am
35a7b54e: am
f9a51893: (-s ours) am
9a2be5d4: Merge "DO NOT MERGE - Fix software video decoder buffer size calculation" into klp-dev
* commit '
35a7b54e828336121d26060dd7e7adb5f5027d32':
DO NOT MERGE - Fix software video decoder buffer size calculation
Wei Jia [Tue, 25 Aug 2015 05:35:56 +0000 (05:35 +0000)]
am
b504ca53: am
3a7ff4c7: (-s ours) am
a5f50e98: DO NOT MERGE - SoftwareRenderer: sanity check buffer size before copying data.
* commit '
b504ca537ca206661ab60d774927032bae52dc35':
DO NOT MERGE - SoftwareRenderer: sanity check buffer size before copying data.
Abhishek Arya [Tue, 25 Aug 2015 05:30:46 +0000 (05:30 +0000)]
am
f9a51893: (-s ours) am
9a2be5d4: Merge "DO NOT MERGE - Fix software video decoder buffer size calculation" into klp-dev
* commit '
f9a51893d739000cd70caf10c83d0e603371f5b1':
DO NOT MERGE - Fix software video decoder buffer size calculation
Wei Jia [Tue, 25 Aug 2015 05:30:44 +0000 (05:30 +0000)]
am
3a7ff4c7: (-s ours) am
a5f50e98: DO NOT MERGE - SoftwareRenderer: sanity check buffer size before copying data.
* commit '
3a7ff4c754fcb99c29621ed94b08ed6fb65f6495':
DO NOT MERGE - SoftwareRenderer: sanity check buffer size before copying data.
Abhishek Arya [Tue, 25 Aug 2015 05:23:24 +0000 (05:23 +0000)]
am
9a2be5d4: Merge "DO NOT MERGE - Fix software video decoder buffer size calculation" into klp-dev
* commit '
9a2be5d49d57b239bf6345f033eab01ba98f3889':
DO NOT MERGE - Fix software video decoder buffer size calculation
Wei Jia [Tue, 25 Aug 2015 05:23:23 +0000 (05:23 +0000)]
am
a5f50e98: DO NOT MERGE - SoftwareRenderer: sanity check buffer size before copying data.
* commit '
a5f50e98d1408addcaaac27e4d13981163d12a15':
DO NOT MERGE - SoftwareRenderer: sanity check buffer size before copying data.
Abhishek Arya [Tue, 25 Aug 2015 05:03:29 +0000 (05:03 +0000)]
am
4f797b92: Merge "DO NOT MERGE - Fix software video decoder buffer size calculation" into lmp-dev
* commit '
4f797b92b6e6d21a88c6b9b85a6cba38bfd04e3a':
DO NOT MERGE - Fix software video decoder buffer size calculation
Wei Jia [Tue, 25 Aug 2015 05:03:28 +0000 (05:03 +0000)]
am
dc5e47f0: DO NOT MERGE - SoftwareRenderer: sanity check buffer size before copying data.
* commit '
dc5e47f013bfbb74c5c35ad976aa98d480cb351b':
DO NOT MERGE - SoftwareRenderer: sanity check buffer size before copying data.
Abhishek Arya [Tue, 25 Aug 2015 04:00:11 +0000 (04:00 +0000)]
Merge "DO NOT MERGE - Fix software video decoder buffer size calculation" into lmp-dev
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
Wei Jia [Mon, 24 Aug 2015 23:23:09 +0000 (23:23 +0000)]
am
dddf932f: am
41de4ba1: am
cf69487d: am
6f80b09f: am
252a8c09: am
0f3ab16c: am
af7e33f6: libstagefright: check overflow before memory allocation in OMXCodec.cpp
* commit '
dddf932f2e58dab3ae183f720f44ca35fca52765':
libstagefright: check overflow before memory allocation in OMXCodec.cpp
Marco Nelissen [Mon, 24 Aug 2015 23:23:08 +0000 (23:23 +0000)]
am
a6bafbc5: am
2c02f5ee: am
719cd33e: am
492bba08: am
d18bb120: am
09f71c56: am
dedaca6f: Limit allocations to avoid out-of-memory
* commit '
a6bafbc5da25db600d7311c0ba47a3fe034b4471':
Limit allocations to avoid out-of-memory
Wei Jia [Mon, 24 Aug 2015 23:17:50 +0000 (23:17 +0000)]
am
41de4ba1: am
cf69487d: am
6f80b09f: am
252a8c09: am
0f3ab16c: am
af7e33f6: libstagefright: check overflow before memory allocation in OMXCodec.cpp
* commit '
41de4ba1d896c4e8ab7df24d10ca7d5109fbd323':
libstagefright: check overflow before memory allocation in OMXCodec.cpp
Marco Nelissen [Mon, 24 Aug 2015 23:17:49 +0000 (23:17 +0000)]
am
2c02f5ee: am
719cd33e: am
492bba08: am
d18bb120: am
09f71c56: am
dedaca6f: Limit allocations to avoid out-of-memory
* commit '
2c02f5eeec639825ece4acbca0d1969da192dca0':
Limit allocations to avoid out-of-memory
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)
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 [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)
Robert Shih [Mon, 24 Aug 2015 16:06:16 +0000 (16:06 +0000)]
am
fa11fd5b: resolved conflicts for merge of
327afffb to lmp-mr1-ub-dev
* commit '
fa11fd5bb2e9c5e00f7fecbbe76c279193182cee':
Prevent integer issues in ID3::Iterator::findFrame
Robert Shih [Mon, 24 Aug 2015 15:36:50 +0000 (08:36 -0700)]
resolved conflicts for merge of
327afffb to lmp-mr1-ub-dev
Change-Id: I6c1369f05bbeb83e2152b8dae35f7a53328f7239
Wei Jia [Sun, 23 Aug 2015 19:33:29 +0000 (19:33 +0000)]
am
cf69487d: am
6f80b09f: am
252a8c09: am
0f3ab16c: am
af7e33f6: libstagefright: check overflow before memory allocation in OMXCodec.cpp
* commit '
cf69487d1af3eeba724b65716a63ae13238e6e4a':
libstagefright: check overflow before memory allocation in OMXCodec.cpp
Marco Nelissen [Sun, 23 Aug 2015 19:33:28 +0000 (19:33 +0000)]
am
719cd33e: am
492bba08: am
d18bb120: am
09f71c56: am
dedaca6f: Limit allocations to avoid out-of-memory
* commit '
719cd33e4ebc1c600772f81db28f81ccfe99ec4e':
Limit allocations to avoid out-of-memory
Wei Jia [Sun, 23 Aug 2015 19:27:03 +0000 (19:27 +0000)]
am
6f80b09f: am
252a8c09: am
0f3ab16c: am
af7e33f6: libstagefright: check overflow before memory allocation in OMXCodec.cpp
* commit '
6f80b09f61da018d2f05e5303c0a798f9011d667':
libstagefright: check overflow before memory allocation in OMXCodec.cpp
Marco Nelissen [Sun, 23 Aug 2015 19:27:02 +0000 (19:27 +0000)]
am
492bba08: am
d18bb120: am
09f71c56: am
dedaca6f: Limit allocations to avoid out-of-memory
* commit '
492bba08202a601e96a13b26422c85b3fb1a5ee0':
Limit allocations to avoid out-of-memory
Wei Jia [Sun, 23 Aug 2015 19:19:25 +0000 (19:19 +0000)]
am
252a8c09: am
0f3ab16c: am
af7e33f6: libstagefright: check overflow before memory allocation in OMXCodec.cpp
* commit '
252a8c0956fe5a10bc18d9d4c6337edf29657d72':
libstagefright: check overflow before memory allocation in OMXCodec.cpp
Marco Nelissen [Sun, 23 Aug 2015 19:19:24 +0000 (19:19 +0000)]
am
d18bb120: am
09f71c56: am
dedaca6f: Limit allocations to avoid out-of-memory
* commit '
d18bb120442fcc04efe269e6a26f83265eea40c8':
Limit allocations to avoid out-of-memory
Wei Jia [Sun, 23 Aug 2015 19:15:04 +0000 (19:15 +0000)]
am
0f3ab16c: am
af7e33f6: libstagefright: check overflow before memory allocation in OMXCodec.cpp
* commit '
0f3ab16c827a43534597cb38515951ff736f9740':
libstagefright: check overflow before memory allocation in OMXCodec.cpp
Marco Nelissen [Sun, 23 Aug 2015 19:15:02 +0000 (19:15 +0000)]
am
09f71c56: am
dedaca6f: Limit allocations to avoid out-of-memory
* commit '
09f71c5621799e0f030b4a8058d2fb4df5977de0':
Limit allocations to avoid out-of-memory
Wei Jia [Sun, 23 Aug 2015 19:08:27 +0000 (19:08 +0000)]
am
af7e33f6: libstagefright: check overflow before memory allocation in OMXCodec.cpp
* commit '
af7e33f6043c0be1c0310d675884e3b263ca2438':
libstagefright: check overflow before memory allocation in OMXCodec.cpp
Marco Nelissen [Sun, 23 Aug 2015 19:08:25 +0000 (19:08 +0000)]
am
dedaca6f: Limit allocations to avoid out-of-memory
* commit '
dedaca6f04ac9f95fabe3b64d44cd1a2050f079e':
Limit allocations to avoid out-of-memory
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 01:39:16 +0000 (01:39 +0000)]
am
4bb4736e: am
4c6556d1: am
8cf3564d: am
eecc406f: am
3b42241a: Merge "Prevent integer issues in ID3::Iterator::findFrame" into klp-dev
* commit '
4bb4736eb6b5038385c2c0e8c28e4d2df9add929':
Prevent integer issues in ID3::Iterator::findFrame
Robert Shih [Sat, 22 Aug 2015 01:33:50 +0000 (01:33 +0000)]
am
4c6556d1: am
8cf3564d: am
eecc406f: am
3b42241a: Merge "Prevent integer issues in ID3::Iterator::findFrame" into klp-dev
* commit '
4c6556d17f4073ed0b4d11abf42df9c32c339291':
Prevent integer issues in ID3::Iterator::findFrame
Robert Shih [Sat, 22 Aug 2015 01:25:05 +0000 (01:25 +0000)]
am
8cf3564d: am
eecc406f: am
3b42241a: Merge "Prevent integer issues in ID3::Iterator::findFrame" into klp-dev
* commit '
8cf3564d2dd522f7a707a8fd109d415dab3def47':
Prevent integer issues in ID3::Iterator::findFrame
Robert Shih [Sat, 22 Aug 2015 01:18:32 +0000 (01:18 +0000)]
am
eecc406f: am
3b42241a: Merge "Prevent integer issues in ID3::Iterator::findFrame" into klp-dev
* commit '
eecc406f462ef2b3a73cd6bf3c05f7cb45382276':
Prevent integer issues in ID3::Iterator::findFrame
Robert Shih [Sat, 22 Aug 2015 01:08:44 +0000 (01:08 +0000)]
am
3b42241a: Merge "Prevent integer issues in ID3::Iterator::findFrame" into klp-dev
* commit '
3b42241aab5855964d1bd60268ae21c2d9cc6065':
Prevent integer issues in ID3::Iterator::findFrame
Robert Shih [Sat, 22 Aug 2015 00:54:32 +0000 (00:54 +0000)]
Merge "Prevent integer issues in ID3::Iterator::findFrame" into klp-dev
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
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
Andy Hung [Fri, 21 Aug 2015 22:18:35 +0000 (22:18 +0000)]
Merge "TimestretchBufferProvider: getNextBuffer should follow API" into mnc-dev
Wei Jia [Fri, 21 Aug 2015 20:39:11 +0000 (20:39 +0000)]
am
47b90fe2: (-s ours) am
b69a01a5: am
07a2e912: am
323d22e7: am
8319fadb: am
f814f84e: (-s ours) am
d8816a13: DO NOT MERGE libstagefright: Fix crash in convertMetaDataToMessage
* commit '
47b90fe20d6ea9409c7009926c60fa33985f4211':
DO NOT MERGE libstagefright: Fix crash in convertMetaDataToMessage
Wei Jia [Fri, 21 Aug 2015 20:30:35 +0000 (20:30 +0000)]
am
b69a01a5: am
07a2e912: am
323d22e7: am
8319fadb: am
f814f84e: (-s ours) am
d8816a13: DO NOT MERGE libstagefright: Fix crash in convertMetaDataToMessage
* commit '
b69a01a576b613fb1e6a2a58c189c8623c5adbac':
DO NOT MERGE libstagefright: Fix crash in convertMetaDataToMessage
Wei Jia [Fri, 21 Aug 2015 20:24:57 +0000 (20:24 +0000)]
am
07a2e912: am
323d22e7: am
8319fadb: am
f814f84e: (-s ours) am
d8816a13: DO NOT MERGE libstagefright: Fix crash in convertMetaDataToMessage
* commit '
07a2e912a89d0dc83a8e83b33a066ef3ae1a2333':
DO NOT MERGE libstagefright: Fix crash in convertMetaDataToMessage
Wei Jia [Fri, 21 Aug 2015 20:17:09 +0000 (20:17 +0000)]
am
323d22e7: am
8319fadb: am
f814f84e: (-s ours) am
d8816a13: DO NOT MERGE libstagefright: Fix crash in convertMetaDataToMessage
* commit '
323d22e76e2d96306c5f67edb07bb4c2eef14188':
DO NOT MERGE libstagefright: Fix crash in convertMetaDataToMessage
Wei Jia [Fri, 21 Aug 2015 20:11:02 +0000 (20:11 +0000)]
am
8319fadb: am
f814f84e: (-s ours) am
d8816a13: DO NOT MERGE libstagefright: Fix crash in convertMetaDataToMessage
* commit '
8319fadb99f5d862ed68d44a587b6f1fac2e0d2d':
DO NOT MERGE libstagefright: Fix crash in convertMetaDataToMessage
Wei Jia [Fri, 21 Aug 2015 20:03:06 +0000 (20:03 +0000)]
am
f814f84e: (-s ours) am
d8816a13: DO NOT MERGE libstagefright: Fix crash in convertMetaDataToMessage
* commit '
f814f84e09191af23bbf8d307f02704e20cc887c':
DO NOT MERGE libstagefright: Fix crash in convertMetaDataToMessage
Andy Hung [Fri, 21 Aug 2015 19:53:46 +0000 (12:53 -0700)]
TimestretchBufferProvider: getNextBuffer should follow API
If no data, should return 0 frame count and NULL ptr.
Bug:
23293002
Change-Id: Ib5364e5bceb15c2dddc4a16e85299b409cf4e137
Wei Jia [Fri, 21 Aug 2015 19:57:30 +0000 (19:57 +0000)]
am
d8816a13: DO NOT MERGE libstagefright: Fix crash in convertMetaDataToMessage
* commit '
d8816a13dbcafd5d61d26a8a6b2e892452bca1a7':
DO NOT MERGE libstagefright: Fix crash in convertMetaDataToMessage
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 19:34:04 +0000 (19:34 +0000)]
am
ce61bb6a: (-s ours) am
52a9a61b: am
bb64d2fb: am
21b14554: am
e4a9d859: am
ca095ac2: (-s ours) am
8de6d690: Fix build break DO NOT MERGE
* commit '
ce61bb6abd09be5b49a8e95905243d75a1e9abcf':
Fix build break DO NOT MERGE
Jeff Tinker [Fri, 21 Aug 2015 19:27:17 +0000 (19:27 +0000)]
am
52a9a61b: am
bb64d2fb: am
21b14554: am
e4a9d859: am
ca095ac2: (-s ours) am
8de6d690: Fix build break DO NOT MERGE
* commit '
52a9a61bd0a213c250bf2e61b66353259d729cfc':
Fix build break DO NOT MERGE
Jeff Tinker [Fri, 21 Aug 2015 19:17:50 +0000 (19:17 +0000)]
am
bb64d2fb: am
21b14554: am
e4a9d859: am
ca095ac2: (-s ours) am
8de6d690: Fix build break DO NOT MERGE
* commit '
bb64d2fb9e458c9bde66dbc79d88462b7db2b652':
Fix build break DO NOT MERGE
Jeff Tinker [Fri, 21 Aug 2015 19:13:44 +0000 (19:13 +0000)]
am
21b14554: am
e4a9d859: am
ca095ac2: (-s ours) am
8de6d690: Fix build break DO NOT MERGE
* commit '
21b14554c2c74ff81a381de3ddf893d8ea411161':
Fix build break DO NOT MERGE
Jeff Tinker [Fri, 21 Aug 2015 19:05:58 +0000 (19:05 +0000)]
am
e4a9d859: am
ca095ac2: (-s ours) am
8de6d690: Fix build break DO NOT MERGE
* commit '
e4a9d859e10930f187fc037e0a1cc8d1eb5c21c5':
Fix build break DO NOT MERGE
Jeff Tinker [Fri, 21 Aug 2015 18:59:11 +0000 (18:59 +0000)]
am
ca095ac2: (-s ours) am
8de6d690: Fix build break DO NOT MERGE
* commit '
ca095ac251ad02ad745d763f37ec3fcc5a8aa2ea':
Fix build break DO NOT MERGE
Jeff Tinker [Fri, 21 Aug 2015 18:51:27 +0000 (18:51 +0000)]
am
8de6d690: Fix build break DO NOT MERGE
* commit '
8de6d690ae5843bd8e005deedea571596f79bbd3':
Fix build break DO NOT MERGE
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 [Fri, 21 Aug 2015 17:01:59 +0000 (17:01 +0000)]
am
b7d6e637: (-s ours) am
186993d7: am
4bbd5238: am
9c9f8620: am
f8bf4acb: am
fd1d6df5: (-s ours) am
c2153d0d: DO NOT MERGE Part of fix for libmedia OOB write anywhere
* commit '
b7d6e637c741aecbc3c84bbb259dbc9ab0cfa0f8':
DO NOT MERGE Part of fix for libmedia OOB write anywhere
Jeff Tinker [Fri, 21 Aug 2015 16:55:19 +0000 (16:55 +0000)]
am
186993d7: am
4bbd5238: am
9c9f8620: am
f8bf4acb: am
fd1d6df5: (-s ours) am
c2153d0d: DO NOT MERGE Part of fix for libmedia OOB write anywhere
* commit '
186993d738ec3b3c9229f97a5ede86250ff54cfa':
DO NOT MERGE Part of fix for libmedia OOB write anywhere
Jeff Tinker [Fri, 21 Aug 2015 16:49:06 +0000 (16:49 +0000)]
am
4bbd5238: am
9c9f8620: am
f8bf4acb: am
fd1d6df5: (-s ours) am
c2153d0d: DO NOT MERGE Part of fix for libmedia OOB write anywhere
* commit '
4bbd52382c6eab0b5f2de1ccdfb8da619e40deb7':
DO NOT MERGE Part of fix for libmedia OOB write anywhere