arne
/
cryptopp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Cleared UBsan error on non-null pointers being used with memcpy and memmove from library functions memcpy_s and memmove_s

pull/35/head
Jeffrey Walton 2015-07-17 21:09:42 -04:00
parent 134ba3e16b
commit 5f299d76a0
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
misc.h
View File

@ -174,14 +174,22 @@ inline void memcpy_s(void *dest, size_t sizeInBytes, const void *src, size_t cou
{ {
if (count > sizeInBytes) if (count > sizeInBytes)
throw InvalidArgument("memcpy_s: buffer overflow"); throw InvalidArgument("memcpy_s: buffer overflow");
memcpy(dest, src, count);
// TODO: fix callers. Its easier than it sounds because of the way
// Put and Put2 are used in filters.
if(dest && src && count)
memcpy(dest, src, count);
} }
inline void memmove_s(void *dest, size_t sizeInBytes, const void *src, size_t count) inline void memmove_s(void *dest, size_t sizeInBytes, const void *src, size_t count)
{ {
if (count > sizeInBytes) if (count > sizeInBytes)
throw InvalidArgument("memmove_s: buffer overflow"); throw InvalidArgument("memmove_s: buffer overflow");
memmove(dest, src, count);
// TODO: fix callers. Its easier than it sounds because of the way
// Put and Put2 are used in filters.
if(dest && src && count)
memmove(dest, src, count);
} }
#if __BORLANDC__ >= 0x620 #if __BORLANDC__ >= 0x620