Elliott Hughes
2218b89ca7
am d383ac15: am a0151cbf: Merge "Unit tests for formatting code, fix %%."
...
# Via Android Git Automerger (1) and others
* commit 'd383ac1570b553d68ed399c74b73bad1498d78f6':
Unit tests for formatting code, fix %%.
2013-01-28 14:11:54 -08:00
Elliott Hughes
d383ac1570
am a0151cbf: Merge "Unit tests for formatting code, fix %%."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit 'a0151cbfbaa37965dbcd188a55a78d3ad4802b9b':
Unit tests for formatting code, fix %%.
2013-01-28 14:10:08 -08:00
Elliott Hughes
41b3179c9e
Unit tests for formatting code, fix %%.
...
Also fix <signal.h> and <stdio.h> so they don't cause compiler warnings.
Change-Id: Ib1a746bf01de22d47dbd964de0e6af80a7c96303
2013-01-28 10:36:31 -08:00
Elliott Hughes
d265d36749
am f07db754: am 0a91b11d: Merge "More debug malloc fixes."
...
# Via Android Git Automerger (1) and others
* commit 'f07db75443cce4ab96c93bdaa0793d7b8e87547e':
More debug malloc fixes.
2013-01-25 18:09:45 -08:00
Elliott Hughes
f07db75443
am 0a91b11d: Merge "More debug malloc fixes."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '0a91b11d286446fe7849a6f537b4a21a52f63399':
More debug malloc fixes.
2013-01-25 18:07:23 -08:00
Elliott Hughes
239e7a0756
More debug malloc fixes.
...
Include the leaky executable's name in the log output. Fix the "sh" test.
Use uintptr_t instead of intptr_t.
Also fix debug formatting of NULL with %s.
Bug: 7291287
Change-Id: I015bf341cd48d43a247173612e6ccb1bf1243d53
2013-01-25 17:13:45 -08:00
Elliott Hughes
88af723267
am 7ae99845: am 6a94cb74: Merge "arm syscall : for eabi call_default don\'t use stack"
...
# By Matthieu Castet
# Via Android Git Automerger (1) and others
* commit '7ae998456c2564aff4ecbe6a6df214821f6e26cc':
arm syscall : for eabi call_default don't use stack
2013-01-25 14:10:02 -08:00
Nick Kralevich
2ebcd19cbc
am 27818d2a: am b871e5d6: Merge "system_properties: do more checking of file"
...
# Via Android Git Automerger (1) and others
* commit '27818d2a16e4972acba15368f55a59cc0ed990f0':
system_properties: do more checking of file
2013-01-25 14:10:01 -08:00
Elliott Hughes
7ae998456c
am 6a94cb74: Merge "arm syscall : for eabi call_default don\'t use stack"
...
# By Matthieu Castet
# Via Gerrit Code Review (1) and Matthieu Castet (1)
* commit '6a94cb748bf63278c3271b0ab610061b0dc6f04a':
arm syscall : for eabi call_default don't use stack
2013-01-25 14:08:26 -08:00
Nick Kralevich
27818d2a16
am b871e5d6: Merge "system_properties: do more checking of file"
...
# Via Gerrit Code Review (1) and Nick Kralevich (1)
* commit 'b871e5d6b3b4a214c7f19bdfca7663f1fe49fda8':
system_properties: do more checking of file
2013-01-25 14:08:26 -08:00
Elliott Hughes
6a94cb748b
Merge "arm syscall : for eabi call_default don't use stack"
2013-01-25 21:57:58 +00:00
Nick Kralevich
c16961b8c3
system_properties: do more checking of file
...
Check that the permissions on the properties file
are exactly as we expect them to be.
Make sure we close the fd if fstat fails.
Refactor the code slightly.
Change-Id: I5503fd58c3b8093ce7e6d05920748ed70eaf8e2c
2013-01-25 13:07:31 -08:00
Nick Kralevich
151e91e66c
am da2d2c61: am 82ef8296: Merge "prctl.h: include sys/cdefs.h"
...
# Via Android Git Automerger (1) and others
* commit 'da2d2c618c23f212f8dec0c0615bf75d7c18b88d':
prctl.h: include sys/cdefs.h
2013-01-24 16:11:56 -08:00
Nick Kralevich
da2d2c618c
am 82ef8296: Merge "prctl.h: include sys/cdefs.h"
...
# Via Gerrit Code Review (1) and Nick Kralevich (1)
* commit '82ef8296dc5e25b9cc8e7231f9515f50185dac9d':
prctl.h: include sys/cdefs.h
2013-01-24 08:59:00 -08:00
Nick Kralevich
8e70b0d5c3
prctl.h: include sys/cdefs.h
...
prctl.h uses __BEGIN_DECLS but fails to include sys/cdefs.h
(where it's defined). Code which includes prctl.h without
previously including sys/cdefs.h will fail to compile.
Fixed.
Change-Id: If4c9f3308f08b93596dcd00e351ae786807e9320
2013-01-23 16:49:47 -08:00
Nick Kralevich
b8726037ee
am e7d937b5: am b3351f12: Merge "libc: use more secure system properties if available"
...
* commit 'e7d937b52f183ce84751701c369ffe6a4c81d033':
libc: use more secure system properties if available
2013-01-23 11:09:40 -08:00
Nick Kralevich
e7d937b52f
am b3351f12: Merge "libc: use more secure system properties if available"
...
* commit 'b3351f12047747b603efb070069e7afdf3040335':
libc: use more secure system properties if available
2013-01-23 11:07:23 -08:00
Nick Kralevich
32417fb376
libc: use more secure system properties if available
...
Currently, system properties are passed via the environment
variable ANDROID_PROPERTY_WORKSPACE and a file descriptor passed
from parent to child. This is insecure for setuid executables,
as the environment variable can be changed by the caller.
Modify system property handling so that we get the properties
from a root owned properties file, rather than using an
environment variable. Fall back to the environment variable
if the file doesn't exist.
Bug: 8045561
Change-Id: I54f3efa98cf7d63d88788da5ce0d19e34fd7851a
2013-01-23 09:28:35 -08:00
Elliott Hughes
c08ab018ad
am 40107623: am 778a68e1: Merge "Don\'t free anything when reporting leaks."
...
* commit '40107623b05fdc2b6c61d9c885483abd3add486a':
Don't free anything when reporting leaks.
2013-01-22 22:14:32 -08:00
Elliott Hughes
ce8732b188
am 552e02fa: am 5c8f75ef: Merge "Disable leak checking for mksh; it\'s way too leaky."
...
* commit '552e02fa9c99fd234c57d756358e3208d11a13ad':
Disable leak checking for mksh; it's way too leaky.
2013-01-22 22:14:31 -08:00
Elliott Hughes
40107623b0
am 778a68e1: Merge "Don\'t free anything when reporting leaks."
...
* commit '778a68e1e57408be04806b5bfc3150aade44bcbf':
Don't free anything when reporting leaks.
2013-01-22 22:11:55 -08:00
Elliott Hughes
552e02fa9c
am 5c8f75ef: Merge "Disable leak checking for mksh; it\'s way too leaky."
...
* commit '5c8f75ef8bd89498de1d1108efa54869a2784738':
Disable leak checking for mksh; it's way too leaky.
2013-01-22 22:11:54 -08:00
Elliott Hughes
778a68e1e5
Merge "Don't free anything when reporting leaks."
2013-01-23 06:06:21 +00:00
Elliott Hughes
848247a972
Don't free anything when reporting leaks.
...
We don't know that they're not going to be cleaned up by a
C++ global destructor that runs after us. This is the case with
bootanimation, for example.
Bug: 7291287
Change-Id: Iba402514d1735fdc2ae4bc95b65396d816be46c0
2013-01-22 18:36:28 -08:00
Elliott Hughes
84f8b5f401
Disable leak checking for mksh; it's way too leaky.
...
When each shell leaks ~240 allocations, you can't see the leaks from
the program you ran with "adb shell".
Bug: 7291287
Change-Id: Ib8780db72ba0114ebdb24768537da74bbb61f354
2013-01-22 18:35:14 -08:00
Elliott Hughes
a8e0f2b956
am b16ec162: am 28f82b26: Merge "Add const for first argument of sigismember for fit POSIX spec"
...
* commit 'b16ec162881110a30f665ce7bd1432ccefba60b7':
Add const for first argument of sigismember for fit POSIX spec
2013-01-22 17:29:01 -08:00
Elliott Hughes
b16ec16288
am 28f82b26: Merge "Add const for first argument of sigismember for fit POSIX spec"
...
* commit '28f82b260c9076aae437dafb57193a174aef1eb3':
Add const for first argument of sigismember for fit POSIX spec
2013-01-22 17:26:45 -08:00
Elliott Hughes
28f82b260c
Merge "Add const for first argument of sigismember for fit POSIX spec"
2013-01-23 01:11:28 +00:00
Elliott Hughes
5f79f75ba6
am 57edf36c: am 8d6302cd: Merge "Our strcoll(3) is no different from NetBSD\'s, so take exactly theirs."
...
* commit '57edf36c5f83fa7bcf9d8d028cde0acc7ddfadcc':
Our strcoll(3) is no different from NetBSD's, so take exactly theirs.
2013-01-22 15:33:24 -08:00
Elliott Hughes
57edf36c5f
am 8d6302cd: Merge "Our strcoll(3) is no different from NetBSD\'s, so take exactly theirs."
...
* commit '8d6302cdcff9c53fe3ecd36ab479fdf08318c504':
Our strcoll(3) is no different from NetBSD's, so take exactly theirs.
2013-01-22 15:31:26 -08:00
Elliott Hughes
2b47307012
Our strcoll(3) is no different from NetBSD's, so take exactly theirs.
...
Change-Id: I45251047202a229f9175735ecc23c0ebcda71e8d
2013-01-22 15:10:19 -08:00
Elliott Hughes
ad551eaa04
am 5f7b6b83: am 547eba0a: Merge "Avoid overflow in memccpy."
...
* commit '5f7b6b8301658a834516f05e8e0a9eb4513e6e62':
Avoid overflow in memccpy.
2013-01-22 15:08:58 -08:00
Elliott Hughes
5f7b6b8301
am 547eba0a: Merge "Avoid overflow in memccpy."
...
* commit '547eba0a63951d7db93c0542e1ecab891725b9a8':
Avoid overflow in memccpy.
2013-01-22 15:05:31 -08:00
Elliott Hughes
c51cd764a2
Avoid overflow in memccpy.
...
Just take the upstream NetBSD code.
Bug: http://code.google.com/p/android/issues/detail?id=43078
Change-Id: Ibbbde9d00e8bc6a09c9503aab2b04b4e3d1f98b0
2013-01-22 14:41:23 -08:00
Elliott Hughes
0dfb2ecaab
am 0609c0fe: am 7af7895e: Merge "Use the new non-allocating logging for dlmalloc failures."
...
* commit '0609c0fe8dae2ec10f1811c46a4d583f557c68f7':
Use the new non-allocating logging for dlmalloc failures.
2013-01-22 14:35:06 -08:00
Elliott Hughes
0609c0fe8d
am 7af7895e: Merge "Use the new non-allocating logging for dlmalloc failures."
...
* commit '7af7895eeb810ff1a1ca8b60fcda13595d551114':
Use the new non-allocating logging for dlmalloc failures.
2013-01-22 14:32:02 -08:00
Elliott Hughes
7af7895eeb
Merge "Use the new non-allocating logging for dlmalloc failures."
2013-01-22 22:26:35 +00:00
Elliott Hughes
ce4cf90d79
Use the new non-allocating logging for dlmalloc failures.
...
Change-Id: I88afe0201ee5766a295fc5a9e710fba9d6e0d363
2013-01-22 14:24:52 -08:00
Nick Kralevich
98ae1a85b0
am e652ed30: am 244bee5b: Merge "bionic_auxv.h: fix #define conflict"
...
* commit 'e652ed30514afcf314b40c69b9cac088602a83da':
bionic_auxv.h: fix #define conflict
2013-01-22 13:43:46 -08:00
Nick Kralevich
e652ed3051
am 244bee5b: Merge "bionic_auxv.h: fix #define conflict"
...
* commit '244bee5bb6e0bc12b739c57028ac8af23a18aed0':
bionic_auxv.h: fix #define conflict
2013-01-22 13:38:53 -08:00
Nick Kralevich
abc21c8056
bionic_auxv.h: fix #define conflict
...
Both libc/include/sys/auxv.h and libc/private/bionic_auxv.h
use _SYS_AUXV_H_ to see if a header file has already been included.
This prevents both of these files from being included at the same
time.
Fix this name conflict.
Change-Id: Ifaec88aa9779d784b95f8e75145117acf3d5cfc5
2013-01-22 13:09:04 -08:00
Elliott Hughes
04afcd25a3
am 8ef83bc4: am 02f96b9d: Merge "Add missing extern "C"."
...
* commit '8ef83bc46e06e8fe98e918fcb1c582d6f5807461':
Add missing extern "C".
2013-01-22 11:34:25 -08:00
Elliott Hughes
8ef83bc46e
am 02f96b9d: Merge "Add missing extern "C"."
...
* commit '02f96b9db0242711fe1dfe0713c0c4e698561da5':
Add missing extern "C".
2013-01-22 11:32:16 -08:00
Elliott Hughes
f90b95ea1a
Add missing extern "C".
...
Change-Id: Idbf24ce8482ff03f24caa89bafb08677b1c5cec3
2013-01-22 11:20:45 -08:00
Elliott Hughes
4cd5703b9e
am 75b64a1b: am ca483765: Merge "Fix the duplication in the debugging code."
...
* commit '75b64a1b64e788b9e69ac4f4cd8cce37932513a8':
Fix the duplication in the debugging code.
2013-01-22 10:02:12 -08:00
Elliott Hughes
75b64a1b64
am ca483765: Merge "Fix the duplication in the debugging code."
...
* commit 'ca483765bd0dc16294b9e67dd0de5c6d53b1bfa3':
Fix the duplication in the debugging code.
2013-01-22 09:59:44 -08:00
Elliott Hughes
ca483765bd
Merge "Fix the duplication in the debugging code."
2013-01-22 17:44:15 +00:00
Kito Cheng
f373b11f9f
Add const for first argument of sigismember for fit POSIX spec
...
Change-Id: Icbc67375282f2a22dce02e4bacab15ddae846057
2013-01-20 00:15:23 +08:00
Elliott Hughes
1e980b6bc8
Fix the duplication in the debugging code.
...
We had two copies of the backtrace code, and two copies of the
libcorkscrew /proc/pid/maps code. This patch gets us down to one.
We also had hacks so we could log in the malloc debugging code.
This patch pulls the non-allocating "printf" code out of the
dynamic linker so everyone can share.
This patch also makes the leak diagnostics easier to read, and
makes it possible to paste them directly into the 'stack' tool (by
using relative PCs).
This patch also fixes the stdio standard stream leak that was
causing a leak warning every time tf_daemon ran.
Bug: 7291287
Change-Id: I66e4083ac2c5606c8d2737cb45c8ac8a32c7cfe8
2013-01-18 22:20:06 -08:00
Nick Kralevich
8e833972c2
am 0a0c2321: am 4bfaf1e5: Merge "FORTIFY_SOURCE: optimize"
...
* commit '0a0c23216766adf76739dc38dcb45934105cd41c':
FORTIFY_SOURCE: optimize
2013-01-17 17:06:11 -08:00