[389-commits] mod_nss nss_engine_io.c,1.12,1.13

[Rob Crittenden]

Author: rcritten

Update of /cvs/dirsec/mod_nss
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv20681

Modified Files:
	nss_engine_io.c 
Log Message:
Bug 669118

memcpy of overlapping memory is no longer allowed by glibc.

This is mod_ssl bug https://issues.apache.org/bugzilla/show_bug.cgi?id=45444

Patch ported by Stephen Gallagher.



Index: nss_engine_io.c
===================================================================
RCS file: /cvs/dirsec/mod_nss/nss_engine_io.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- nss_engine_io.c	24 Sep 2010 02:06:57 -0000	1.12
+++ nss_engine_io.c	12 Jan 2011 19:43:23 -0000	1.13
@@ -123,13 +123,13 @@
 
     if (buffer->length > inl) {
         /* we have have enough to fill the caller's buffer */
-        memcpy(in, buffer->value, inl);
+        memmove(in, buffer->value, inl);
         buffer->value += inl;
         buffer->length -= inl;
     }
     else {
         /* swallow remainder of the buffer */
-        memcpy(in, buffer->value, buffer->length);
+        memmove(in, buffer->value, buffer->length);
         inl = buffer->length;
         buffer->value = NULL;
         buffer->length = 0;