svn commit: r1462006 - /subversion/trunk/subversion/libsvn_fs/fs-loader.c

[philip]

Author: philip
Date: Thu Mar 28 09:32:12 2013
New Revision: 1462006

URL: http://svn.apache.org/r1462006
Log:
* subversion/libsvn_fs/fs-loader.c
  (svn_fs_commit_txn): Ensure output parameters are set when debug code
   returns an error.

Modified:
    subversion/trunk/subversion/libsvn_fs/fs-loader.c

Modified: subversion/trunk/subversion/libsvn_fs/fs-loader.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs/fs-loader.c?rev=1462006&r1=1462005&r2=1462006&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs/fs-loader.c (original)
+++ subversion/trunk/subversion/libsvn_fs/fs-loader.c Thu Mar 28 09:32:12 2013
@@ -755,6 +755,8 @@ svn_fs_commit_txn(const char **conflict_
 #endif
 
   *new_rev = SVN_INVALID_REVNUM;
+  if (conflict_p)
+    *conflict_p = NULL;
 
 #if defined(PACK_AFTER_EVERY_COMMIT) || defined(SVN_DEBUG)
   SVN_ERR(svn_fs_txn_root(&txn_root, txn, pool));