Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-31 08:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a bug - memmove() couldn't handle overlapping buffers

Browse source 
svn path=/trunk/; revision=990
This commit is contained in:
Eric Kohl 2000-02-19 17:18:34 +00:00
parent b0780ae5d6
commit f28a023c99
2 changed files with 47 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
reactos/lib/ntdll/string/memmove.c
View file

@ -1,18 +1,36 @@
#include <string.h> #include <string.h>
void * memmove(void *dest,const void *src,size_t count) void * memmove(void *dest,const void *src,size_t count)
{ {
char *char_dest = (char *)dest; char *char_dest = (char *)dest;
char *char_src = (char *)src; char *char_src = (char *)src;
while(count > 0 ) if ((char_dest <= char_src) || (char_dest >= (char_src+count)))
{ {
*char_dest = *char_src; /* non-overlapping buffers */
char_dest++; while(count > 0)
char_src++; {
count--; *char_dest = *char_src;
char_dest++;
char_src++;
count--;
}
}
else
{
/* overlaping buffers */
char_dest = (char *)dest + count - 1;
char_src = (char *)src + count - 1;
while(count > 0)
{
*char_dest = *char_src;
char_dest--;
char_src--;
count--;
}
} }
return dest; return dest;
} }

29
reactos/ntoskrnl/rtl/memmove.c
View file

@ -1,17 +1,34 @@
#include <string.h> #include <string.h>
void * memmove(void *dest,const void *src,size_t count) void * memmove(void *dest,const void *src,size_t count)
{ {
char *char_dest = (char *)dest; char *char_dest = (char *)dest;
char *char_src = (char *)src; char *char_src = (char *)src;
while(count > 0 ) if ((char_dest <= char_src) || (char_dest >= (char_src+count)))
{ {
*char_dest = *char_src; /* non-overlapping buffers */
char_dest++; while(count > 0)
char_src++; {
count--; *char_dest = *char_src;
char_dest++;
char_src++;
count--;
}
}
else
{
/* overlaping buffers */
char_dest = (char *)dest + count - 1;
char_src = (char *)src + count - 1;
while(count > 0)
{
*char_dest = *char_src;
char_dest--;
char_src--;
count--;
}
} }
return dest; return dest;