From 1c6c4ff94e8176d8c1bf895f3cbbad7de3536037 Mon Sep 17 00:00:00 2001 From: Florian Krohm Date: Sat, 27 Sep 2014 18:47:07 +0000 Subject: [PATCH] Merge r14209 from BUF_REMOVAL branch to trunk. In VG_(redir_notify_new_DebugInfo) use a large enough buffer allocated on the stack. git-svn-id: svn://svn.valgrind.org/valgrind/trunk@14581 --- coregrind/m_redir.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/coregrind/m_redir.c b/coregrind/m_redir.c index c0c6338e06..4d41aece34 100644 --- a/coregrind/m_redir.c +++ b/coregrind/m_redir.c @@ -451,15 +451,15 @@ void VG_(redir_notify_new_DebugInfo)( DebugInfo* newdi ) pointing to files inside the valgrind build directories. */ struct vg_stat newdi_stat; SysRes newdi_res; - HChar in_vglib_filename[VKI_PATH_MAX]; struct vg_stat in_vglib_stat; SysRes in_vglib_res; newdi_res = VG_(stat)(newdi_filename, &newdi_stat); - - VG_(strncpy) (in_vglib_filename, VG_(libdir), VKI_PATH_MAX); - VG_(strncat) (in_vglib_filename, "/", VKI_PATH_MAX); - VG_(strncat) (in_vglib_filename, newdi_basename, VKI_PATH_MAX); + + HChar in_vglib_filename[VG_(strlen)(VG_(libdir)) + 1 + + VG_(strlen)(newdi_basename) + 1]; + VG_(sprintf)("%s/%s", VG_(libdir), newdi_basename); + in_vglib_res = VG_(stat)(in_vglib_filename, &in_vglib_stat); /* If we find newdi_basename in inner VALGRIND_LIB -- 2.47.2