Josh Gao
1f8c6c8c8e
adb: switch the socket list mutex to a recursive_mutex. am: 6f641adea5
...
am: a6b92d1f2e
Change-Id: I064738710ab360cbfeb0b669d7e531f955f8b9cb
2016-07-18 19:50:46 +00:00
Josh Gao
a6b92d1f2e
adb: switch the socket list mutex to a recursive_mutex.
...
am: 6f641adea5
Change-Id: I839bc3817e7d7bb24b2bf3c5059919802c9f5d33
2016-07-18 19:47:45 +00:00
Josh Gao
6f641adea5
adb: switch the socket list mutex to a recursive_mutex.
...
sockets.cpp was branching on whether a socket close function was
local_socket_close in order to avoid a potential deadlock if the socket
list lock was held while closing a peer socket.
Bug: http://b/28347842
Change-Id: I5e56f17fa54275284787f0f1dc150d1960256ab3
(functionally a cherrypick of 903b749f
+ 9b587dec
, with windows disabled)
2016-07-15 17:17:14 -07:00
Sergio Giro
1062106a3b
Merge \\\\\\"DO NOT MERGE libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8\\\\\\" into lmp-dev am: 8d2d6cedbb
-s ours am: 71da8e7537
am: 5e03ed1dab
am: b00e3603ef
-s ours am: 72bad95df5
...
am: ae21a25383
Change-Id: I3c2f28c59c588a2cce0a00e33914181ac0d876ef
2016-07-14 18:27:01 +00:00
Sergio Giro
dc5a96f5b3
DO NOT MERGE libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8 am: 2806397d1e
am: 8c9d02551c
am: 28f28ce635
-s ours am: f611765aaf
...
am: 207717bde6
Change-Id: I88e2cafcf84bff82c29725dd484103dabf248a8b
2016-07-14 18:26:58 +00:00
Sergio Giro
ae21a25383
Merge \\\\\"DO NOT MERGE libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8\\\\\" into lmp-dev am: 8d2d6cedbb
-s ours am: 71da8e7537
am: 5e03ed1dab
am: b00e3603ef
-s ours
...
am: 72bad95df5
Change-Id: I157121792e7de52ae705afc105ebf31299612b59
2016-07-14 18:24:17 +00:00
Sergio Giro
207717bde6
DO NOT MERGE libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8 am: 2806397d1e
am: 8c9d02551c
am: 28f28ce635
-s ours
...
am: f611765aaf
Change-Id: I236fac995374280f948759f44e673aff98b53447
2016-07-14 18:24:13 +00:00
Sergio Giro
7c516d7080
libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8 am: 3411dd4457
...
am: 01dbd1da64
Change-Id: Id0ecb8e252b43cc5c77644310e4f8a2968876a37
2016-07-14 18:15:36 +00:00
Sergio Giro
01dbd1da64
libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8
...
am: 3411dd4457
Change-Id: I34322210bd7ab90c1986d55f9b444292e76c646a
2016-07-14 18:07:28 +00:00
Sergio Giro
72bad95df5
Merge \\\\"DO NOT MERGE libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8\\\\" into lmp-dev am: 8d2d6cedbb
-s ours am: 71da8e7537
am: 5e03ed1dab
...
am: b00e3603ef
-s ours
Change-Id: Id73880ce44c4a1cb14c04b6e533e888ac28e1ae0
2016-07-14 18:03:17 +00:00
Sergio Giro
f611765aaf
DO NOT MERGE libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8 am: 2806397d1e
am: 8c9d02551c
...
am: 28f28ce635
-s ours
Change-Id: I2ef3ab0e4e3c64c9b5c17454ab738f3d5bdb5dd3
2016-07-14 18:03:14 +00:00
Sergio Giro
b00e3603ef
Merge \\\"DO NOT MERGE libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8\\\" into lmp-dev am: 8d2d6cedbb
-s ours am: 71da8e7537
...
am: 5e03ed1dab
Change-Id: I69b9c166dcd1f76cfe6555cae0580366f79258cc
2016-07-14 18:00:50 +00:00
Sergio Giro
28f28ce635
DO NOT MERGE libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8 am: 2806397d1e
...
am: 8c9d02551c
Change-Id: Ia8754c27d2d2a639280235c2dbf9043f3442421e
2016-07-14 17:59:56 +00:00
Sergio Giro
5e03ed1dab
Merge \\"DO NOT MERGE libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8\\" into lmp-dev am: 8d2d6cedbb
-s ours
...
am: 71da8e7537
Change-Id: I1c9b5abdf550bb2e6f294c7f0920ff72e6bcfc0e
2016-07-14 17:59:48 +00:00
Sergio Giro
8c9d02551c
DO NOT MERGE libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8
...
am: 2806397d1e
Change-Id: I28785c3aa9d2b11b045c53fea557c0d74bd65181
2016-07-14 17:52:06 +00:00
Sergio Giro
71da8e7537
Merge \"DO NOT MERGE libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8\" into lmp-dev
...
am: 8d2d6cedbb
-s ours
Change-Id: Id0e0d5176560cf883da2e5507ba9106ecc624536
2016-07-14 17:52:05 +00:00
Sergio Giro
8d2d6cedbb
Merge "DO NOT MERGE libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8" into lmp-dev
2016-07-14 17:36:23 +00:00
Sergio Giro
2806397d1e
DO NOT MERGE libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8
...
Inconsistent behaviour between utf16_to_utf8 and utf16_to_utf8_length
is causing a heap overflow.
Correcting the length computation and adding bound checks to the
conversion functions.
(cherry picked from commit c4966a363e
)
Change-Id: Idfb0eb29b305678608586d25c2f372146569ad39
Bug: 29250543
2016-07-14 17:25:27 +00:00
Sergio Giro
3411dd4457
libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8
...
Inconsistent behaviour between utf16_to_utf8 and utf16_to_utf8_length
is causing a heap overflow.
Correcting the length computation and adding bound checks to the
conversion functions.
Test: ran libutils_tests
Bug: 29250543
Change-Id: I6115e3357141ed245c63c6eb25fc0fd0a9a7a2bb
(cherry picked from commit c4966a363e
)
2016-07-14 16:49:50 +01:00
Sergio Giro
b022447a3a
DO NOT MERGE libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8
...
Inconsistent behaviour between utf16_to_utf8 and utf16_to_utf8_length
is causing a heap overflow.
Correcting the length computation and adding bound checks to the
conversion functions.
(cherry picked from commit c4966a363e
)
Change-Id: Idfb0eb29b305678608586d25c2f372146569ad39
Bug: 29250543
2016-07-14 14:47:59 +00:00
Sergio Giro
7a0c6bf505
DO NOT MERGE libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8 am: 5fce0542b6
am: d0ad14ca21
am: 3841c92912
-s ours am: 247ac63c69
-s ours am: 6179f1a56e
am: 451f4b3d04
am: 3c85e4e5e7
-s ours am: baac6666fe
...
am: 2858362ffe
Change-Id: Ie933e2f7903dfc653c3dc0a6499e52cc73d2eefd
2016-07-14 13:46:28 +00:00
Sergio Giro
2858362ffe
DO NOT MERGE libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8 am: 5fce0542b6
am: d0ad14ca21
am: 3841c92912
-s ours am: 247ac63c69
-s ours am: 6179f1a56e
am: 451f4b3d04
am: 3c85e4e5e7
-s ours
...
am: baac6666fe
Change-Id: I78b737a0a19a9ae692fd94f1b3ca8d0870291c96
2016-07-14 13:40:49 +00:00
Sergio Giro
baac6666fe
DO NOT MERGE libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8 am: 5fce0542b6
am: d0ad14ca21
am: 3841c92912
-s ours am: 247ac63c69
-s ours am: 6179f1a56e
am: 451f4b3d04
...
am: 3c85e4e5e7
-s ours
Change-Id: I2a4bdacfce15e656f487ad24508df3d4066ca8b7
2016-07-14 13:34:44 +00:00
Sergio Giro
3c85e4e5e7
DO NOT MERGE libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8 am: 5fce0542b6
am: d0ad14ca21
am: 3841c92912
-s ours am: 247ac63c69
-s ours am: 6179f1a56e
...
am: 451f4b3d04
Change-Id: I1781e52845996557f9f6a7e8b359e1d698e38e45
2016-07-14 13:28:27 +00:00
Sergio Giro
451f4b3d04
DO NOT MERGE libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8 am: 5fce0542b6
am: d0ad14ca21
am: 3841c92912
-s ours am: 247ac63c69
-s ours
...
am: 6179f1a56e
Change-Id: I1622017cea3f29fc17e8f75f0cfa77c786a08937
2016-07-14 13:16:45 +00:00
Sergio Giro
6179f1a56e
DO NOT MERGE libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8 am: 5fce0542b6
am: d0ad14ca21
am: 3841c92912
-s ours
...
am: 247ac63c69
-s ours
Change-Id: Ia8ee4d393bc8cf9cde7ada6af9f79eeee3100f80
2016-07-14 13:08:26 +00:00
Sergio Giro
247ac63c69
DO NOT MERGE libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8 am: 5fce0542b6
am: d0ad14ca21
...
am: 3841c92912
-s ours
Change-Id: Ia555a7e1a9eaf3f00dfa91ceb8afe85c48e4b7d5
2016-07-14 13:01:44 +00:00
Sergio Giro
3841c92912
DO NOT MERGE libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8 am: 5fce0542b6
...
am: d0ad14ca21
Change-Id: Id0901a86ea469d664badfee75db32948c88e72f7
2016-07-14 12:55:58 +00:00
Sergio Giro
d0ad14ca21
DO NOT MERGE libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8
...
am: 5fce0542b6
Change-Id: I348b457decce08d6d08819a16d618b0bc194aa91
2016-07-14 12:49:59 +00:00
Sergio Giro
5fce0542b6
DO NOT MERGE libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8
...
Inconsistent behaviour between utf16_to_utf8 and utf16_to_utf8_length
is causing a heap overflow.
Correcting the length computation and adding bound checks to the
conversion functions.
(cherry picked from commit c4966a363e
)
Bug: 29250543
Change-Id: Ia2d6a550f5594280505fb0835c752e53898700ed
2016-07-14 12:34:30 +00:00
Sergio Giro
9b169f8baf
Revert \\\\\\\\\"libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8\\\\\\\\\" am: 311002936e
am: ddd0051968
am: b218b2d34d
am: 605de74373
am: 37826f5613
am: 80473d5d33
am: c06d338ad7
am: e059f5e325
...
am: 85d694cd0d
Change-Id: I83a0ee22957bd7f003196e138905264d6606c07e
2016-07-13 13:13:01 +00:00
Sergio Giro
85d694cd0d
Revert \\\\\\\\"libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8\\\\\\\\" am: 311002936e
am: ddd0051968
am: b218b2d34d
am: 605de74373
am: 37826f5613
am: 80473d5d33
am: c06d338ad7
...
am: e059f5e325
Change-Id: I5682a9b927fb31cb3d888b7f430d8ad62fcaeef3
2016-07-13 13:05:57 +00:00
Sergio Giro
e059f5e325
Revert \\\\\\\"libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8\\\\\\\" am: 311002936e
am: ddd0051968
am: b218b2d34d
am: 605de74373
am: 37826f5613
am: 80473d5d33
...
am: c06d338ad7
Change-Id: I4ee28f7eb936464eeee476b9fedb19aa7fb96ac0
2016-07-13 13:01:47 +00:00
Sergio Giro
c06d338ad7
Revert \\\\\\"libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8\\\\\\" am: 311002936e
am: ddd0051968
am: b218b2d34d
am: 605de74373
am: 37826f5613
...
am: 80473d5d33
Change-Id: Ia5cb6e89924e69df568d633472656dd4b0c12a76
2016-07-13 12:58:09 +00:00
Sergio Giro
80473d5d33
Revert \\\\\"libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8\\\\\" am: 311002936e
am: ddd0051968
am: b218b2d34d
am: 605de74373
...
am: 37826f5613
Change-Id: I3bc2854586879b2a7d7678516a99b7f767a3d4cb
2016-07-13 12:54:32 +00:00
Sergio Giro
37826f5613
Revert \\\\"libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8\\\\" am: 311002936e
am: ddd0051968
am: b218b2d34d
...
am: 605de74373
Change-Id: Ib58bd045e59fcfcf449b346861b5427d07fba9c6
2016-07-13 12:51:06 +00:00
Sergio Giro
605de74373
Revert \\\"libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8\\\" am: 311002936e
am: ddd0051968
...
am: b218b2d34d
Change-Id: Iced8e47993a39103aed3deafb5deb974995ecdba
2016-07-13 12:47:25 +00:00
Sergio Giro
b218b2d34d
Revert \\"libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8\\" am: 311002936e
...
am: ddd0051968
Change-Id: Ia2a422c170a0d700a1d4d55ea920361689a9be8b
2016-07-13 12:44:00 +00:00
Sergio Giro
ddd0051968
Revert \"libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8\"
...
am: 311002936e
Change-Id: Ic21d2414fb13c14feee56403324d31b0198e10e7
2016-07-13 12:40:29 +00:00
Sergio Giro
311002936e
Revert "libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8"
...
This reverts commit 53473c1607
.
Change-Id: I27379317e08ecbd5e3b95b7ece58194838ab6c21
2016-07-13 11:47:53 +00:00
Sergio Giro
79a3c84cfe
libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8 am: 53473c1607
am: 41e6690d0c
am: 29ccafe5f0
am: fd7bd2dfef
am: 498ffa62c5
am: 5e4ebd02d4
am: d837e74381
am: 6025b216e4
...
am: a73f7e5e81
Change-Id: Ia2dcdfa5e373ba9bab53faf267650848370d4f93
2016-07-13 10:03:06 +00:00
Sergio Giro
a73f7e5e81
libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8 am: 53473c1607
am: 41e6690d0c
am: 29ccafe5f0
am: fd7bd2dfef
am: 498ffa62c5
am: 5e4ebd02d4
am: d837e74381
...
am: 6025b216e4
Change-Id: Ibf26d9f029f77f80623ac97633eb8cddbb77fe29
2016-07-13 09:59:32 +00:00
Sergio Giro
6025b216e4
libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8 am: 53473c1607
am: 41e6690d0c
am: 29ccafe5f0
am: fd7bd2dfef
am: 498ffa62c5
am: 5e4ebd02d4
...
am: d837e74381
Change-Id: Ie620548a78c92d2160db4395f00c6ec9f281e937
2016-07-13 09:55:54 +00:00
Sergio Giro
d837e74381
libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8 am: 53473c1607
am: 41e6690d0c
am: 29ccafe5f0
am: fd7bd2dfef
am: 498ffa62c5
...
am: 5e4ebd02d4
Change-Id: Ib2eb019edba21cd3ba3e22d745818d30c912ce62
2016-07-13 09:52:14 +00:00
Sergio Giro
5e4ebd02d4
libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8 am: 53473c1607
am: 41e6690d0c
am: 29ccafe5f0
am: fd7bd2dfef
...
am: 498ffa62c5
Change-Id: I470fe3b20bf5b1231146c488edc98336a7d60049
2016-07-13 09:48:32 +00:00
Sergio Giro
498ffa62c5
libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8 am: 53473c1607
am: 41e6690d0c
am: 29ccafe5f0
...
am: fd7bd2dfef
Change-Id: I24df8d8b13987ea0f99be6d4e9f49d52a1c4f58b
2016-07-13 09:44:52 +00:00
Sergio Giro
fd7bd2dfef
libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8 am: 53473c1607
am: 41e6690d0c
...
am: 29ccafe5f0
Change-Id: If7c24750afcae3a4b73885b2c4fb9b99ffca5c45
2016-07-13 09:41:12 +00:00
Sergio Giro
29ccafe5f0
libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8 am: 53473c1607
...
am: 41e6690d0c
Change-Id: I0f7707c88684f9cc24fff878d3d3751b6025227f
2016-07-13 09:37:36 +00:00
Sergio Giro
41e6690d0c
libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8
...
am: 53473c1607
Change-Id: I04d6546b426dfbab278491d831f8b47ec077839f
2016-07-13 09:33:58 +00:00
Sergio Giro
53473c1607
libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8
...
Inconsistent behaviour between utf16_to_utf8 and utf16_to_utf8_length
is causing a heap overflow.
Correcting the length computation and adding bound checks to the
conversion functions.
(cherry picked from commit c4966a363e
)
(changed code for safetynet logging due to lack of sstream and string in klp)
Change-Id: If50d59a91a13fddbff9a8fff0d3eebe57c711e93
Bug: 29250543
2016-07-12 18:39:11 +01:00