[Valgrind-developers] Valgrind: r14209 - /branches/BUF_REMOVAL/coregrind/m_redir.c

[<sv...@va...>]

Author: florian
Date: Wed Jul 30 11:56:59 2014
New Revision: 14209

Log:
In VG_(redir_notify_new_DebugInfo) use a large enough buffer
allocated on the stack.

Modified:
    branches/BUF_REMOVAL/coregrind/m_redir.c

Modified: branches/BUF_REMOVAL/coregrind/m_redir.c
==============================================================================
--- branches/BUF_REMOVAL/coregrind/m_redir.c (original)
+++ branches/BUF_REMOVAL/coregrind/m_redir.c Wed Jul 30 11:56:59 2014
@@ -445,15 +445,15 @@
             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