← Back to branch summary

~ubuntu-branches/debian/sid/subversion/sid

« back to all changes in this revision

Viewing changes to subversion/libsvn_delta/svndiff.c

  • Committer: Package Import Robot
  • Author(s): James McCoy
  • Date: 2014-05-20 22:45:32 UTC
  • mfrom: (0.2.12)
  • Revision ID: package-import@ubuntu.com-20140520224532-4fec3gohdzyy692g
Tags: 1.8.9-1
* New upstream release
* Merge changes from Ubuntu:
  - Add DEB-8 test for Apache functionality
  - debian/rules: Create pot file on build.
  - debian/rules: Ensure the doxygen output directory exists
  - Move svn2cl to subversion-tools' Suggests on Ubuntu.

Show diffs side-by-side

added added

removed removed

Lines of Context:
subversion/libsvn_delta/svndiff.c
723
723
      svn_stringbuf_t *instout = svn_stringbuf_create_empty(pool);
724
724
      svn_stringbuf_t *ndout = svn_stringbuf_create_empty(pool);
725
725
 
726
 
      /* these may in fact simply return references to insend */
727
 
 
728
726
      SVN_ERR(zlib_decode(insend, newlen, ndout,
729
727
                          SVN_DELTA_WINDOW_SIZE));
730
728
      SVN_ERR(zlib_decode(data, insend - data, instout,
739
737
    }
740
738
  else
741
739
    {
742
 
      new_data->data = (const char *) insend;
 
740
      /* Copy the data because an svn_string_t must have the invariant
 
741
         data[len]=='\0'. */
 
742
      char *buf = apr_palloc(pool, newlen + 1);
 
743
 
 
744
      memcpy(buf, insend, newlen);
 
745
      buf[newlen] = '\0';
 
746
      new_data->data = buf;
743
747
      new_data->len = newlen;
744
748
    }
745
749