You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Daniel Shahaf <d....@daniel.shahaf.name> on 2010/06/24 16:46:57 UTC

Re: svn commit: r957587 - in /subversion/trunk/subversion: libsvn_ra_svn/client.c libsvn_ra_svn/protocol svnserve/serve.c

danielsh@apache.org wrote on Thu, 24 Jun 2010 at 18:52 -0000:
> Modified: subversion/trunk/subversion/svnserve/serve.c
> URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnserve/serve.c?rev=957587&r1=957586&r2=957587&view=diff
> ==============================================================================
> --- subversion/trunk/subversion/svnserve/serve.c (original)
> +++ subversion/trunk/subversion/svnserve/serve.c Thu Jun 24 15:52:26 2010
> @@ -2577,7 +2577,7 @@ static svn_error_t *get_locks(svn_ra_svn
>    apr_hash_t *locks;
>    apr_hash_index_t *hi;
>  
> -  SVN_ERR(svn_ra_svn_parse_tuple(params, pool, "c?w", &path, &depth_word));
> +  SVN_ERR(svn_ra_svn_parse_tuple(params, pool, "c?(?w)", &path, &depth_word));
>  
>    depth = depth_word ? svn_depth_from_word(depth_word) : svn_depth_infinity;

Need to check here that depth >= svn_depth_empty.  (otherwise
libsvn_repos would assert).

CCing myself so I don't forget.

>    full_path = svn_uri_join(b->fs_path->data,
> 
> 
> 

Re: svn commit: r957587 - in /subversion/trunk/subversion: libsvn_ra_svn/client.c libsvn_ra_svn/protocol svnserve/serve.c

Posted by "C. Michael Pilato" <cm...@collab.net>.
Daniel Shahaf wrote:
> danielsh@apache.org wrote on Thu, 24 Jun 2010 at 18:52 -0000:
>> Modified: subversion/trunk/subversion/svnserve/serve.c
>> URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnserve/serve.c?rev=957587&r1=957586&r2=957587&view=diff
>> ==============================================================================
>> --- subversion/trunk/subversion/svnserve/serve.c (original)
>> +++ subversion/trunk/subversion/svnserve/serve.c Thu Jun 24 15:52:26 2010
>> @@ -2577,7 +2577,7 @@ static svn_error_t *get_locks(svn_ra_svn
>>    apr_hash_t *locks;
>>    apr_hash_index_t *hi;
>>  
>> -  SVN_ERR(svn_ra_svn_parse_tuple(params, pool, "c?w", &path, &depth_word));
>> +  SVN_ERR(svn_ra_svn_parse_tuple(params, pool, "c?(?w)", &path, &depth_word));
>>  
>>    depth = depth_word ? svn_depth_from_word(depth_word) : svn_depth_infinity;
> 
> Need to check here that depth >= svn_depth_empty.  (otherwise
> libsvn_repos would assert).
> 
> CCing myself so I don't forget.

I just double-checked mod_dav_svn -- it returns a graceful error on a bad
depth.  I must have overlooked this in svnserve.

-- 
C. Michael Pilato <cm...@collab.net>
CollabNet   <>   www.collab.net   <>   Distributed Development On Demand