From be5c8f1d15403ac1237adbdbddee53fb6d1009e7 Mon Sep 17 00:00:00 2001 From: Julian Seward Date: Sun, 31 Dec 2006 02:26:57 +0000 Subject: [PATCH] Merge r6462 (Intercept/replace glibc-2.5's __strcpy_chk function) git-svn-id: svn://svn.valgrind.org/valgrind/branches/VALGRIND_3_2_BRANCH@6464 --- memcheck/mc_replace_strmem.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/memcheck/mc_replace_strmem.c b/memcheck/mc_replace_strmem.c index 27fe0464d0..fe0a786819 100644 --- a/memcheck/mc_replace_strmem.c +++ b/memcheck/mc_replace_strmem.c @@ -536,6 +536,32 @@ GLIBC232_STRCHRNUL(m_libc_so_star, strchrnul) GLIBC232_RAWMEMCHR(m_libc_so_star, rawmemchr) +/* glibc variant of strcpy that checks the dest is big enough. */ +#define GLIBC25___STRCPY_CHK(soname,fnname) \ + char* VG_REPLACE_FUNCTION_ZU(soname,fnname) \ + (char* dst, const char* src, SizeT len); \ + char* VG_REPLACE_FUNCTION_ZU(soname,fnname) \ + (char* dst, const char* src, SizeT len) \ + { \ + extern void _exit(int status); \ + char* ret = dst; \ + if (! len) \ + goto badness; \ + while ((*dst++ = *src++) != '\0') \ + if (--len == 0) \ + goto badness; \ + return ret; \ + badness: \ + VALGRIND_PRINTF_BACKTRACE( \ + "***buffer overflow detected ***: program terminated"); \ + _exit(127); \ + /*NOTREACHED*/ \ + return NULL; \ + } + +GLIBC25___STRCPY_CHK(m_libc_so_star, __strcpy_chk) + + /*--------------------------------------------------------------------*/ /*--- end ---*/ /*--------------------------------------------------------------------*/ -- 2.47.2