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

Re: svn commit: r38329 - trunk/subversion/libsvn_client

From: Hyrum K. Wright <hyrum_at_hyrumwright.org>
Date: Mon, 6 Jul 2009 10:37:17 -0500

On Jul 5, 2009, at 12:05 PM, Greg Stein wrote:

> On Fri, Jul 3, 2009 at 23:29, Hyrum K. Wright<hyrum_at_hyrumwright.org>
> wrote:
>> ...
>> +++ trunk/subversion/libsvn_client/mergeinfo.c Fri Jul 3 14:29:24
>> 2009 (r38329)
>> ...
>> + SVN_ERR_ASSERT(svn_dirent_is_absolute(local_abspath));
>
> This is good to keep doing this. Since the expectation is (now)
> different for the path, then this will ensure all callers don't mess
> up.
>
>> ...
>> if (ctx->notify_func2)
>> {
>> svn_wc_notify_t *notify =
>> svn_wc_create_notify(
>> - svn_dirent_join_many(pool, path,
>> path_suffix),
>> - svn_wc_notify_merge_record_info,
>> pool);
>> + svn_dirent_join_many(scratch_pool,
>> local_abspath,
>> + path_suffix),
>> + svn_wc_notify_merge_record_info,
>> scratch_pool);
>
> I realize this isn't your bug, that call to join_many has no
> terminating NULL. Very buggy.
>
> Is path_suffix NULL or something? If it is always non-NULL, then just
> use svn_dirent_join(). If it *can* be NULL, then use some kind of
> conditional here. If it is always NULL, then toss the darned thing
> altogether.

Dunno. I've fixed the join_many call in r38346, but I'll let somebody
more familiar with the call to determine if path_suffix is NULL.

-Hyrum

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2368415
Received on 2009-07-06 17:37:33 CEST

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