generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am aed0c3ac: am b94b2851: Merge "libc: upgrade sprintf to _FORTIFY_SOURCE=2"

Browse Source 
* commit 'aed0c3ac54fa944b1f8512938277e7dc6b6fa2ee':
  libc: upgrade sprintf to _FORTIFY_SOURCE=2
This commit is contained in:
Nick Kralevich
2013-04-30 08:54:30 -07:00
committed by Android Git Automerger
parent 90a293f7d3 aed0c3ac54
commit d411fbd497
4 changed files with 33 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libc/include/stdio.h
View File

@@ -494,7 +494,7 @@ __attribute__((__nonnull__ (2)))
int sprintf(char *dest, const char *format, ...)
{
return __builtin___sprintf_chk(dest, 0,
__builtin_object_size(dest, 0), format, __builtin_va_arg_pack());
__bos(dest), format, __builtin_va_arg_pack());
}
extern char *__fgets_real(char *, int, FILE *)

4
libc/include/sys/cdefs.h
View File

@@ -518,9 +518,9 @@
#if defined(_FORTIFY_SOURCE) && _FORTIFY_SOURCE > 0 && defined(__OPTIMIZE__) && __OPTIMIZE__ > 0 && !defined(__clang__)
#define __BIONIC_FORTIFY 1
#if _FORTIFY_SOURCE == 2
#define __bos(s) __builtin_object_size((s), 1);
#define __bos(s) __builtin_object_size((s), 1)
#else
#define __bos(s) __builtin_object_size((s), 0);
#define __bos(s) __builtin_object_size((s), 0)
#endif
#define __BIONIC_FORTIFY_INLINE \