[Pkg-apache-commits] r1209 - in /trunk/apache2: changelog patches/00list patches/083_mod_ssl_memcpy.dpatch

[sf at alioth.debian.org]

Author: sf
Date: Sat Jul 24 19:34:04 2010
New Revision: 1209

URL: http://svn.debian.org/wsvn/pkg-apache/?sc=1&rev=1209
Log:
Fix mod_ssl header line corruption because of using memcpy for overlapping
buffers

Added:
    trunk/apache2/patches/083_mod_ssl_memcpy.dpatch   (with props)
Modified:
    trunk/apache2/changelog
    trunk/apache2/patches/00list

Modified: trunk/apache2/changelog
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/changelog?rev=1209&op=diff
==============================================================================
--- trunk/apache2/changelog (original)
+++ trunk/apache2/changelog Sat Jul 24 19:34:04 2010
@@ -6,6 +6,8 @@
     - mod_dir: add FallbackResource directive, to enable admin to specify
       an action to happen when a URL maps to no file, without resorting
       to ErrorDocument or mod_rewrite
+  * Fix mod_ssl header line corruption because of using memcpy for overlapping
+    buffers. PR 45444. LP: #609290, #589611, #595116
 
  -- Stefan Fritsch <sf at debian.org>  Sat, 24 Jul 2010 21:00:10 +0200
 

Modified: trunk/apache2/patches/00list
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/patches/00list?rev=1209&op=diff
==============================================================================
--- trunk/apache2/patches/00list (original)
+++ trunk/apache2/patches/00list Sat Jul 24 19:34:04 2010
@@ -25,6 +25,7 @@
 079_polish_translation.dpatch
 080_mod_reqtimeout_fixes.dpatch
 082_ab_num_requests
+083_mod_ssl_memcpy.dpatch
 099_config_guess_sub_update
 200_cp_suexec.dpatch
 201_build_suexec-custom.dpatch

Added: trunk/apache2/patches/083_mod_ssl_memcpy.dpatch
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/patches/083_mod_ssl_memcpy.dpatch?rev=1209&op=file
==============================================================================
--- trunk/apache2/patches/083_mod_ssl_memcpy.dpatch (added)
+++ trunk/apache2/patches/083_mod_ssl_memcpy.dpatch Sat Jul 24 19:34:04 2010
@@ -1,0 +1,29 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 082_mod_ssl_memcpy.dpatch by Stefan Fritsch <sf at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Use memmove for overlapping buffers
+## DP: http://issues.apache.org/bugzilla/show_bug.cgi?id=45444
+## DP: http://svn.apache.org/viewvc?rev=683280&view=rev
+## DP: LP: https://bugs.launchpad.net/bugs/609290
+
+ at DPATCH@
+diff -urNad trunk~/modules/ssl/ssl_engine_io.c trunk/modules/ssl/ssl_engine_io.c
+--- trunk~/modules/ssl/ssl_engine_io.c	2010-03-01 22:27:17.000000000 +0100
++++ trunk/modules/ssl/ssl_engine_io.c	2010-07-24 21:26:55.763976033 +0200
+@@ -352,13 +352,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;

Propchange: trunk/apache2/patches/083_mod_ssl_memcpy.dpatch
------------------------------------------------------------------------------
    svn:executable = *