svn commit: r937572 - /subversion/trunk/subversion/libsvn_wc/adm_crawler.c

[ju...@apache.org]

Author: julianfoad
Date: Sat Apr 24 01:08:28 2010
New Revision: 937572

URL: http://svn.apache.org/viewvc?rev=937572&view=rev
Log:
Fix a pool usage bug.  The bug was introduced in r878611 and has so far been
masked because our only active caller immediately duplicates the returned data.

* subversion/libsvn_wc/adm_crawler.c
  (svn_wc__internal_transmit_text_deltas): The file *name* is an output,
    so allocate it in result_pool, whereas the file *object* is only used
    internally so allocate it in scratch_pool.

Modified:
    subversion/trunk/subversion/libsvn_wc/adm_crawler.c

Modified: subversion/trunk/subversion/libsvn_wc/adm_crawler.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_crawler.c?rev=937572&r1=937571&r2=937572&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_crawler.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_crawler.c Sat Apr 24 01:08:28 2010
@@ -1076,14 +1076,14 @@ svn_wc__internal_transmit_text_deltas(co
       svn_stream_t *tempstream;
 
       SVN_ERR(svn_wc__text_base_path(tempfile, db, local_abspath, TRUE,
-                                     scratch_pool));
+                                     result_pool));
 
       /* Make an untranslated copy of the working file in the
          administrative tmp area because a) we need to detranslate eol
          and keywords anyway, and b) after the commit, we're going to
          copy the tmp file to become the new text base anyway. */
       SVN_ERR(svn_stream_open_writable(&tempstream, *tempfile,
-                                       result_pool, scratch_pool));
+                                       scratch_pool, scratch_pool));
 
       /* Wrap the translated stream with a new stream that writes the
          translated contents into the new text base file as we read from it.