Narayan Kamath
97ea07ded3
Revert "Fix full-eng build breakage due to dbacd826a100f2c." am: d5715c5d2d am: c6b5b67139 am: f9b3f6b9e6 am: 1833088893 am: 6a7e3ac83b
...
am: 983101645f
Change-Id: I3fe6fda6680eb639b704d1dfcc9c45a7d33b1f0e
2017-10-04 17:55:01 +00:00
Narayan Kamath
983101645f
Revert "Fix full-eng build breakage due to dbacd826a100f2c." am: d5715c5d2d am: c6b5b67139 am: f9b3f6b9e6 am: 1833088893
...
am: 6a7e3ac83b
Change-Id: I31611cc17627579b99f301fd10d6ff680bfeef4b
2017-10-04 17:45:25 +00:00
Narayan Kamath
6a7e3ac83b
Revert "Fix full-eng build breakage due to dbacd826a100f2c." am: d5715c5d2d am: c6b5b67139 am: f9b3f6b9e6
...
am: 1833088893
Change-Id: Iaa70f715aaa3dd8ff6e0f2a65afe5a11505debf2
2017-10-04 17:41:56 +00:00
Narayan Kamath
1833088893
Revert "Fix full-eng build breakage due to dbacd826a100f2c." am: d5715c5d2d am: c6b5b67139
...
am: f9b3f6b9e6
Change-Id: I9455ccf59e1f173ae7b5a66e594b53dc1999c807
2017-10-04 17:40:40 +00:00
Narayan Kamath
f9b3f6b9e6
Revert "Fix full-eng build breakage due to dbacd826a100f2c." am: d5715c5d2d
...
am: c6b5b67139
Change-Id: I8f540b0896c8c79c923060a3e0d8499137561979
2017-10-04 17:37:40 +00:00
Narayan Kamath
c6b5b67139
Revert "Fix full-eng build breakage due to dbacd826a100f2c."
...
am: d5715c5d2d
Change-Id: Ib6157ce6e2329add7875a9a40f94e3825fdab6ce
2017-10-04 17:34:43 +00:00
Narayan Kamath
d5715c5d2d
Revert "Fix full-eng build breakage due to dbacd826a100f2c."
...
This reverts commit 6e39c88b1e .
This change should not have automerged to nyc-dev. Still investigating
why that's the case.
Test: make
2017-10-04 18:23:09 +01:00
Narayan Kamath
2d319cda43
Fix full-eng build breakage due to dbacd826a1. am: 6e39c88b1e am: cb3d79385d am: 9fd1c2fe65 am: 6f5467da9a am: a76b9888aa am: 9c44d4865e am: cab99bb027 am: da66154ba3 am: 752ab47b98
...
am: fe9a7192e1
Change-Id: Ic09929e88fb415a3c1a9279c060bbc1ec2b24380
2017-10-04 17:14:56 +00:00
Narayan Kamath
fe9a7192e1
Fix full-eng build breakage due to dbacd826a1. am: 6e39c88b1e am: cb3d79385d am: 9fd1c2fe65 am: 6f5467da9a am: a76b9888aa am: 9c44d4865e am: cab99bb027 am: da66154ba3
...
am: 752ab47b98
Change-Id: I928024fd982722adb0b8e91172db5ec28c6cf0b0
2017-10-04 17:09:03 +00:00
Narayan Kamath
752ab47b98
Fix full-eng build breakage due to dbacd826a1. am: 6e39c88b1e am: cb3d79385d am: 9fd1c2fe65 am: 6f5467da9a am: a76b9888aa am: 9c44d4865e am: cab99bb027
...
am: da66154ba3
Change-Id: I9cf9163b6676b1a61179c986893db28fe8992230
2017-10-04 17:00:30 +00:00
Narayan Kamath
da66154ba3
Fix full-eng build breakage due to dbacd826a1. am: 6e39c88b1e am: cb3d79385d am: 9fd1c2fe65 am: 6f5467da9a am: a76b9888aa am: 9c44d4865e
...
am: cab99bb027
Change-Id: I56c801694e58b90a572563936e9b593fa11eda7e
2017-10-04 16:56:42 +00:00
Narayan Kamath
cab99bb027
Fix full-eng build breakage due to dbacd826a1. am: 6e39c88b1e am: cb3d79385d am: 9fd1c2fe65 am: 6f5467da9a am: a76b9888aa
...
am: 9c44d4865e
Change-Id: Ia1270b19491530ce227252ebe3354d409fb1fb8c
2017-10-04 16:48:07 +00:00
Narayan Kamath
9c44d4865e
Fix full-eng build breakage due to dbacd826a1. am: 6e39c88b1e am: cb3d79385d am: 9fd1c2fe65 am: 6f5467da9a
...
am: a76b9888aa
Change-Id: I09d25914710df08e60254096f5a8806adb06afd1
2017-10-04 16:42:13 +00:00
Narayan Kamath
a76b9888aa
Fix full-eng build breakage due to dbacd826a1. am: 6e39c88b1e am: cb3d79385d am: 9fd1c2fe65
...
am: 6f5467da9a
Change-Id: I9a9449b4653be6b9bedc1ede59ef553e3c9b35e7
2017-10-04 16:33:57 +00:00
Narayan Kamath
6f5467da9a
Fix full-eng build breakage due to dbacd826a1. am: 6e39c88b1e am: cb3d79385d
...
am: 9fd1c2fe65
Change-Id: I2eb887dad807e8f0f77620f3545bda3747a5013c
2017-10-04 16:31:33 +00:00
Narayan Kamath
9fd1c2fe65
Fix full-eng build breakage due to dbacd826a1. am: 6e39c88b1e
...
am: cb3d79385d
Change-Id: Id0425c97a4d88c9fdce284805b79442e2547e4fd
2017-10-04 16:26:16 +00:00
Narayan Kamath
cb3d79385d
Fix full-eng build breakage due to dbacd826a1.
...
am: 6e39c88b1e
Change-Id: I494d0bd10336ca9c8e771a6a341f6e06578bb59a
2017-10-04 16:16:21 +00:00
Narayan Kamath
53f49bc4ec
zip_archive: reject files that don't start with an LFH signature. am: dbacd826a1 am: 368ec42fa8 am: 6dbd1db1cf am: 58c10b2ab9 -s ours am: 2dbba44e2d am: 583a11b339 am: 15d221c0ba am: 377f534697 am: 1cd5954ced
...
am: 4168856cf2
Change-Id: I401b78b71fa35bcb20ab23a52d1f37798848d9f1
2017-10-04 15:46:16 +00:00
Narayan Kamath
4168856cf2
zip_archive: reject files that don't start with an LFH signature. am: dbacd826a1 am: 368ec42fa8 am: 6dbd1db1cf am: 58c10b2ab9 -s ours am: 2dbba44e2d am: 583a11b339 am: 15d221c0ba am: 377f534697
...
am: 1cd5954ced
Change-Id: I5f727e6e2db14004af625f7a81af3416cfcaefe1
2017-10-04 15:39:45 +00:00
Narayan Kamath
1cd5954ced
zip_archive: reject files that don't start with an LFH signature. am: dbacd826a1 am: 368ec42fa8 am: 6dbd1db1cf am: 58c10b2ab9 -s ours am: 2dbba44e2d am: 583a11b339 am: 15d221c0ba
...
am: 377f534697
Change-Id: I2abd52cf566ae45486831c42a7c72d2e2b000a4c
2017-10-04 15:36:04 +00:00
Narayan Kamath
377f534697
zip_archive: reject files that don't start with an LFH signature. am: dbacd826a1 am: 368ec42fa8 am: 6dbd1db1cf am: 58c10b2ab9 -s ours am: 2dbba44e2d am: 583a11b339
...
am: 15d221c0ba
Change-Id: I0aa0d98639111f48dc0fb2007928e1a6b8b0d174
2017-10-04 15:26:13 +00:00
Narayan Kamath
15d221c0ba
zip_archive: reject files that don't start with an LFH signature. am: dbacd826a1 am: 368ec42fa8 am: 6dbd1db1cf am: 58c10b2ab9 -s ours am: 2dbba44e2d
...
am: 583a11b339
Change-Id: I215d12f87d5d644f6ded52a59173d4d7f5940d07
2017-10-04 15:21:14 +00:00
Narayan Kamath
583a11b339
zip_archive: reject files that don't start with an LFH signature. am: dbacd826a1 am: 368ec42fa8 am: 6dbd1db1cf am: 58c10b2ab9 -s ours
...
am: 2dbba44e2d
Change-Id: I05eda8a0b1f41b979e5673b822865315244fc4ac
2017-10-04 15:18:57 +00:00
Narayan Kamath
6e39c88b1e
Fix full-eng build breakage due to dbacd826a1.
...
This wasn't caught by treehugger since it doesn't build this target.
Test: make
Test: zip_archive_test
Bug: 64211847
Change-Id: Iee6e133e236ed639f944e4b8c3c8102cf22e46bb
Merged-In: I275e7c4da05ceeb20401b560c72294f29ef63642
2017-10-04 16:18:03 +01:00
Narayan Kamath
2dbba44e2d
zip_archive: reject files that don't start with an LFH signature. am: dbacd826a1 am: 368ec42fa8 am: 6dbd1db1cf
...
am: 58c10b2ab9 -s ours
Change-Id: If2661808611e72def97f08cec94352adcdef21b2
2017-10-04 15:16:23 +00:00
Narayan Kamath
58c10b2ab9
zip_archive: reject files that don't start with an LFH signature. am: dbacd826a1 am: 368ec42fa8
...
am: 6dbd1db1cf
Change-Id: I1cedab2b7136dce49722d88266a36a8e37d97b0a
2017-10-04 14:53:40 +00:00
Narayan Kamath
6dbd1db1cf
zip_archive: reject files that don't start with an LFH signature. am: dbacd826a1
...
am: 368ec42fa8
Change-Id: Ie828c72438e70817d134e8b09512c3d10d60e407
2017-10-04 14:51:01 +00:00
Narayan Kamath
368ec42fa8
zip_archive: reject files that don't start with an LFH signature.
...
am: dbacd826a1
Change-Id: I85664bba898d6be9fff53bc3514c44df4be6cfc7
2017-10-04 14:45:00 +00:00
Narayan Kamath
f49275fa53
zip_archive: reject files that don't start with an LFH signature. am: 2740bb09e3 am: 61f846b71c am: 45931c5e03 am: b1b91cff95 am: a2dc43197d -s ours
...
am: edccf1c133 -s ours
Change-Id: I4320e562175130e24b32b98cffb73cfd763cc90c
2017-10-04 12:16:42 +00:00
Narayan Kamath
edccf1c133
zip_archive: reject files that don't start with an LFH signature. am: 2740bb09e3 am: 61f846b71c am: 45931c5e03 am: b1b91cff95
...
am: a2dc43197d -s ours
Change-Id: Ie5bb95e27b2aad0e61e15f30899202303afaae81
2017-10-04 12:12:03 +00:00
Narayan Kamath
a2dc43197d
zip_archive: reject files that don't start with an LFH signature. am: 2740bb09e3 am: 61f846b71c am: 45931c5e03
...
am: b1b91cff95
Change-Id: Icdf4da6ae83f0ed8932c173559267f8e354d11c3
2017-10-04 12:06:15 +00:00
Narayan Kamath
b1b91cff95
zip_archive: reject files that don't start with an LFH signature. am: 2740bb09e3 am: 61f846b71c
...
am: 45931c5e03
Change-Id: Ibc1d1a44c0a656e45d079e37470bb0021e7ba9ab
2017-10-04 12:03:27 +00:00
Narayan Kamath
45931c5e03
zip_archive: reject files that don't start with an LFH signature. am: 2740bb09e3
...
am: 61f846b71c
Change-Id: I02f427582b1e62e3fad2747eb6ac79aa8622ff20
2017-10-04 12:01:11 +00:00
Narayan Kamath
61f846b71c
zip_archive: reject files that don't start with an LFH signature.
...
am: 2740bb09e3
Change-Id: I7a61a1e7f21edfccc14a3333913f4e1db79ac23c
2017-10-04 11:58:48 +00:00
Narayan Kamath
3765bf9bd4
zip_archive: reject files that don't start with an LFH signature.
...
am: 9dced16262
Change-Id: Iaca1185e09d1eb610d6b95bf40ec62e50676b40a
2017-10-04 10:51:05 +00:00
Narayan Kamath
2740bb09e3
zip_archive: reject files that don't start with an LFH signature.
...
Bug: 64211847
Test: zip_archive_test
Merged-In: Ib89f0def696206ff427be27764c158fab88e4b5d
Merged-In: I275e7c4da05ceeb20401b560c72294f29ef63642
Change-Id: I38705f4e9688326a140aa59a1333b0878ed39c14
2017-10-02 18:03:08 +01:00
Narayan Kamath
dbacd826a1
zip_archive: reject files that don't start with an LFH signature.
...
Bug: 64211847
Test: zip_archive_test
Merged-In: I275e7c4da05ceeb20401b560c72294f29ef63642
Change-Id: I38705f4e9688326a140aa59a1333b0878ed39c14
2017-09-25 11:57:55 +01:00
Narayan Kamath
9dced16262
zip_archive: reject files that don't start with an LFH signature.
...
Bug: 64211847
Test: zip_archive_test
(cherry picked from commit c1a56dcab7 )
Merged-In: I275e7c4da05ceeb20401b560c72294f29ef63642
Change-Id: Ib89f0def696206ff427be27764c158fab88e4b5d
2017-09-20 15:14:11 +00:00
Adam Vartanian
94222586dc
Fix integer overflow in utf{16,32}_to_utf8_length am: f0a43dede9 am: 33abf90994 am: 789673b15c am: 1436927851 am: d70e582d67 am: 62d5a78df3 am: 5b37a8ce87 am: 16e2001f0b am: e2b5839d4c -s ours
...
am: 84bdda1e6e -s ours
Change-Id: I89c0f62474f46aeedb3635ad92454c979335c829
2017-09-11 11:23:24 +00:00
Adam Vartanian
84bdda1e6e
Fix integer overflow in utf{16,32}_to_utf8_length am: f0a43dede9 am: 33abf90994 am: 789673b15c am: 1436927851 am: d70e582d67 am: 62d5a78df3 am: 5b37a8ce87 am: 16e2001f0b
...
am: e2b5839d4c -s ours
Change-Id: I2b8d19a8582f8de19332705fc4dcdc3a23fa8da2
2017-09-11 11:18:54 +00:00
Adam Vartanian
e2b5839d4c
Fix integer overflow in utf{16,32}_to_utf8_length am: f0a43dede9 am: 33abf90994 am: 789673b15c am: 1436927851 am: d70e582d67 am: 62d5a78df3 am: 5b37a8ce87
...
am: 16e2001f0b
Change-Id: I217092b993f50a6380cf76049ebb94a99505b4a0
2017-09-11 11:14:55 +00:00
Adam Vartanian
16e2001f0b
Fix integer overflow in utf{16,32}_to_utf8_length am: f0a43dede9 am: 33abf90994 am: 789673b15c am: 1436927851 am: d70e582d67 am: 62d5a78df3
...
am: 5b37a8ce87
Change-Id: I9957d042e4b309f8071fe08c03177401051ec926
2017-09-11 11:10:53 +00:00
Adam Vartanian
5b37a8ce87
Fix integer overflow in utf{16,32}_to_utf8_length am: f0a43dede9 am: 33abf90994 am: 789673b15c am: 1436927851 am: d70e582d67
...
am: 62d5a78df3
Change-Id: If605b2b03790475250c3a5c9627b9f6177c01226
2017-09-11 11:06:21 +00:00
Adam Vartanian
62d5a78df3
Fix integer overflow in utf{16,32}_to_utf8_length am: f0a43dede9 am: 33abf90994 am: 789673b15c am: 1436927851
...
am: d70e582d67
Change-Id: Ia12301ba4850284d81de3a4ed2fe3f519a6859fc
2017-09-11 11:02:51 +00:00
Adam Vartanian
d70e582d67
Fix integer overflow in utf{16,32}_to_utf8_length am: f0a43dede9 am: 33abf90994 am: 789673b15c
...
am: 1436927851
Change-Id: Ia81a894419957960682a221159449f3e92d06b03
2017-09-11 10:58:21 +00:00
Adam Vartanian
1436927851
Fix integer overflow in utf{16,32}_to_utf8_length am: f0a43dede9 am: 33abf90994
...
am: 789673b15c
Change-Id: I352f33cf5a9a402a17f7a0f2c8739b54256392c2
2017-09-11 10:54:22 +00:00
Adam Vartanian
789673b15c
Fix integer overflow in utf{16,32}_to_utf8_length am: f0a43dede9
...
am: 33abf90994
Change-Id: I5509908232bd838a229c1c2f3a35e0960a741288
2017-09-11 10:50:21 +00:00
Adam Vartanian
33abf90994
Fix integer overflow in utf{16,32}_to_utf8_length
...
am: f0a43dede9
Change-Id: Ie8e67d97272102eee952c21d82cf06c6a50f1ea9
2017-09-11 10:46:20 +00:00
Adam Vartanian
f0a43dede9
Fix integer overflow in utf{16,32}_to_utf8_length
...
Without an explicit check, the return value can wrap around and return
a value that is far too small to hold the data from the resulting
conversion.
No CTS test is provided because it would need to allocate at least
SSIZE_MAX / 2 bytes of UTF-16 data, which is unreasonable on 64-bit
devices.
Bug: 37723026
Test: run cts -p android.security
Change-Id: Ie2606b92b9eab1acfe8ce4663b43b81156a4cad7
Merged-In: I56ba5e31657633b7f33685dd8839d4b3b998e586
2017-09-11 10:46:06 +01:00
Adam Vartanian
6e2bf89dc7
Fix integer overflow in utf{16,32}_to_utf8_length
...
am: 47efc676c8
Change-Id: Id54a1e644fc02a2923c6bf165205d16e43cf5eb2
2017-09-11 09:26:42 +00:00