diff options
| author | brain <brain@e03df62e-2008-0410-955e-edbf42e46eb7> | 2008-06-19 23:51:28 +0000 |
|---|---|---|
| committer | brain <brain@e03df62e-2008-0410-955e-edbf42e46eb7> | 2008-06-19 23:51:28 +0000 |
| commit | 6e8677f9254d00541f8e37e88af3adab14638b11 (patch) | |
| tree | c0ebb2200ce86a605f8aa1d3978dc2d7b957b122 | |
| parent | ee5cfbc96c4350e5d5c68c89b85c7c36a861029c (diff) | |
Whos been commiting a quarter of a fix?
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@9925 e03df62e-2008-0410-955e-edbf42e46eb7
| -rw-r--r-- | src/modules/extra/m_ssl_gnutls.cpp | 6 | ||||
| -rw-r--r-- | src/modules/extra/m_ssl_openssl.cpp | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp index 53c242c63..0eb293d27 100644 --- a/src/modules/extra/m_ssl_gnutls.cpp +++ b/src/modules/extra/m_ssl_gnutls.cpp @@ -543,9 +543,9 @@ class ModuleSSLGnuTLS : public Module if(count <= length) { - memcpy(buffer, session->inbuf, count); + memmove(buffer, session->inbuf, count); // Move the stuff left in inbuf to the beginning of it - memcpy(session->inbuf, session->inbuf + count, (length - count)); + memmove(session->inbuf, session->inbuf + count, (length - count)); // Now we need to set session->inbufoffset to the amount of data still waiting to be handed to insp. session->inbufoffset = length - count; // Insp uses readresult as the count of how much data there is in buffer, so: @@ -554,7 +554,7 @@ class ModuleSSLGnuTLS : public Module else { // There's not as much in the inbuf as there is space in the buffer, so just copy the whole thing. - memcpy(buffer, session->inbuf, length); + memmove(buffer, session->inbuf, length); // Zero the offset, as there's nothing there.. session->inbufoffset = 0; // As above diff --git a/src/modules/extra/m_ssl_openssl.cpp b/src/modules/extra/m_ssl_openssl.cpp index 70da472a3..0c9307ae4 100644 --- a/src/modules/extra/m_ssl_openssl.cpp +++ b/src/modules/extra/m_ssl_openssl.cpp @@ -525,9 +525,9 @@ class ModuleSSLOpenSSL : public Module { if (count <= session->inbufoffset) { - memcpy(buffer, session->inbuf, count); + memmove(buffer, session->inbuf, count); // Move the stuff left in inbuf to the beginning of it - memcpy(session->inbuf, session->inbuf + count, (session->inbufoffset - count)); + memmove(session->inbuf, session->inbuf + count, (session->inbufoffset - count)); // Now we need to set session->inbufoffset to the amount of data still waiting to be handed to insp. session->inbufoffset -= count; // Insp uses readresult as the count of how much data there is in buffer, so: @@ -536,7 +536,7 @@ class ModuleSSLOpenSSL : public Module else { // There's not as much in the inbuf as there is space in the buffer, so just copy the whole thing. - memcpy(buffer, session->inbuf, session->inbufoffset); + memmove(buffer, session->inbuf, session->inbufoffset); readresult = session->inbufoffset; // Zero the offset, as there's nothing there.. |