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

Re: svn commit: r32563 - trunk/subversion/libsvn_fs_fs

From: Hyrum K. Wright <hyrum_wright_at_mail.utexas.edu>
Date: Tue, 19 Aug 2008 16:30:48 -0700

> -------Original Message-------
> From: Greg Stein <gstein_at_gmail.com>
> Subject: Re: svn commit: r32563 - trunk/subversion/libsvn_fs_fs
> Sent: 19 Aug '08 14:55
>
> On Tue, Aug 19, 2008 at 1:11 PM,  <hwright_at_tigris.org> wrote:
> >...
> > +++ trunk/subversion/libsvn_fs_fs/tree.c        Tue Aug 19 13:11:47 2008        (r32563)
> >...
> > @@ -2512,12 +2510,12 @@ fs_apply_textdelta(svn_txdelta_window_ha
> >   tb->pool = pool;
> >
> >   if (base_checksum)
> > -    tb->base_checksum = apr_pstrdup(pool, base_checksum);
> > +    tb->base_checksum = svn_checksum_create(svn_checksum_md5, pool);
>
> This is an incorrect change. The "base_checksum" variable is not
> flowed into tb->base_checksum like before.
>
> >   else
> >     tb->base_checksum = NULL;
> >
> >   if (result_checksum)
> > -    tb->result_checksum = apr_pstrdup(pool, result_checksum);
> > +    tb->result_checksum = svn_checksum_create(svn_checksum_md5, pool);
>
> Same.
>
> >   else
> >     tb->result_checksum = NULL;
> >
> > @@ -2549,9 +2547,9 @@ struct text_baton_t
> >   /* The actual fs stream that the returned stream will write to. */
> >   svn_stream_t *file_stream;
> >
> > -  /* Hex MD5 digest for the final fulltext written to the file.  May
> > +  /* MD5 digest for the final fulltext written to the file.  May
> >      be null, in which case ignored. */
> > -  const char *result_checksum;
> > +  svn_checksum_t *result_checksum;
> >
> >   /* Pool used by db txns */
> >   apr_pool_t *pool;
> > @@ -2658,7 +2656,7 @@ fs_apply_text(svn_stream_t **contents_p,
> >   tb->pool = pool;
> >
> >   if (result_checksum)
> > -    tb->result_checksum = apr_pstrdup(pool, result_checksum);
> > +    tb->result_checksum = svn_checksum_create(svn_checksum_md5, pool);
>
> Same.
>
>
> In all three cases, you create tb->whatever, but the checksum is not
> copied from the local variable.

Oooo, thanks. Fixed in r32567.

-Hyrum

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-08-20 01:31:11 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.