← Back to branch summary

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

« back to all changes in this revision

Viewing changes to subversion/libsvn_wc/diff_local.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_wc/diff_local.c
116
116
  apr_pool_t *ns_pool;
117
117
  if (!eb->cur)
118
118
    {
119
 
      if (!svn_dirent_is_ancestor(eb->anchor_abspath, local_abspath))
 
119
      const char *relpath;
 
120
 
 
121
      relpath = svn_dirent_skip_ancestor(eb->anchor_abspath, local_abspath);
 
122
      if (! relpath)
120
123
        return SVN_NO_ERROR;
121
124
 
122
 
      SVN_ERR(ensure_state(eb,
123
 
                           svn_dirent_dirname(local_abspath,scratch_pool),
124
 
                           FALSE,
125
 
                           scratch_pool));
 
125
      /* Don't recurse on the anchor, as that might loop infinately because
 
126
            svn_dirent_dirname("/",...)   -> "/"
 
127
            svn_dirent_dirname("C:/",...) -> "C:/" (Windows) */
 
128
      if (*relpath)
 
129
        SVN_ERR(ensure_state(eb,
 
130
                             svn_dirent_dirname(local_abspath,scratch_pool),
 
131
                             FALSE,
 
132
                             scratch_pool));
126
133
    }
127
134
  else if (svn_dirent_is_child(eb->cur->local_abspath, local_abspath, NULL))
128
135
    SVN_ERR(ensure_state(eb, svn_dirent_dirname(local_abspath,scratch_pool),