diff options
author | rcritten <> | 2011-01-12 19:43:23 +0000 |
---|---|---|
committer | rcritten <> | 2011-01-12 19:43:23 +0000 |
commit | 4aba0ec7bb0902870e50994a8d52427ddf3d3ec6 (patch) | |
tree | 5162e1e39c8e4f9e688b89ef1677871ee798d950 /nss_engine_io.c | |
parent | cb1d3ff69a065f176c6d953592287c0f8c6d4656 (diff) | |
download | mod_nss-4aba0ec7bb0902870e50994a8d52427ddf3d3ec6.tar.gz mod_nss-4aba0ec7bb0902870e50994a8d52427ddf3d3ec6.tar.xz mod_nss-4aba0ec7bb0902870e50994a8d52427ddf3d3ec6.zip |
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.
Diffstat (limited to 'nss_engine_io.c')
-rw-r--r-- | nss_engine_io.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nss_engine_io.c b/nss_engine_io.c index e31bfc1..c9697ec 100644 --- a/nss_engine_io.c +++ b/nss_engine_io.c @@ -123,13 +123,13 @@ static int char_buffer_read(char_buffer_t *buffer, char *in, int inl) 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; |