From: Julian Seward <jseward@acm.org>
Date: Sat, 27 Jan 2007 00:49:44 +0000 (+0000)
Subject: Intercept __stpcpy_chk.  (Dirk Mueller)
X-Git-Tag: svn/VALGRIND_3_3_0~406
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dfad5c3381776b7db75f0f77c407398c18572161;p=thirdparty%2Fvalgrind.git

Intercept __stpcpy_chk.  (Dirk Mueller)


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@6553
---

diff --git a/memcheck/mc_replace_strmem.c b/memcheck/mc_replace_strmem.c
index 72dba66ee2..6195b563fc 100644
--- a/memcheck/mc_replace_strmem.c
+++ b/memcheck/mc_replace_strmem.c
@@ -568,6 +568,31 @@ GLIBC232_RAWMEMCHR(m_libc_soname, rawmemchr)
 GLIBC25___STRCPY_CHK(m_libc_soname, __strcpy_chk)
 
 
+/* glibc variant of stpcpy that checks the dest is big enough. */
+#define GLIBC25___STPCPY_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); \
+      do { \
+         if (len-- == 0) \
+            goto badness; \
+         *dst++ = *src; \
+      } while (*src++ != '\0'); \
+      return dst - 1; \
+     badness: \
+      VALGRIND_PRINTF_BACKTRACE( \
+         "***buffer overflow detected ***: program terminated"); \
+     _exit(127); \
+     /*NOTREACHED*/ \
+     return NULL; \
+   }
+
+GLIBC25___STPCPY_CHK(m_libc_soname, __stpcpy_chk)
+
+
 /* mempcpy */
 #define GLIBC25_MEMPCPY(soname, fnname) \
    void* VG_REPLACE_FUNCTION_ZU(soname,fnname) \