diff options
| author | Nick Kralevich <nnk@google.com> | 2013-12-18 19:17:14 -0800 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2013-12-20 16:45:26 -0800 |
| commit | 566a71358cae264ad1b6e28a34fcfa87d854da7e (patch) | |
| tree | 5f2835b5c37d982fb6cfae4705b4c82a4879e214 | |
| parent | 183c8c5237097df815b593a6dc6dec40e0cf48b2 (diff) | |
| download | bionic-566a71358cae264ad1b6e28a34fcfa87d854da7e.tar.gz bionic-566a71358cae264ad1b6e28a34fcfa87d854da7e.tar.bz2 bionic-566a71358cae264ad1b6e28a34fcfa87d854da7e.zip | |
Clean up more recursive FORTIFY_SOURCE calls
Don't use FORTIFY_SOURCE on functions which implement
FORTIFY_SOURCE, to avoid infinite recursion problems.
The previous patch only addressed one of the problems.
Bug: 12216860
Change-Id: I6f30ae7cb5b481be9942add18182ea4839d348a6
| -rw-r--r-- | libc/bionic/__fgets_chk.cpp | 2 | ||||
| -rw-r--r-- | libc/bionic/__memmove_chk.cpp | 2 | ||||
| -rw-r--r-- | libc/bionic/__memset_chk.cpp | 2 | ||||
| -rw-r--r-- | libc/bionic/__strlcat_chk.cpp | 2 | ||||
| -rw-r--r-- | libc/bionic/__strlcpy_chk.cpp | 2 | ||||
| -rw-r--r-- | libc/bionic/__strncpy_chk.cpp | 2 | ||||
| -rw-r--r-- | libc/bionic/__vsnprintf_chk.cpp | 2 | ||||
| -rw-r--r-- | libc/bionic/__vsprintf_chk.cpp | 2 |
8 files changed, 16 insertions, 0 deletions
diff --git a/libc/bionic/__fgets_chk.cpp b/libc/bionic/__fgets_chk.cpp index 429eda515..569d2ac0c 100644 --- a/libc/bionic/__fgets_chk.cpp +++ b/libc/bionic/__fgets_chk.cpp @@ -26,6 +26,8 @@ * SUCH DAMAGE. */ +#undef _FORTIFY_SOURCE + #include <stdio.h> #include <stdlib.h> #include "libc_logging.h" diff --git a/libc/bionic/__memmove_chk.cpp b/libc/bionic/__memmove_chk.cpp index 49a059782..fd1a5f5cf 100644 --- a/libc/bionic/__memmove_chk.cpp +++ b/libc/bionic/__memmove_chk.cpp @@ -26,6 +26,8 @@ * SUCH DAMAGE. */ +#undef _FORTIFY_SOURCE + #include <string.h> #include <stdlib.h> #include "libc_logging.h" diff --git a/libc/bionic/__memset_chk.cpp b/libc/bionic/__memset_chk.cpp index f7a5f241e..818ebc004 100644 --- a/libc/bionic/__memset_chk.cpp +++ b/libc/bionic/__memset_chk.cpp @@ -26,6 +26,8 @@ * SUCH DAMAGE. */ +#undef _FORTIFY_SOURCE + #include <string.h> #include <stdlib.h> #include "libc_logging.h" diff --git a/libc/bionic/__strlcat_chk.cpp b/libc/bionic/__strlcat_chk.cpp index 25c67adca..d380246d4 100644 --- a/libc/bionic/__strlcat_chk.cpp +++ b/libc/bionic/__strlcat_chk.cpp @@ -26,6 +26,8 @@ * SUCH DAMAGE. */ +#undef _FORTIFY_SOURCE + #include <string.h> #include <stdlib.h> #include "libc_logging.h" diff --git a/libc/bionic/__strlcpy_chk.cpp b/libc/bionic/__strlcpy_chk.cpp index f6b11fc57..1b35e3881 100644 --- a/libc/bionic/__strlcpy_chk.cpp +++ b/libc/bionic/__strlcpy_chk.cpp @@ -26,6 +26,8 @@ * SUCH DAMAGE. */ +#undef _FORTIFY_SOURCE + #include <string.h> #include <stdlib.h> #include "libc_logging.h" diff --git a/libc/bionic/__strncpy_chk.cpp b/libc/bionic/__strncpy_chk.cpp index b01879cba..ea16b4c26 100644 --- a/libc/bionic/__strncpy_chk.cpp +++ b/libc/bionic/__strncpy_chk.cpp @@ -26,6 +26,8 @@ * SUCH DAMAGE. */ +#undef _FORTIFY_SOURCE + #include <string.h> #include <stdlib.h> #include "libc_logging.h" diff --git a/libc/bionic/__vsnprintf_chk.cpp b/libc/bionic/__vsnprintf_chk.cpp index 2d3a81ecb..e38c852c3 100644 --- a/libc/bionic/__vsnprintf_chk.cpp +++ b/libc/bionic/__vsnprintf_chk.cpp @@ -26,6 +26,8 @@ * SUCH DAMAGE. */ +#undef _FORTIFY_SOURCE + #include <stdio.h> #include <stdlib.h> #include <stdarg.h> diff --git a/libc/bionic/__vsprintf_chk.cpp b/libc/bionic/__vsprintf_chk.cpp index 12b0ca6ab..3250b6835 100644 --- a/libc/bionic/__vsprintf_chk.cpp +++ b/libc/bionic/__vsprintf_chk.cpp @@ -26,6 +26,8 @@ * SUCH DAMAGE. */ +#undef _FORTIFY_SOURCE + #include <stdio.h> #include <stdlib.h> #include <stdarg.h> |