Mark Salyzyn
11ba19ea5e
Merge \\"logd: trailing spaces in log statistics\\" am: d59d16a49d
...
am: 35f7799f16
Change-Id: Ice558919a34a1085c72cf47c270e7feeac89208d
2016-07-15 19:07:50 +00:00
Mark Salyzyn
71ca7ba9b4
Merge \\"liblog: pmsg_read add validity checking for prio\\" am: 73cc6edf0e
...
am: 0d9ce37382
Change-Id: I4d51e1ad55dfcc06a1f66056d3cc61ad7f042537
2016-07-15 19:07:50 +00:00
Mark Salyzyn
35f7799f16
Merge \"logd: trailing spaces in log statistics\"
...
am: d59d16a49d
Change-Id: I3f9432af451b13e5641d8ab6a8c275516d636439
2016-07-15 19:04:49 +00:00
Mark Salyzyn
0d9ce37382
Merge \"liblog: pmsg_read add validity checking for prio\"
...
am: 73cc6edf0e
Change-Id: Iba5e7b7c2325e127eb9f040c8ab86ba24efd5b20
2016-07-15 19:04:48 +00:00
Treehugger Robot
d59d16a49d
Merge "logd: trailing spaces in log statistics"
2016-07-15 18:55:58 +00:00
Treehugger Robot
73cc6edf0e
Merge "liblog: pmsg_read add validity checking for prio"
2016-07-15 18:55:43 +00:00
Mark Salyzyn
0adcc3e3e8
logd: trailing spaces in log statistics
...
Bug: 30118730
Change-Id: I8cccbc1da2cf8168ec9cf12f07df4cafef076558
2016-07-15 11:00:44 -07:00
Jorge Lucangeli Obes
e1206b7b1a
Merge \\"Convert fuse.c to C++.\\" am: a17427cb1e
...
am: da4bc7484f
Change-Id: Ic885af5146c4fb11d0545430a043562b80bbcbe0
2016-07-14 19:50:01 +00:00
Jorge Lucangeli Obes
b4201a3b99
Merge \\"Use C++ logging in sdcard.cpp.\\" am: 2703425de8
...
am: 29b874de70
Change-Id: I26bfbc8556600bc04cf0df486b92adda00929055
2016-07-14 19:50:01 +00:00
Jorge Lucangeli Obes
da4bc7484f
Merge \"Convert fuse.c to C++.\"
...
am: a17427cb1e
Change-Id: Ie112f67f724e511b6c8ffabd0db04f3e017132cc
2016-07-14 19:47:37 +00:00
Jorge Lucangeli Obes
29b874de70
Merge \"Use C++ logging in sdcard.cpp.\"
...
am: 2703425de8
Change-Id: I90103d0521bd2cd4de3710adf3bc6013721cb6f9
2016-07-14 19:47:36 +00:00
Treehugger Robot
a17427cb1e
Merge "Convert fuse.c to C++."
2016-07-14 19:42:32 +00:00
Treehugger Robot
2703425de8
Merge "Use C++ logging in sdcard.cpp."
2016-07-14 19:41:45 +00:00
Sergio Giro
e4e225515d
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 am: 1062106a3b am: 9d6d33dba2 -s ours
...
am: 8c335e2840
Change-Id: I4c6a67501017c5e78affc46cba81c4ad439bf6a7
2016-07-14 18:50:35 +00:00
Sergio Giro
8ea5dfee6b
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 am: dc5a96f5b3 am: 1aad4b61cb -s ours
...
am: 8170f506f7
Change-Id: I3812703a32fe335f44f91676704a9e282999869b
2016-07-14 18:50:29 +00:00
Sergio Giro
cf76ba7f7b
libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8 am: 3411dd4457 am: 01dbd1da64 am: 7c516d7080 am: 062c13e997 -s ours
...
am: 254b45e573
Change-Id: I8979227f652d831c15a40b26a14846789dcd5155
2016-07-14 18:50:25 +00:00
Sergio Giro
8c335e2840
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 am: 1062106a3b
...
am: 9d6d33dba2 -s ours
Change-Id: Id26c22b458fcd1b7ad32c58449dd9574bc464ad3
2016-07-14 18:47:12 +00:00
Sergio Giro
8170f506f7
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 am: dc5a96f5b3
...
am: 1aad4b61cb -s ours
Change-Id: I0082b3b2c0e2347940f666d8a03811abe390de02
2016-07-14 18:47:04 +00:00
Sergio Giro
254b45e573
libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8 am: 3411dd4457 am: 01dbd1da64 am: 7c516d7080
...
am: 062c13e997 -s ours
Change-Id: I932cc01acc74a8d148a6c9d25d5c35c48a324844
2016-07-14 18:44:28 +00:00
Sergio Giro
9d6d33dba2
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
...
am: 1062106a3b
Change-Id: I441fc693e0f6861160ebc615b2ba15feba29e1a7
2016-07-14 18:29:27 +00:00
Sergio Giro
1aad4b61cb
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
...
am: dc5a96f5b3
Change-Id: I02b02a89f381c1cadff3b4702e1ff8e8850b219e
2016-07-14 18:29:22 +00: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
062c13e997
libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8 am: 3411dd4457 am: 01dbd1da64
...
am: 7c516d7080
Change-Id: Ieaea49b0baa026dd0666b884a1c64a303d19baf1
2016-07-14 18:23:56 +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
71d9f83fa9
Merge \"libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8\" into nyc-dev
...
am: 757f4ef340
Change-Id: I29dfaa3968597fc3b0cdadd140b5790c1e61008d
2016-07-14 18:08:00 +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
757f4ef340
Merge "libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8" into nyc-dev
2016-07-14 17:33:28 +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
Mark Salyzyn
e6957579a7
Merge \\"liblog: reset pid and uid cache after a vfork()\\" am: d4f6324176
...
am: 56da612ec4
Change-Id: I9e5968c08274a7b19722b4c3b56a477203c73de7
2016-07-14 16:04:30 +00:00
Mark Salyzyn
56da612ec4
Merge \"liblog: reset pid and uid cache after a vfork()\"
...
am: d4f6324176
Change-Id: I3b59f56b2b5f399b079ab9439600dc3a72c669a6
2016-07-14 15:55:55 +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
Mark Salyzyn
d4f6324176
Merge "liblog: reset pid and uid cache after a vfork()"
2016-07-14 15:47:33 +00: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
Mark Salyzyn
3d8afe9b01
liblog: pmsg_read add validity checking for prio
...
Improve pmsg data corruption detection.
Bug: 30085794
Change-Id: I215da4fff07797b8c0a3462f850bafb090adfc68
2016-07-14 07:34:53 -07:00
Mark Salyzyn
ec4f5c776d
liblog: reset pid and uid cache after a vfork()
...
Bionic getuid() and getpid() calls cache to reduce the need to
perform a syscall, and also reset their own cache after a vfork().
No more need for liblog to be performing this flawed cache operation.
Bug: 30085794
Change-Id: I70feed8bff0ddd919c2885a348ba67b14ddc0e0d
2016-07-14 07:34:53 -07:00
Jorge Lucangeli Obes
c9e1710acc
Use C++ logging in sdcard.cpp.
...
This gets rid of a bunch of "strerror(errno)" bits.
Will convert fuse.cpp after
https://android-review.googlesource.com/#/c/247780 lands.
Bug: 30110940
Change-Id: Iacefe5b6519b217ed687c709763fe5827b3b0b59
2016-07-14 10:06:34 -04:00
Sergio Giro
498eff397b
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 am: 7a0c6bf505 am: f96271187f -s ours
...
am: 53d529a585
Change-Id: I93e1e53dcc4bea0332656d0308632494275f99c0
2016-07-14 14:05:48 +00:00
Jorge Lucangeli Obes
f08ba05581
Convert fuse.c to C++.
...
Fix string literals and cast void* appropriately. Alternatively, we
could switch some of the allocations to new/delete, but we would need
to make sure that none of those end up passed to other code that will
call free(3) on them.
Bug: 30110940
Change-Id: I6f39df65cd960930530e5a1f8420a28d50adc25d
2016-07-14 10:03:22 -04:00
Sergio Giro
53d529a585
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 am: 7a0c6bf505
...
am: f96271187f -s ours
Change-Id: Ib04042a57e4b5d55eca95cbbea272446c499c07e
2016-07-14 13:59:29 +00:00