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

Merge "FORTIFY_SOURCE: fortify strrchr"

Browse Source
This commit is contained in:
Nick Kralevich 2012-12-04 11:30:18 -08:00 committed by Gerrit Code Review
commit db79e827eb
2 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libc/include/string.h
View File

@ -240,6 +240,22 @@ char* strchr(const char *s, int c) {
return __strchr_chk(s, c, bos); return __strchr_chk(s, c, bos);
} }
__purefunc extern char* __strrchr_real(const char *, int)
__asm__(__USER_LABEL_PREFIX__ "strrchr");
extern char* __strrchr_chk(const char *, int, size_t);
__BIONIC_FORTIFY_INLINE
char* strrchr(const char *s, int c) {
size_t bos = __builtin_object_size(s, 0);
// Compiler doesn't know destination size. Don't call __strrchr_chk
if (bos == __BIONIC_FORTIFY_UNKNOWN_SIZE) {
return __strrchr_real(s, c);
}
return __strrchr_chk(s, c, bos);
}
#endif /* defined(__BIONIC_FORTIFY_INLINE) */ #endif /* defined(__BIONIC_FORTIFY_INLINE) */

16
libc/string/strrchr.c
View File

@ -29,13 +29,19 @@
*/ */
#include <string.h> #include <string.h>
#include <private/logd.h>
char * char *
strrchr(const char *p, int ch) __strrchr_chk(const char *p, int ch, size_t s_len)
{ {
char *save; char *save;
for (save = NULL;; ++p) { for (save = NULL;; ++p, s_len--) {
if (s_len == 0) {
__libc_android_log_print(ANDROID_LOG_FATAL, "libc",
"*** FORTIFY_SOURCE strrchr read beyond buffer ***\n");
abort();
}
if (*p == (char) ch) if (*p == (char) ch)
save = (char *)p; save = (char *)p;
if (!*p) if (!*p)
@ -43,3 +49,9 @@ strrchr(const char *p, int ch)
} }
/* NOTREACHED */ /* NOTREACHED */
} }
char *
strrchr(const char *p, int ch)
{
return __strrchr_chk(p, ch, (size_t) -1);
}