diff options
| author | Nick Kralevich <nnk@google.com> | 2013-12-18 19:17:14 -0800 |
|---|---|---|
| committer | Nick Kralevich <nnk@google.com> | 2013-12-18 19:17:14 -0800 |
| commit | e4c6b08c4e81f640afc502804d1226a3e79dc26d (patch) | |
| tree | 6cc797173f041fe783ad156ec74309597283fa28 | |
| parent | 4063bb6147bd256ad455bd3bd063ef40aae8851d (diff) | |
| download | android_bionic-e4c6b08c4e81f640afc502804d1226a3e79dc26d.tar.gz android_bionic-e4c6b08c4e81f640afc502804d1226a3e79dc26d.tar.bz2 android_bionic-e4c6b08c4e81f640afc502804d1226a3e79dc26d.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 61dad7077..c09f6c531 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 "private/libc_logging.h" diff --git a/libc/bionic/__memmove_chk.cpp b/libc/bionic/__memmove_chk.cpp index 26bd646cd..b88a94f76 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 "private/libc_logging.h" diff --git a/libc/bionic/__memset_chk.cpp b/libc/bionic/__memset_chk.cpp index 9a3be19dd..5f20452f5 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 "private/libc_logging.h" diff --git a/libc/bionic/__strlcat_chk.cpp b/libc/bionic/__strlcat_chk.cpp index f583154ae..2b7373b9d 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 "private/libc_logging.h" diff --git a/libc/bionic/__strlcpy_chk.cpp b/libc/bionic/__strlcpy_chk.cpp index ebf1444b9..6b2187932 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 "private/libc_logging.h" diff --git a/libc/bionic/__strncpy_chk.cpp b/libc/bionic/__strncpy_chk.cpp index 76458aa74..9625929cd 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 "private/libc_logging.h" diff --git a/libc/bionic/__vsnprintf_chk.cpp b/libc/bionic/__vsnprintf_chk.cpp index 8550224b3..8c0911162 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 bd2aeaba5..5914026b0 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> |