OSDN Git Service
Ray Essick [Fri, 19 Aug 2016 16:54:08 +0000 (16:54 +0000)]
better validation lengths of strings in ID3 tags am:
d23c01546c am:
e3fad118bb am:
019973a8d4 am:
d936eadf31
am:
94875f51ca
Change-Id: Id6b1ba9255ca4d3f298ee408231648511e6a0fed
Ray Essick [Fri, 19 Aug 2016 16:50:35 +0000 (16:50 +0000)]
better validation lengths of strings in ID3 tags am:
d23c01546c am:
e3fad118bb am:
019973a8d4
am:
d936eadf31
Change-Id: Ic91989dc86a789e282c3b20f253d8591d7bd78a7
Ray Essick [Fri, 19 Aug 2016 16:48:24 +0000 (16:48 +0000)]
better validation lengths of strings in ID3 tags am:
d23c01546c am:
e3fad118bb
am:
019973a8d4
Change-Id: I19865bbbc4037de800c2a1670de070c5ecc2dbf6
Ray Essick [Fri, 19 Aug 2016 16:41:01 +0000 (16:41 +0000)]
better validation lengths of strings in ID3 tags am:
d23c01546c
am:
e3fad118bb
Change-Id: I14bb5fbc1d7f97cf178b56699fd61131745b1a0e
Ray Essick [Fri, 19 Aug 2016 16:37:31 +0000 (16:37 +0000)]
better validation lengths of strings in ID3 tags
am:
d23c01546c
Change-Id: Idb8da8a0557349964f862ec1ab9f81542b81c492
Pawin Vongmasa [Fri, 19 Aug 2016 03:02:13 +0000 (03:02 +0000)]
DO NOT MERGE - SoftMPEG4: Check the buffer size before writing the reference frame. am:
940829f69b am:
920b0f7887 am:
b71a431eab -s ours am:
5c4e9db2bb -s ours am:
348a267300 am:
f9bcd8f269 am:
b1d9532571 -s ours
am:
61328a3f38
Change-Id: Ibb188095eb9677ae8293a5922cf124055f544961
Pawin Vongmasa [Fri, 19 Aug 2016 03:02:12 +0000 (03:02 +0000)]
DO NOT MERGE - SoftMPEG4: Check the buffer size before writing the reference frame. am:
180185da19 -s ours am:
5d50c6e5e0 am:
9cb824f404 am:
b037147760 -s ours
am:
7db383ebb7
Change-Id: I3dbc9f8cf25eca9885f4356a97602c39c7db033a
Pawin Vongmasa [Fri, 19 Aug 2016 02:59:10 +0000 (02:59 +0000)]
DO NOT MERGE - SoftMPEG4: Check the buffer size before writing the reference frame. am:
940829f69b am:
920b0f7887 am:
b71a431eab -s ours am:
5c4e9db2bb -s ours am:
348a267300 am:
f9bcd8f269
am:
b1d9532571 -s ours
Change-Id: I315726456f9a01ae9ec942c9071b605d92b902fb
Pawin Vongmasa [Fri, 19 Aug 2016 02:59:09 +0000 (02:59 +0000)]
DO NOT MERGE - SoftMPEG4: Check the buffer size before writing the reference frame. am:
180185da19 -s ours am:
5d50c6e5e0 am:
9cb824f404
am:
b037147760 -s ours
Change-Id: I4ea77c0bc2828bf5560fd244f6d937b91a39c11f
Pawin Vongmasa [Fri, 19 Aug 2016 02:57:01 +0000 (02:57 +0000)]
DO NOT MERGE - SoftMPEG4: Check the buffer size before writing the reference frame. am:
940829f69b am:
920b0f7887 am:
b71a431eab -s ours am:
5c4e9db2bb -s ours am:
348a267300
am:
f9bcd8f269
Change-Id: Id871c2271566705e62c0e608269fed0e0f4abc37
Pawin Vongmasa [Fri, 19 Aug 2016 02:57:00 +0000 (02:57 +0000)]
DO NOT MERGE - SoftMPEG4: Check the buffer size before writing the reference frame. am:
180185da19 -s ours am:
5d50c6e5e0
am:
9cb824f404
Change-Id: If561b868ecee3b9cf54b9c1a669276008dfcc82f
Pawin Vongmasa [Fri, 19 Aug 2016 02:54:04 +0000 (02:54 +0000)]
DO NOT MERGE - SoftMPEG4: Check the buffer size before writing the reference frame. am:
940829f69b am:
920b0f7887 am:
b71a431eab -s ours am:
5c4e9db2bb -s ours
am:
348a267300
Change-Id: I594edffee48c52277de18e760aef5bf7916756b3
Pawin Vongmasa [Fri, 19 Aug 2016 02:53:08 +0000 (02:53 +0000)]
DO NOT MERGE - SoftMPEG4: Check the buffer size before writing the reference frame. am:
940829f69b am:
920b0f7887 am:
b71a431eab -s ours
am:
5c4e9db2bb -s ours
Change-Id: Id306e53c54feb78be4eeedd11fc43796973d8848
Pawin Vongmasa [Fri, 19 Aug 2016 02:53:08 +0000 (02:53 +0000)]
DO NOT MERGE - SoftMPEG4: Check the buffer size before writing the reference frame. am:
180185da19 -s ours
am:
5d50c6e5e0
Change-Id: I82c5a285bb7464070072d11d05116cd69e837947
Pawin Vongmasa [Fri, 19 Aug 2016 02:50:08 +0000 (02:50 +0000)]
DO NOT MERGE - SoftMPEG4: Check the buffer size before writing the reference frame. am:
940829f69b am:
920b0f7887
am:
b71a431eab -s ours
Change-Id: I2b59b1bf145b023796e66cc13e385d5ec1c80b54
Pawin Vongmasa [Fri, 19 Aug 2016 02:46:39 +0000 (02:46 +0000)]
SoftMPEG4: Check the buffer size before writing the reference frame. am:
6951231950 am:
af39271e11 am:
3efed2f14c
am:
1cfd97c331
Change-Id: I9648977377ee7a06dff6ff00a4c74e31a0f44a3a
Pawin Vongmasa [Fri, 19 Aug 2016 02:44:08 +0000 (02:44 +0000)]
SoftMPEG4: Check the buffer size before writing the reference frame. am:
6951231950 am:
af39271e11
am:
3efed2f14c
Change-Id: I33b4226d5aa42a1adc14988789ac2f0965cfb606
Pawin Vongmasa [Fri, 19 Aug 2016 02:44:07 +0000 (02:44 +0000)]
DO NOT MERGE - SoftMPEG4: Check the buffer size before writing the reference frame.
am:
180185da19 -s ours
Change-Id: I73131f2361fa0f950aca6ed77551cb8d7e6a96d9
Pawin Vongmasa [Fri, 19 Aug 2016 02:43:37 +0000 (02:43 +0000)]
DO NOT MERGE - SoftMPEG4: Check the buffer size before writing the reference frame. am:
940829f69b
am:
920b0f7887
Change-Id: I603ab931f82d8a83187be989dccb8686de8bf95e
Pawin Vongmasa [Fri, 19 Aug 2016 02:41:33 +0000 (02:41 +0000)]
SoftMPEG4: Check the buffer size before writing the reference frame. am:
6951231950
am:
af39271e11
Change-Id: I2d263d12fecf7dc3974b665ca568d3db5dcd76b3
Pawin Vongmasa [Fri, 19 Aug 2016 02:40:37 +0000 (02:40 +0000)]
DO NOT MERGE - SoftMPEG4: Check the buffer size before writing the reference frame.
am:
940829f69b
Change-Id: I3df8797998bac785ad198cb4fb2401779a3947ff
Pawin Vongmasa [Fri, 19 Aug 2016 02:37:06 +0000 (02:37 +0000)]
SoftMPEG4: Check the buffer size before writing the reference frame.
am:
6951231950
Change-Id: I594a73e3b3a2002608675ac38e23c6b2764bd0d2
Pawin Vongmasa [Tue, 19 Jul 2016 03:12:02 +0000 (20:12 -0700)]
DO NOT MERGE - SoftMPEG4: Check the buffer size before writing the reference frame.
Also prevent overflow in SoftMPEG4 and division by zero in SoftMPEG4Encoder.
Bug:
30033990
Change-Id: I7701f5fc54c2670587d122330e5dc851f64ed3c2
(cherry picked from commit
695123195034402ca76169b195069c28c30342d3)
Pawin Vongmasa [Tue, 19 Jul 2016 03:12:02 +0000 (20:12 -0700)]
DO NOT MERGE - SoftMPEG4: Check the buffer size before writing the reference frame.
Also prevent overflow in SoftMPEG4 and division by zero in SoftMPEG4Encoder.
Bug:
30033990
Change-Id: I7701f5fc54c2670587d122330e5dc851f64ed3c2
(cherry picked from commit
695123195034402ca76169b195069c28c30342d3)
Ray Essick [Tue, 16 Aug 2016 21:24:43 +0000 (14:24 -0700)]
better validation lengths of strings in ID3 tags
Validate lengths on strings in ID3 tags, particularly around 0.
Also added code to handle cases when we can't get memory for
copies of strings we want to extract from these tags.
Affects L/M/N/master, same patch for all of them.
Bug:
30744884
Change-Id: I2675a817a39f0927ec1f7e9f9c09f2e61020311e
Test: play mp3 file which caused a <0 length.
Pawin Vongmasa [Fri, 12 Aug 2016 21:03:53 +0000 (21:03 +0000)]
DO NOT MERGE - ACodec: Save and use the previous crop rectangle.
am:
07d73a0a3f
Change-Id: I52c3cf5e2ccc0e2c84b0e634dba8e10054d4ff42
Pawin Vongmasa [Fri, 12 Aug 2016 01:51:24 +0000 (18:51 -0700)]
DO NOT MERGE - ACodec: Save and use the previous crop rectangle.
When the surface changes, set the crop rectangle for the new native
window using the previous crop rectangle if available.
Also prevent null pointer dereferencing in debug mode.
Bug:
30690174
Change-Id: I7a707d661ced5a87fcaa8568cbb903fbc26ea346
Pawin Vongmasa [Tue, 19 Jul 2016 03:12:02 +0000 (20:12 -0700)]
SoftMPEG4: Check the buffer size before writing the reference frame.
Also prevent overflow in SoftMPEG4 and division by zero in SoftMPEG4Encoder.
Bug:
30033990
Change-Id: I7701f5fc54c2670587d122330e5dc851f64ed3c2
Wonsik Kim [Mon, 1 Aug 2016 22:16:24 +0000 (22:16 +0000)]
Merge "DO NOT MERGE - stagefright: fix integer overflow error" into lmp-mr1-dev am:
ee58cd8522 am:
a28d14862a am:
f3cfa7f815 -s ours
am:
7ab70a7ba9
Change-Id: I7210069708eefb8b5c10d5a5845668eb1c45b0f4
Wonsik Kim [Mon, 1 Aug 2016 22:16:23 +0000 (22:16 +0000)]
DO NOT MERGE - stagefright: fix integer overflow error am:
2d58796ded am:
450fd950d0 am:
a7a43eb646 -s ours
am:
63f8141861
Change-Id: Ie8abe25ffa6cb731d62419c318e14ca2b2fa6d82
Wonsik Kim [Mon, 1 Aug 2016 22:13:28 +0000 (22:13 +0000)]
Merge "DO NOT MERGE - stagefright: fix integer overflow error" into lmp-mr1-dev am:
ee58cd8522 am:
a28d14862a
am:
f3cfa7f815 -s ours
Change-Id: I4a38c82e157f3a8e57da1a7aad847eb2657e7278
Wonsik Kim [Mon, 1 Aug 2016 22:13:27 +0000 (22:13 +0000)]
DO NOT MERGE - stagefright: fix integer overflow error am:
2d58796ded am:
450fd950d0
am:
a7a43eb646 -s ours
Change-Id: I443f4c11ead7e5b1544fd213debfed85308a2cef
Wonsik Kim [Mon, 1 Aug 2016 22:11:30 +0000 (22:11 +0000)]
Merge "DO NOT MERGE - stagefright: fix integer overflow error" into lmp-mr1-dev am:
ee58cd8522
am:
a28d14862a
Change-Id: Icbc3aa2db7297be677de0e40f0dc879c462d929f
Wonsik Kim [Mon, 1 Aug 2016 22:11:29 +0000 (22:11 +0000)]
DO NOT MERGE - stagefright: fix integer overflow error am:
2d58796ded
am:
450fd950d0
Change-Id: I1e9071e2c055795c40d7973fec98c2a8850d7f62
Wonsik Kim [Mon, 1 Aug 2016 22:08:22 +0000 (22:08 +0000)]
Merge "DO NOT MERGE - stagefright: fix integer overflow error" into lmp-mr1-dev
am:
ee58cd8522
Change-Id: I0a099a5fc8d3c4c188380b78c7acf8c4239c8b38
Wonsik Kim [Mon, 1 Aug 2016 22:08:21 +0000 (22:08 +0000)]
DO NOT MERGE - stagefright: fix integer overflow error
am:
2d58796ded
Change-Id: Iee9435171a7566f60f48c657c6fada505e2eda90
TreeHugger Robot [Mon, 1 Aug 2016 22:05:02 +0000 (22:05 +0000)]
Merge "DO NOT MERGE - stagefright: fix integer overflow error" into lmp-mr1-dev
Wonsik Kim [Mon, 1 Aug 2016 21:22:30 +0000 (21:22 +0000)]
Merge "DO NOT MERGE - stagefright: fix integer overflow error" into lmp-dev am:
8f4b1a7de0 -s ours am:
64c06e051a am:
bbc4b190d0 am:
559b777d4f -s ours
am:
1d39eeea17
Change-Id: Ia482954362156d923126e1e2ecccef08b6e4c427
Wonsik Kim [Mon, 1 Aug 2016 21:22:29 +0000 (21:22 +0000)]
DO NOT MERGE - stagefright: fix integer overflow error am:
f4f36a0a31 -s ours am:
4efaa1bca7 am:
ac9dd1421d am:
4f4d793ecb -s ours
am:
b017233d05
Change-Id: I5400e735c20ba9a0ebf2801a8bb35cdfc720a3f5
Marco Nelissen [Mon, 1 Aug 2016 21:19:54 +0000 (21:19 +0000)]
Merge "DO NOT MERGE - stagefright: fix integer overflow error" into lmp-dev am:
8f4b1a7de0 -s ours am:
64c06e051a am:
bbc4b190d0
am:
559b777d4f -s ours
Change-Id: Ibb838a504e61b142c33cbf6a9ed6e27d478dcbd2
Wonsik Kim [Mon, 1 Aug 2016 21:19:53 +0000 (21:19 +0000)]
DO NOT MERGE - stagefright: fix integer overflow error am:
f4f36a0a31 -s ours am:
4efaa1bca7 am:
ac9dd1421d
am:
4f4d793ecb -s ours
Change-Id: I620085a5b0f5bd6a56ac5db49b137d984c7b984a
Wonsik Kim [Mon, 1 Aug 2016 21:17:31 +0000 (21:17 +0000)]
Merge "DO NOT MERGE - stagefright: fix integer overflow error" into lmp-dev am:
8f4b1a7de0 -s ours am:
64c06e051a
am:
bbc4b190d0
Change-Id: I2a7760f7b6bb1c12d021fbcf0ddd5d5fcab21cc3
Wonsik Kim [Mon, 1 Aug 2016 21:17:30 +0000 (21:17 +0000)]
DO NOT MERGE - stagefright: fix integer overflow error am:
f4f36a0a31 -s ours am:
4efaa1bca7
am:
ac9dd1421d
Change-Id: I8038fce681bda8b550e2d84c3aea13004dc5ebc7
Wonsik Kim [Thu, 21 Jul 2016 05:43:38 +0000 (14:43 +0900)]
DO NOT MERGE - stagefright: fix integer overflow error
Bug:
30103394
Change-Id: If449d3e30a0bf2ebea5317f41813bfed094f7408
(cherry picked from commit
2c74a3cd5d1d66b9a35424b9c4443dafa6db5bef)
Marco Nelissen [Mon, 1 Aug 2016 21:13:52 +0000 (21:13 +0000)]
Merge "DO NOT MERGE - stagefright: fix integer overflow error" into lmp-dev am:
8f4b1a7de0 -s ours
am:
64c06e051a
Change-Id: I089103c8f98f6819bfe2e6ce3d229bdf5d9ddb9c
Wonsik Kim [Mon, 1 Aug 2016 21:13:52 +0000 (21:13 +0000)]
DO NOT MERGE - stagefright: fix integer overflow error am:
f4f36a0a31 -s ours
am:
4efaa1bca7
Change-Id: I0323e79f8297797599cd5ae3e5ae06ec81254128
Wonsik Kim [Mon, 1 Aug 2016 21:11:24 +0000 (21:11 +0000)]
Merge "DO NOT MERGE - stagefright: fix integer overflow error" into lmp-dev
am:
8f4b1a7de0 -s ours
Change-Id: I5ccb9ee7ddd79e6a3599c1e53ff0247c0af50bf4
Wonsik Kim [Mon, 1 Aug 2016 21:11:23 +0000 (21:11 +0000)]
DO NOT MERGE - stagefright: fix integer overflow error
am:
f4f36a0a31 -s ours
Change-Id: I5f7bb034371e3651a00a6023352b871eeeb9740a
Marco Nelissen [Mon, 1 Aug 2016 21:08:39 +0000 (21:08 +0000)]
Merge "DO NOT MERGE - stagefright: fix integer overflow error" into lmp-dev
Wonsik Kim [Mon, 1 Aug 2016 20:49:16 +0000 (20:49 +0000)]
DO NOT MERGE - stagefright: fix integer overflow error am:
17a10c50e2 am:
8df5df78a3 am:
e40e452a3a -s ours am:
87d4805d94 -s ours am:
3041de70c5 am:
0c51e9905d am:
f3da79cfea -s ours
am:
a47d63df6f
Change-Id: I970030586310f86a7a79fef657d033f6e5b6a602
Wonsik Kim [Mon, 1 Aug 2016 20:46:42 +0000 (20:46 +0000)]
DO NOT MERGE - stagefright: fix integer overflow error am:
17a10c50e2 am:
8df5df78a3 am:
e40e452a3a -s ours am:
87d4805d94 -s ours am:
3041de70c5 am:
0c51e9905d
am:
f3da79cfea -s ours
Change-Id: Id37c208ae6cfa2e8f43ba62c9b3d84101a322e46
Wonsik Kim [Mon, 1 Aug 2016 20:44:11 +0000 (20:44 +0000)]
DO NOT MERGE - stagefright: fix integer overflow error am:
17a10c50e2 am:
8df5df78a3 am:
e40e452a3a -s ours am:
87d4805d94 -s ours am:
3041de70c5
am:
0c51e9905d
Change-Id: I4f5b6970ec841a06e6f99cadeac3e81665cc2ba2
Wonsik Kim [Mon, 1 Aug 2016 20:38:12 +0000 (20:38 +0000)]
DO NOT MERGE - stagefright: fix integer overflow error am:
17a10c50e2 am:
8df5df78a3 am:
e40e452a3a -s ours am:
87d4805d94 -s ours
am:
3041de70c5
Change-Id: Ifab7545acb5b56f5c0c55f43ceb748f4794f2456
Wonsik Kim [Mon, 1 Aug 2016 20:35:41 +0000 (20:35 +0000)]
DO NOT MERGE - stagefright: fix integer overflow error am:
17a10c50e2 am:
8df5df78a3 am:
e40e452a3a -s ours
am:
87d4805d94 -s ours
Change-Id: I7316ed78d4308e8528a79ec2f2ea7708164401ad
Wonsik Kim [Mon, 1 Aug 2016 20:33:17 +0000 (20:33 +0000)]
DO NOT MERGE - stagefright: fix integer overflow error am:
17a10c50e2 am:
8df5df78a3
am:
e40e452a3a -s ours
Change-Id: Ib76f39590bc10ace428d2e142db1f752ac3567c6
Wonsik Kim [Mon, 1 Aug 2016 20:30:39 +0000 (20:30 +0000)]
DO NOT MERGE - stagefright: fix integer overflow error am:
17a10c50e2
am:
8df5df78a3
Change-Id: Iba844e14f530d15531c5b47e7aaaedfd7849813b
Wonsik Kim [Mon, 1 Aug 2016 20:28:10 +0000 (20:28 +0000)]
DO NOT MERGE - stagefright: fix integer overflow error
am:
17a10c50e2
Change-Id: I310e406b5370678b112f5ad0603e22456d6c3de7
Wonsik Kim [Mon, 1 Aug 2016 20:28:10 +0000 (20:28 +0000)]
DO NOT MERGE - stagefright: fix integer overflow error
am:
52780d3ce3
Change-Id: I1faf21de42ce1221174096e26cfc215e945655f0
Wonsik Kim [Thu, 21 Jul 2016 05:43:38 +0000 (14:43 +0900)]
DO NOT MERGE - stagefright: fix integer overflow error
Bug:
30103394
Change-Id: If449d3e30a0bf2ebea5317f41813bfed094f7408
(cherry picked from commit
2c74a3cd5d1d66b9a35424b9c4443dafa6db5bef)
Wonsik Kim [Thu, 21 Jul 2016 05:43:38 +0000 (14:43 +0900)]
DO NOT MERGE - stagefright: fix integer overflow error
Bug:
30103394
Change-Id: If449d3e30a0bf2ebea5317f41813bfed094f7408
(cherry picked from commit
2c74a3cd5d1d66b9a35424b9c4443dafa6db5bef)
Wonsik Kim [Thu, 21 Jul 2016 05:43:38 +0000 (14:43 +0900)]
DO NOT MERGE - stagefright: fix integer overflow error
Bug:
30103394
Change-Id: If449d3e30a0bf2ebea5317f41813bfed094f7408
(cherry picked from commit
2c74a3cd5d1d66b9a35424b9c4443dafa6db5bef)
Wonsik Kim [Tue, 19 Jul 2016 23:03:53 +0000 (23:03 +0000)]
omx: prevent input port enable/disable for software codecs am:
2b94fa8277 am:
c83b53c9e5 am:
f054728108 am:
062fd4a341 am:
45fb504379 am:
56fb1ed051 am:
e02be17174
am:
7f58e2ec8f
Change-Id: I7bd9e7729139c95eee4fa263174ca3943d28f9c9
Wonsik Kim [Tue, 19 Jul 2016 23:01:16 +0000 (23:01 +0000)]
omx: prevent input port enable/disable for software codecs am:
2b94fa8277 am:
c83b53c9e5 am:
f054728108 am:
062fd4a341 am:
45fb504379 am:
56fb1ed051
am:
e02be17174
Change-Id: I7f452f8033eb9aa1aea4401e803493c5951b0581
Wonsik Kim [Tue, 19 Jul 2016 22:58:48 +0000 (22:58 +0000)]
omx: prevent input port enable/disable for software codecs am:
2b94fa8277 am:
c83b53c9e5 am:
f054728108 am:
062fd4a341 am:
45fb504379
am:
56fb1ed051
Change-Id: I79dd256460081f658ed3209204cfd104de708637
Wonsik Kim [Tue, 19 Jul 2016 22:56:49 +0000 (22:56 +0000)]
omx: prevent input port enable/disable for software codecs am:
2b94fa8277 am:
c83b53c9e5 am:
f054728108 am:
062fd4a341
am:
45fb504379
Change-Id: I309cc67d0a97c88e18182b7435e5b271355e4772
Wonsik Kim [Tue, 19 Jul 2016 22:54:16 +0000 (22:54 +0000)]
omx: prevent input port enable/disable for software codecs am:
2b94fa8277 am:
c83b53c9e5 am:
f054728108
am:
062fd4a341
Change-Id: I979b1c6b415b83d11f1a0c24b7fe54fe79556676
Wonsik Kim [Tue, 19 Jul 2016 22:51:43 +0000 (22:51 +0000)]
omx: prevent input port enable/disable for software codecs am:
2b94fa8277 am:
c83b53c9e5
am:
f054728108
Change-Id: I230da4ea86abf01ff9057900f0eea1af151c9a00
Wonsik Kim [Tue, 19 Jul 2016 22:46:54 +0000 (22:46 +0000)]
omx: prevent input port enable/disable for software codecs am:
2b94fa8277
am:
c83b53c9e5
Change-Id: I6eeb301a2418cae6a57e49ed29527edd5e8de2b0
Wonsik Kim [Tue, 19 Jul 2016 22:44:18 +0000 (22:44 +0000)]
omx: prevent input port enable/disable for software codecs
am:
2b94fa8277
Change-Id: I5c370c34986be1435f2d0eebae8e264c0f4f0f44
Wonsik Kim [Thu, 7 Jul 2016 03:57:02 +0000 (12:57 +0900)]
omx: prevent input port enable/disable for software codecs
Bug:
29421804
Change-Id: Iba1011e9af942a6dff7f659af769a51e3f5ba66f
Robert Shih [Thu, 14 Jul 2016 23:17:08 +0000 (23:17 +0000)]
DO NOT MERGE - Fix build am:
bf835e4525 am:
98b31b9270 am:
1038762b09 -s ours am:
5d925fce78 -s ours am:
0576ffb637 am:
cd349da1c2 am:
21a32935cb -s ours
am:
46c84ff42d
Change-Id: Iad3c9b0538c8b1d0f5e7ce1bd04b066520ccbfcb
Robert Shih [Thu, 14 Jul 2016 23:14:32 +0000 (23:14 +0000)]
DO NOT MERGE - Fix build am:
bf835e4525 am:
98b31b9270 am:
1038762b09 -s ours am:
5d925fce78 -s ours am:
0576ffb637 am:
cd349da1c2
am:
21a32935cb -s ours
Change-Id: I94403eab4f73289a80cd126c2f66faef3657bdd1
Robert Shih [Thu, 14 Jul 2016 23:11:32 +0000 (23:11 +0000)]
DO NOT MERGE - Fix build am:
bf835e4525 am:
98b31b9270 am:
1038762b09 -s ours am:
5d925fce78 -s ours am:
0576ffb637
am:
cd349da1c2
Change-Id: I0bbf7d30e9f37cf6cb3f2a73d790b079c0bf837b
Robert Shih [Thu, 14 Jul 2016 23:09:06 +0000 (23:09 +0000)]
DO NOT MERGE - Fix build am:
bf835e4525 am:
98b31b9270 am:
1038762b09 -s ours am:
5d925fce78 -s ours
am:
0576ffb637
Change-Id: Ieab310032dbf29bab829c7b01225d84fd3df354c
Robert Shih [Thu, 14 Jul 2016 23:06:31 +0000 (23:06 +0000)]
DO NOT MERGE - Fix build am:
bf835e4525 am:
98b31b9270 am:
1038762b09 -s ours
am:
5d925fce78 -s ours
Change-Id: Ie8c4b4df445063c09bfaf9a1e987798c6d1df978
Robert Shih [Thu, 14 Jul 2016 23:04:02 +0000 (23:04 +0000)]
DO NOT MERGE - Fix build am:
bf835e4525 am:
98b31b9270
am:
1038762b09 -s ours
Change-Id: I43d1bdb6bd3f432b44513687d1736fc344c68f9a
Robert Shih [Thu, 14 Jul 2016 23:01:31 +0000 (23:01 +0000)]
DO NOT MERGE - Fix build am:
bf835e4525
am:
98b31b9270
Change-Id: Ib3dd2d315096bcb31dbfcd5be66f00d482594c9b
Robert Shih [Thu, 14 Jul 2016 22:58:30 +0000 (22:58 +0000)]
DO NOT MERGE - Fix build
am:
bf835e4525
Change-Id: Idd0b7779345c8b4c595681de7431c3339b44129e
Robert Shih [Thu, 14 Jul 2016 22:32:08 +0000 (15:32 -0700)]
DO NOT MERGE - Fix build
Change-Id: Iff47bb735778fb275abeee573c636856b839feb5
Robert Shih [Thu, 14 Jul 2016 20:58:22 +0000 (20:58 +0000)]
Fix build
am:
6f85d83163
Change-Id: I0cb54cb073f83f43fb77b979f7b84911125d0969
Robert Shih [Thu, 14 Jul 2016 20:50:32 +0000 (13:50 -0700)]
Fix build
Change-Id: I48ba34b3df9c9a896d4b18c3f48e41744b7dab54
Robert Shih [Thu, 14 Jul 2016 19:49:49 +0000 (19:49 +0000)]
Fix build
am:
c5b95cd33a
Change-Id: I84de0264bae191b5c3ddbb784bf9b9b120754c55
Robert Shih [Thu, 14 Jul 2016 19:37:52 +0000 (12:37 -0700)]
Fix build
Change-Id: I96a9c437eec53a285ac96794cc1ad0c8954b27e0
Robert Shih [Thu, 14 Jul 2016 18:24:18 +0000 (18:24 +0000)]
Merge \\\\\"DO NOT MERGE - SoftMP3: memset safely\\\\\" into lmp-dev am:
d5573715d8 -s ours am:
f2fffc9fd0 am:
047fb889cc am:
9f7ef49df4 -s ours
am:
426708f0d8
Change-Id: I671be79b038e690d5f9b17f7299371010c93f5e5
Robert Shih [Thu, 14 Jul 2016 18:24:18 +0000 (18:24 +0000)]
Merge \"SoftMP3: memset safely\" into mnc-dev
am:
b2b56d1f0a
Change-Id: Ied8936092f890fcd213548690cdc591de2af15f5
Sergio Giro [Thu, 14 Jul 2016 18:24:14 +0000 (18:24 +0000)]
Merge \\\\\"DO NOT MERGE Add bound checks to utf16_to_utf8\\\\\" into lmp-dev am:
5f34f40530 -s ours am:
20ae503b50 am:
012d1246ce am:
e6373adbec -s ours
am:
9f51ebbc8b
Change-Id: I8df7f60c858e0a0ab7682e1fc36abe29ddae5f65
Sergio Giro [Thu, 14 Jul 2016 18:24:10 +0000 (18:24 +0000)]
DO NOT MERGE Add bound checks to utf16_to_utf8 am:
0d9d569c26 am:
edce8ad060 am:
4f24f218dc -s ours
am:
2c6f342c35
Change-Id: Ifb0d6a18007c78823de0930d52c5b2db1317ff24
Robert Shih [Thu, 14 Jul 2016 18:19:58 +0000 (18:19 +0000)]
Merge \\\\"DO NOT MERGE - SoftMP3: memset safely\\\\" into lmp-dev am:
d5573715d8 -s ours am:
f2fffc9fd0 am:
047fb889cc
am:
9f7ef49df4 -s ours
Change-Id: If5670ac1cde5b28e1993344176682e6479932aa5
Robert Shih [Thu, 14 Jul 2016 18:15:20 +0000 (18:15 +0000)]
Merge \\\"DO NOT MERGE - SoftMP3: memset safely\\\" into lmp-dev am:
d5573715d8 -s ours am:
f2fffc9fd0
am:
047fb889cc
Change-Id: I09b46561d6490b0693e0f37e3b770a50de2b82f2
Robert Shih [Thu, 14 Jul 2016 18:11:42 +0000 (18:11 +0000)]
Merge \\"DO NOT MERGE - SoftMP3: memset safely\\" into lmp-dev am:
d5573715d8 -s ours
am:
f2fffc9fd0
Change-Id: I5a1d3e49a82b031a74d48396ee719410d8e6a09a
Robert Shih [Thu, 14 Jul 2016 18:09:23 +0000 (18:09 +0000)]
Merge \"DO NOT MERGE - SoftMP3: memset safely\" into lmp-dev
am:
d5573715d8 -s ours
Change-Id: I8f7f2b98145c76b2904a0ef57651214e6881aac5
Sergio Giro [Thu, 14 Jul 2016 18:06:57 +0000 (18:06 +0000)]
Add bound checks to utf16_to_utf8
am:
0c9742db80
Change-Id: Iacb2248ca498ae3b0ec699c44218963b97405b3b
Robert Shih [Thu, 14 Jul 2016 18:06:25 +0000 (18:06 +0000)]
Merge "SoftMP3: memset safely" into mnc-dev
Robert Shih [Thu, 14 Jul 2016 18:06:19 +0000 (18:06 +0000)]
Merge "DO NOT MERGE - SoftMP3: memset safely" into lmp-dev
Sergio Giro [Thu, 14 Jul 2016 18:03:15 +0000 (18:03 +0000)]
Merge \\\\"DO NOT MERGE Add bound checks to utf16_to_utf8\\\\" into lmp-dev am:
5f34f40530 -s ours am:
20ae503b50 am:
012d1246ce
am:
e6373adbec -s ours
Change-Id: I451066bdcc955ad76e81f1650f1583b5b560a094
Sergio Giro [Thu, 14 Jul 2016 18:03:12 +0000 (18:03 +0000)]
DO NOT MERGE Add bound checks to utf16_to_utf8 am:
0d9d569c26 am:
edce8ad060
am:
4f24f218dc -s ours
Change-Id: I087fe456765f1129a8697604be2f6e47243446f9
Sergio Giro [Thu, 14 Jul 2016 18:00:54 +0000 (18:00 +0000)]
Merge \\\"DO NOT MERGE Add bound checks to utf16_to_utf8\\\" into lmp-dev am:
5f34f40530 -s ours am:
20ae503b50
am:
012d1246ce
Change-Id: I07f7f569d97ccf58cd48f11e700c64d2eaeededc
Sergio Giro [Thu, 14 Jul 2016 17:59:53 +0000 (17:59 +0000)]
DO NOT MERGE Add bound checks to utf16_to_utf8 am:
0d9d569c26
am:
edce8ad060
Change-Id: I1c725b97d3f1fcabaa7129200ca67c3d479fd771
Sergio Giro [Thu, 14 Jul 2016 17:59:45 +0000 (17:59 +0000)]
Merge \\"DO NOT MERGE Add bound checks to utf16_to_utf8\\" into lmp-dev am:
5f34f40530 -s ours
am:
20ae503b50
Change-Id: Ib55ae047145673b53042b2e705f4407a0627b5bc
Sergio Giro [Thu, 14 Jul 2016 17:52:03 +0000 (17:52 +0000)]
Merge \"DO NOT MERGE Add bound checks to utf16_to_utf8\" into lmp-dev
am:
5f34f40530 -s ours
Change-Id: I2426d28827f0ee2e2077f31d411af78a58e72b32