← Back to branch summary

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

« back to all changes in this revision

Viewing changes to subversion/libsvn_wc/lock.c

  • Committer: Package Import Robot
  • Author(s): James McCoy
  • Date: 2015-08-07 21:32:47 UTC
  • mfrom: (0.2.15) (4.1.7 experimental)
  • Revision ID: package-import@ubuntu.com-20150807213247-ozyewtmgsr6tkewl
Tags: 1.9.0-1
http://bugs.debian.org/791844
* Upload to unstable
* New upstream release.
  + Security fixes
    - CVE-2015-3184: Mixed anonymous/authenticated path-based authz with
      httpd 2.4
    - CVE-2015-3187: svn_repos_trace_node_locations() reveals paths hidden
      by authz
* Add >= 2.7 requirement for python-all-dev Build-Depends, needed to run
  tests.
* Remove Build-Conflicts against ruby-test-unit.  (Closes: #791844)
* Remove patches/apache_module_dependency in favor of expressing the
  dependencies in authz_svn.load/dav_svn.load.
* Build-Depend on apache2-dev (>= 2.4.16) to ensure ap_some_authn_required()
  is available when building mod_authz_svn and Depend on apache2-bin (>=
  2.4.16) for runtime support.

Show diffs side-by-side

added added

removed removed

Lines of Context:
subversion/libsvn_wc/lock.c
1211
1211
          if (disjoint)
1212
1212
            {
1213
1213
              /* Switched or disjoint, so drop P_ACCESS. Don't close any
1214
 
                 descendents, or we might blast the child.  */
 
1214
                 descendants, or we might blast the child.  */
1215
1215
              err = close_single(p_access, FALSE /* preserve_lock */, pool);
1216
1216
              if (err)
1217
1217
                {
1308
1308
      /* Gather all the opened access batons from the DB.  */
1309
1309
      opened = svn_wc__db_temp_get_all_access(adm_access->db, scratch_pool);
1310
1310
 
1311
 
      /* Close any that are descendents of this baton.  */
 
1311
      /* Close any that are descendants of this baton.  */
1312
1312
      for (hi = apr_hash_first(scratch_pool, opened);
1313
1313
           hi;
1314
1314
           hi = apr_hash_next(hi))
1315
1315
        {
1316
 
          const char *abspath = svn__apr_hash_index_key(hi);
1317
 
          svn_wc_adm_access_t *child = svn__apr_hash_index_val(hi);
 
1316
          const char *abspath = apr_hash_this_key(hi);
 
1317
          svn_wc_adm_access_t *child = apr_hash_this_val(hi);
1318
1318
          const char *path = child->path;
1319
1319
 
1320
1320
          if (IS_MISSING(child))
1630
1630
                                                scratch_pool, scratch_pool));
1631
1631
 
1632
1632
      /* It's possible for the required lock path to be an ancestor
1633
 
         of, a descendent of, or equal to, the obtained lock path. If
 
1633
         of, a descendant of, or equal to, the obtained lock path. If
1634
1634
         it's an ancestor we have to try again, otherwise the obtained
1635
1635
         lock will do. */
1636
1636
      child = svn_dirent_skip_ancestor(required_abspath, obtained_abspath);
1643
1643
        }
1644
1644
      else
1645
1645
        {
1646
 
          /* required should be a descendent of, or equal to, obtained */
 
1646
          /* required should be a descendant of, or equal to, obtained */
1647
1647
          SVN_ERR_ASSERT(!strcmp(required_abspath, obtained_abspath)
1648
1648
                         || svn_dirent_skip_ancestor(obtained_abspath,
1649
1649
                                                     required_abspath));