On Fri, Feb 11, 2011 at 16:57, <hwright_at_apache.org> wrote:
>...
> +++ subversion/trunk/subversion/libsvn_wc/wc_db.c Fri Feb 11 21:57:29 2011
>...
> @@ -7265,17 +7270,22 @@ svn_wc__db_temp_set_access(svn_wc__db_t
> svn_wc_adm_access_t *adm_access,
> apr_pool_t *scratch_pool)
> {
> - svn_wc__db_pdh_t *pdh;
> + const char *local_relpath;
> + svn_wc__db_wcroot_t *wcroot;
>
> SVN_ERR_ASSERT_NO_RETURN(svn_dirent_is_absolute(local_dir_abspath));
> /* ### assert that we were passed a directory? */
>
> - pdh = svn_wc__db_pdh_get_or_create(db, local_dir_abspath, TRUE,
> - scratch_pool);
> + svn_error_clear(svn_wc__db_wcroot_parse_local_abspath(&wcroot, &local_relpath,
> + db, local_dir_abspath, svn_sqlite__mode_readwrite,
> + scratch_pool, scratch_pool));
>
> /* Better not override something already there. */
> - SVN_ERR_ASSERT_NO_RETURN(pdh->adm_access == NULL);
> - pdh->adm_access = adm_access;
> + SVN_ERR_ASSERT_NO_RETURN(apr_hash_get(wcroot->access_cache,
In r1069978, you checked the error result before attempted to use
wcroot. Shouldn't you do the same on these other adm_access functions?
>...
Cheers,
-g
Received on 2011-02-23 20:58:37 CET