FORTIFY_SOURCE: introduce __BIONIC_FORTIFY_UNKNOWN_SIZE macro

Replace all occurances of "(size_t) -1" with a
__BIONIC_FORTIFY_UNKNOWN_SIZE macro.

Change-Id: I0b188f6cf31417d2dbef0e1bd759de3f9782873a
This commit is contained in:
Nick Kralevich 2012-07-13 14:46:36 -07:00
parent 260bf8cfe0
commit 9b6cc223a3
3 changed files with 8 additions and 4 deletions

View File

@ -547,7 +547,7 @@ char *fgets(char *dest, int size, FILE *stream)
}
// Compiler doesn't know destination size. Don't call __fgets_chk
if (bos == (size_t) -1) {
if (bos == __BIONIC_FORTIFY_UNKNOWN_SIZE) {
return __fgets_real(dest, size, stream);
}

View File

@ -166,7 +166,7 @@ size_t strlcpy(char *dest, const char *src, size_t size) {
size_t bos = __builtin_object_size(dest, 0);
// Compiler doesn't know destination size. Don't call __strlcpy_chk
if (bos == (size_t) -1) {
if (bos == __BIONIC_FORTIFY_UNKNOWN_SIZE) {
return __strlcpy_real(dest, src, size);
}
@ -197,7 +197,7 @@ size_t strlcat(char *dest, const char *src, size_t size) {
size_t bos = __builtin_object_size(dest, 0);
// Compiler doesn't know destination size. Don't call __strlcat_chk
if (bos == (size_t) -1) {
if (bos == __BIONIC_FORTIFY_UNKNOWN_SIZE) {
return __strlcat_real(dest, src, size);
}
@ -223,9 +223,12 @@ extern size_t __strlen_chk(const char *, size_t);
__BIONIC_FORTIFY_INLINE
size_t strlen(const char *s) {
size_t bos = __builtin_object_size(s, 0);
if (bos == (size_t) -1) {
// Compiler doesn't know destination size. Don't call __strlen_chk
if (bos == __BIONIC_FORTIFY_UNKNOWN_SIZE) {
return __strlen_real(s);
}
return __strlen_chk(s, bos);
}

View File

@ -507,6 +507,7 @@
__attribute__ ((always_inline)) \
__attribute__ ((gnu_inline)) \
__attribute__ ((artificial))
#define __BIONIC_FORTIFY_UNKNOWN_SIZE ((size_t) -1)
#endif
#endif /* !_SYS_CDEFS_H_ */