svn commit: r1589564 - in /subversion/branches/1.7.x: ./ STATUS subversion/libsvn_delta/svndiff.c

[sv...@apache.org]

Author: svn-role
Date: Thu Apr 24 04:00:27 2014
New Revision: 1589564

URL: http://svn.apache.org/r1589564
Log:
Merge r1587968 from trunk, with --accept=mine-conflict:

 * r1587968
   Maintain data[len]=0 invariant for svn_string_t.
   Justification:
     Code may rely on null byte being present.
   Notes:
     Triggers a read beyond allocated memory on trunk but no known
     misbehaviour on 1.7.
     Merge with --accept=mine-conflict.
   Votes:
     +1: philip, rhuijben, stefan2

Modified:
    subversion/branches/1.7.x/   (props changed)
    subversion/branches/1.7.x/STATUS
    subversion/branches/1.7.x/subversion/libsvn_delta/svndiff.c

Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
  Merged /subversion/trunk:r1587968

Modified: subversion/branches/1.7.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1589564&r1=1589563&r2=1589564&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Thu Apr 24 04:00:27 2014
@@ -163,17 +163,6 @@ Approved changes:
    Votes:
      +1: philip, rhuijben, stefan2
 
- * ^/subversion/branches/1.7.x-serf-1.3.x-Windows
-   Allow compiling against Serf 1.3.x
-   Notes:
-     Backport of the 1.8 fixes, plus a few more fixes in order not to
-     break the neon compilation which also hooks into zlib.
-   Justification:
-     (Without this patch the Windows buildbot remains broken for serf with 1.7,
-      as recent Subversion versions require serf 1.3.x)
-   Votes:
-     +1: rhuijben, jcorvel, stefan2
-
  * ^/subversion/branches/1.7.x-r1551579
    Fix moving files from externals to ancestor directories and vice versa.
    Justification:

Modified: subversion/branches/1.7.x/subversion/libsvn_delta/svndiff.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_delta/svndiff.c?rev=1589564&r1=1589563&r2=1589564&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/libsvn_delta/svndiff.c (original)
+++ subversion/branches/1.7.x/subversion/libsvn_delta/svndiff.c Thu Apr 24 04:00:27 2014
@@ -647,7 +647,13 @@ decode_window(svn_txdelta_window_t *wind
     }
   else
     {
-      new_data->data = (const char *) insend;
+      /* Copy the data because an svn_string_t must have the invariant
+         data[len]=='\0'. */
+      char *buf = apr_palloc(pool, newlen + 1);
+
+      memcpy(buf, insend, newlen);
+      buf[newlen] = '\0';
+      new_data->data = buf;
       new_data->len = newlen;
     }