subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhuij...@apache.org
Subject svn commit: r1005783 - /subversion/trunk/subversion/libsvn_wc/wc_db.c
Date Fri, 08 Oct 2010 11:28:40 GMT
Author: rhuijben
Date: Fri Oct  8 11:28:40 2010
New Revision: 1005783

URL: http://svn.apache.org/viewvc?rev=1005783&view=rev
Log:
* subversion/libsvn_wc/wc_db.c
  (get_copyfrom): Add missing reset and return output values allocated
    in result_pool.

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

Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=1005783&r1=1005782&r2=1005783&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Fri Oct  8 11:28:40 2010
@@ -7794,16 +7794,18 @@ get_copyfrom(apr_int64_t *copyfrom_repos
                            db, parent_abspath, scratch_pool, scratch_pool));
       if (parent_copyfrom_relpath)
         *copyfrom_relpath = svn_relpath_join(parent_copyfrom_relpath, name,
-                                             scratch_pool);
+                                             result_pool);
       else
         *copyfrom_relpath = NULL;
       return SVN_NO_ERROR;
     }
 
   *copyfrom_repos_id = svn_sqlite__column_int64(stmt, 9);
-  *copyfrom_relpath = svn_sqlite__column_text(stmt, 10, scratch_pool);
+  *copyfrom_relpath = svn_sqlite__column_text(stmt, 10, result_pool);
   *copyfrom_revnum = svn_sqlite__column_revnum(stmt, 11);
 
+  SVN_ERR(svn_sqlite__reset(stmt));
+
   return SVN_NO_ERROR;
 }
 



Mime
View raw message