zenithsiz/ftmemsim-valgrind
1
0
Fork 0
mirror of https://github.com/Zenithsiz/ftmemsim-valgrind.git synced 2026-02-03 01:51:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed bug in overlap check in strncpy() -- it was assuming the src was 'n'

Browse Source 
bytes longs, when it could be shorter, which could cause false positives.

Added an example of this to the regtest.

MERGE TO STABLE


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@1983
This commit is contained in:
Nicholas Nethercote 2003-11-02 17:43:27 +00:00
parent 9c8cc2ba2b
commit bbfc62ea8c
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
memcheck/mac_replace_strmem.c
View File

@ -186,13 +186,15 @@ char* strcpy ( char* dst, const char* src )
char* strncpy ( char* dst, const char* src, int n )
{
Char* dst_orig = dst;
const Char* src_orig = src;
Char* dst_orig = dst;
Int m = 0;
if (is_overlap(dst, src, n, n))
complain3("strncpy", dst, src, n);
while (m < n && *src) { m++; *dst++ = *src++; }
/* Check for overlap after copying; all n bytes of dst are relevant,
but only m+1 bytes of src if terminator was found */
if (is_overlap(dst_orig, src_orig, n, (m < n) ? m+1 : n))
complain3("strncpy", dst, src, n);
while (m++ < n) *dst++ = 0; /* must pad remainder with nulls */
return dst_orig;

9
memcheck/tests/overlap.c
View File

@ -112,5 +112,14 @@ int main(void)
strncat(a+20, a, 21); // run twice to check 2nd error isn't shown
strncat(a, a+20, 21);
/* This is ok, but once gave a warning when strncpy() was wrong,
and used 'n' for the length, even when the src was shorter than 'n' */
{
char dest[64];
char src [16];
strcpy( src, "short" );
strncpy( dest, src, 20 );
}
return 0;
}