svn commit: r1071081 - /subversion/trunk/subversion/svnrdump/load_editor.c

[cm...@apache.org]

Author: cmpilato
Date: Tue Feb 15 21:44:27 2011
New Revision: 1071081

URL: http://svn.apache.org/viewvc?rev=1071081&view=rev
Log:
Fix a SEGFAULT in svnrdump.

* subversion/svnrdump/load_editor.c
  (close_node): Don't try to close the file if it was merely deleted.

Modified:
    subversion/trunk/subversion/svnrdump/load_editor.c

Modified: subversion/trunk/subversion/svnrdump/load_editor.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnrdump/load_editor.c?rev=1071081&r1=1071080&r2=1071081&view=diff
==============================================================================
--- subversion/trunk/subversion/svnrdump/load_editor.c (original)
+++ subversion/trunk/subversion/svnrdump/load_editor.c Tue Feb 15 21:44:27 2011
@@ -509,7 +509,9 @@ close_node(void *baton)
   nb = baton;
   commit_editor = nb->rb->pb->commit_editor;
 
-  if (nb->kind == svn_node_file)
+  /* Pass a file node closure through to the editor *unless* we
+     deleted the file (which doesn't require us to open it). */
+  if ((nb->kind == svn_node_file) && (nb->file_baton))
     {
       LDR_DBG(("Closing file %p\n", nb->file_baton));
       SVN_ERR(commit_editor->close_file(nb->file_baton, NULL, nb->rb->pool));