summaryrefslogtreecommitdiffstats
path: root/mod_nss-overlapping_memcpy.patch
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2012-06-13 18:43:31 +0200
committerRemi Collet <fedora@famillecollet.com>2012-06-13 18:43:31 +0200
commitdf36bf3f7525e3d29d7e9ea8fb4d0cc33f1075c2 (patch)
tree5f0820f0dd869640e371ca82c42bc2c161539f0c /mod_nss-overlapping_memcpy.patch
reorg repo
Diffstat (limited to 'mod_nss-overlapping_memcpy.patch')
-rw-r--r--mod_nss-overlapping_memcpy.patch24
1 files changed, 24 insertions, 0 deletions
diff --git a/mod_nss-overlapping_memcpy.patch b/mod_nss-overlapping_memcpy.patch
new file mode 100644
index 0000000..c60e435
--- /dev/null
+++ b/mod_nss-overlapping_memcpy.patch
@@ -0,0 +1,24 @@
+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
+
+--- mod_nss-1.0.8.orig/nss_engine_io.c 2011-01-12 12:31:27.339425702 -0500
++++ mod_nss-1.0.8/nss_engine_io.c 2011-01-12 12:31:35.507405595 -0500
+@@ -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;