Add an implementation of strnlen for memcheck, from Tom Hughes.

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

diff --git a/coregrind/vg_symtab2.c b/coregrind/vg_symtab2.c
index a6e6bc955cd55b69829e55348cc27971634f597c..393f8bdc53b9011ddb0963b5b34c4f0cab43e13d 100644 (file)
--- a/coregrind/vg_symtab2.c
+++ b/coregrind/vg_symtab2.c
@@ -2199,6 +2199,8 @@ void VG_(setup_code_redirect_table) ( void )
     */
    VG_(add_redirect_sym)("soname:libc.so.6", "stpcpy",
                         "*vgpreload_memcheck.so*", "stpcpy");
+   VG_(add_redirect_sym)("soname:libc.so.6", "strnlen",
+                        "*vgpreload_memcheck.so*", "strnlen");
 
    VG_(add_redirect_sym)("soname:ld-linux.so.2", "stpcpy",
                         "*vgpreload_memcheck.so*", "stpcpy");

diff --git a/memcheck/mac_replace_strmem.c b/memcheck/mac_replace_strmem.c
index 8f7acd7d6902cffc6b51b8dfc3399031080465ac..e49fe9c1ddb47b941b8cd703023c44b387785e61 100644 (file)
--- a/memcheck/mac_replace_strmem.c
+++ b/memcheck/mac_replace_strmem.c
@@ -176,6 +176,13 @@ char* strncat ( char* dst, const char* src, int n )
    return dst_orig;
 }
 
+unsigned int strnlen ( const char* str, unsigned int n )
+{
+   UInt i = 0;
+   while (i < n && str[i] != 0) i++;
+   return i;
+}
+
 unsigned int strlen ( const char* str )
 {
    UInt i = 0;