svn commit: r1447391 - /subversion/trunk/subversion/libsvn_wc/wc_db.c

[stsp]

Author: stsp
Date: Mon Feb 18 16:52:33 2013
New Revision: 1447391

URL: http://svn.apache.org/r1447391
Log:
* subversion/libsvn_wc/wc_db.c
  (db_base_remove): Fix missing sqlite statement reset in error path.

Found by: philip

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=1447391&r1=1447390&r2=1447391&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Mon Feb 18 16:52:33 2013
@@ -2252,10 +2252,13 @@ db_base_remove(svn_wc__db_wcroot_t *wcro
       while (have_row)
         {
           const char *child_relpath;
+          svn_error_t *err;
           
           svn_pool_clear(iterpool);
           child_relpath = svn_sqlite__column_text(stmt, 0, iterpool);
-          SVN_ERR(clear_moved_here(child_relpath, wcroot, iterpool));
+          err = clear_moved_here(child_relpath, wcroot, iterpool);
+          if (err)
+            return svn_error_compose_create(err, svn_sqlite__reset(stmt));
           SVN_ERR(svn_sqlite__step(&have_row, stmt));
         }
       svn_pool_destroy(iterpool);