[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: 1.6.8 up for signing / testing

From: Philip Martin <philip.martin_at_wandisco.com>
Date: Thu, 14 Jan 2010 13:15:01 +0000

Philip Martin <philip.martin_at_wandisco.com> writes:

> I can reproduce as follows:
>
> $ rm -rf repo
> $ svnadmin create repo
> $ svn mkdir -mm http://localhost/repo/A
> $ svn copy -mm http://localhost/repo/A http://localhost/repo/B
> lt-svn: ../src-1.6/subversion/libsvn_subr/path.c:955: svn_path_url_add_component2: Assertion `svn_path_is_canonical(url, pool)' failed.
> Aborted

The crash occurs in code added in r889935, the 1.6.x-issue3519 merge,
although whether this revision introduced the problem or just
uncovered an existing bug I'm not sure. The following change to
svn_ra_serf__get_baseline_info fixes the crash:

Index: ../src-1.6/subversion/libsvn_ra_serf/property.c
===================================================================
--- ../src-1.6/subversion/libsvn_ra_serf/property.c (revision 898492)
+++ ../src-1.6/subversion/libsvn_ra_serf/property.c (working copy)
@@ -985,6 +985,8 @@
                                 "requested baseline-collection value"));
     }
 
+ basecoll_url = svn_path_canonicalize(basecoll_url, pool);
+
   if (latest_revnum)
     {
       const char *version_name;

A similar line is already present in trunk, although there it calls
svn_uri_canonicalize which is not available in 1.6.

-- 
Philip
Received on 2010-01-14 14:15:41 CET

This is an archived mail posted to the Subversion Dev mailing list.