You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Greg Stein <gs...@gmail.com> on 2009/04/13 10:56:03 UTC

Re: svn commit: r37194 - in trunk/subversion: libsvn_client tests/cmdline tests/cmdline/svntest

On Mon, Apr 13, 2009 at 05:18, Arfrever Frehtes Taifersar Arahesis
<Ar...@gmail.com> wrote:
>...
> +++ trunk/subversion/libsvn_client/patch.c      Sun Apr 12 20:18:08 2009        (r37194)
>...
> @@ -1654,31 +1657,51 @@ extract_svnpatch(const char *original_pa
>
>   SVN_ERR(svn_io_file_open(&original_patch_file, original_patch_path,
>                            APR_READ, APR_OS_DEFAULT, pool));
> -  original_patch_stream = svn_stream_from_aprfile2(original_patch_file,
> -                                          FALSE, pool);
> +  original_patch_stringbuf = svn_stringbuf_create_ensure(1024, pool);
> +  SVN_ERR(svn_stringbuf_from_aprfile(&original_patch_stringbuf,
> +                                     original_patch_file, pool));

Woah. Can't do this. This reads the whole patch file into memory. The
file isn't going to go away, so just reopen the file.

>...

Cheers,
-g

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1687547


Re: svn commit: r37194 - in trunk/subversion: libsvn_client tests/cmdline tests/cmdline/svntest

Posted by Arfrever Frehtes Taifersar Arahesis <Ar...@GMail.Com>.
2009-04-13 12:56:03 Greg Stein napisał(a):
> On Mon, Apr 13, 2009 at 05:18, Arfrever Frehtes Taifersar Arahesis
> <Ar...@gmail.com> wrote:
> >...
> > +++ trunk/subversion/libsvn_client/patch.c      Sun Apr 12 20:18:08 2009        (r37194)
> >...
> > @@ -1654,31 +1657,51 @@ extract_svnpatch(const char *original_pa
> >
> >   SVN_ERR(svn_io_file_open(&original_patch_file, original_patch_path,
> >                            APR_READ, APR_OS_DEFAULT, pool));
> > -  original_patch_stream = svn_stream_from_aprfile2(original_patch_file,
> > -                                          FALSE, pool);
> > +  original_patch_stringbuf = svn_stringbuf_create_ensure(1024, pool);
> > +  SVN_ERR(svn_stringbuf_from_aprfile(&original_patch_stringbuf,
> > +                                     original_patch_file, pool));
> 
> Woah. Can't do this. This reads the whole patch file into memory. The
> file isn't going to go away, so just reopen the file.

Fixed in r37207.

-- 
Arfrever Frehtes Taifersar Arahesis