← Back to branch summary

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

« back to all changes in this revision

Viewing changes to subversion/libsvn_subr/io.c

  • Committer: Package Import Robot
  • Author(s): James McCoy
  • Date: 2014-02-20 20:38:10 UTC
  • mfrom: (0.2.11)
  • Revision ID: package-import@ubuntu.com-20140220203810-w61omsda8fs70pta
Tags: 1.8.8-1
http://bugs.debian.org/738840
http://bugs.debian.org/738841
http://bugs.debian.org/735446
http://bugs.debian.org/737815
http://bugs.debian.org/508147
http://bugs.debian.org/738650
* New upstream release.  Refresh patches.
  - Remove backported patches sqlite_3.8.x_workaround & swig-pl_build_fix
  - Fix integer overflows with 32-bit svnserv, which could cause an infinite
    loop (Closes: #738840) or inaccurate statistics (Closes: #738841)
  - Work around SQLite not honoring umask when creating rep-cache.db.
    (Closes: #735446)
  - Includes security fix:
    + CVE-2014-0032: mod_dav_svn crash when handling certain requests with
      SVNListParentPath on  (Closes: #737815)
* Add a subversion-dbg package.  (Closes: #508147)
* Bump libdb5.1-dev → libdb5.3-dev  (Closes: #738650)

Show diffs side-by-side

added added

removed removed

Lines of Context:
subversion/libsvn_subr/io.c
1533
1533
    {
1534
1534
      if (enable_write) /* Make read-write. */
1535
1535
        {
1536
 
          apr_file_t *fd;
1537
 
 
1538
 
          /* Get the perms for the original file so we'll have any other bits
1539
 
           * that were already set (like the execute bits, for example). */
1540
 
          SVN_ERR(svn_io_file_open(&fd, path, APR_READ,
1541
 
                                   APR_OS_DEFAULT, pool));
1542
 
          SVN_ERR(merge_default_file_perms(fd, &perms_to_set, pool));
1543
 
          SVN_ERR(svn_io_file_close(fd, pool));
 
1536
          /* Tweak the owner bits only. The group/other bits aren't safe to
 
1537
           * touch because we may end up setting them in undesired ways. */
 
1538
          perms_to_set |= (APR_UREAD|APR_UWRITE);
1544
1539
        }
1545
1540
      else
1546
1541
        {
4289
4284
 
4290
4285
      /* As long as a file is not at the end yet, and it is still
4291
4286
       * potentially identical to another file, we read the next chunk.*/
4292
 
      if (!eof1 && (identical_p12 || identical_p13))
 
4287
      if (!eof1 && (*identical_p12 || *identical_p13))
4293
4288
        {
4294
4289
          err = svn_io_file_read_full2(file1_h, buf1,
4295
4290
                                   SVN__STREAM_CHUNK_SIZE, &bytes_read1,
4299
4294
          read_1 = TRUE;
4300
4295
        }
4301
4296
 
4302
 
      if (!eof2 && (identical_p12 || identical_p23))
 
4297
      if (!eof2 && (*identical_p12 || *identical_p23))
4303
4298
        {
4304
4299
          err = svn_io_file_read_full2(file2_h, buf2,
4305
4300
                                   SVN__STREAM_CHUNK_SIZE, &bytes_read2,
4309
4304
          read_2 = TRUE;
4310
4305
        }
4311
4306
 
4312
 
      if (!eof3 && (identical_p13 || identical_p23))
 
4307
      if (!eof3 && (*identical_p13 || *identical_p23))
4313
4308
        {
4314
4309
          err = svn_io_file_read_full2(file3_h, buf3,
4315
4310
                                   SVN__STREAM_CHUNK_SIZE, &bytes_read3,