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

RE: svn commit: r39666 - trunk/subversion/libsvn_wc

From: Bert Huijben <rhuijben_at_sharpsvn.net>
Date: Tue, 29 Sep 2009 19:32:33 +0200

> -----Original Message-----
> From: Greg Stein [mailto:gstein_at_gmail.com]
> Sent: dinsdag 29 september 2009 18:43
> To: dev_at_subversion.tigris.org
> Subject: Re: svn commit: r39666 - trunk/subversion/libsvn_wc
>
> On Tue, Sep 29, 2009 at 05:41, Bert Huijben <rhuijben_at_sharpsvn.net>
> wrote:
> >...
> > +++ trunk/subversion/libsvn_wc/wc_db.c Tue Sep 29 02:41:40 2009
> (r39666)
> >...
> > @@ -3294,17 +3297,22 @@ svn_wc__db_read_info(svn_wc__db_status_t
> > }
> > else
> > {
> > + svn_error_t *err2;
> > if (have_work)
> > - err = svn_sqlite__column_checksum(checksum,
> stmt_work, 2,
> > - result_pool);
> > + err2 = svn_sqlite__column_checksum(checksum,
> stmt_work, 2,
> > + result_pool);
> > else
> > - err = svn_sqlite__column_checksum(checksum,
> stmt_base, 7,
> > - result_pool);
> > - if (err != NULL)
> > - err = svn_error_createf(
> > - err->apr_err, err,
> > - _("The node '%s' has a corrupt checksum
> value."),
> > - svn_dirent_local_style(local_abspath,
> scratch_pool));
> > + err2 = svn_sqlite__column_checksum(checksum,
> stmt_base, 7,
> > + result_pool);
> > +
> > + if (err2 != NULL)
> > + err = svn_error_compose_create(
> > + err,
> > + svn_error_createf(
> > + err->apr_err, err,
> > + _("The node '%s' has a corrupt
> checksum value."),
> > + svn_dirent_local_style(local_abspath,
> > +
> scratch_pool)));
>
> The CHILD_ERR parameter should be err2 here.

Thanks; fixed one error leak by introducing another one :(

I will fix this later today, if nobody does it before I get to it.

        Bert

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2401717
Received on 2009-09-29 19:32:57 CEST

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