subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1654018 - /subversion/branches/pin-externals/subversion/libsvn_client/commit_util.c
Date Thu, 22 Jan 2015 19:19:14 GMT
Author: stsp
Date: Thu Jan 22 19:19:14 2015
New Revision: 1654018

URL: http://svn.apache.org/r1654018
Log:
On the pin-externals branch, make it possible to commit property mods on
copied-along children. Attemping this lead to a NULL-deref in the commit code.

* subversion/libsvn_client/commit_util.c
  (do_item_commit): Don't assume that local_abspath is always non-NULL
   for property modifications.

Modified:
    subversion/branches/pin-externals/subversion/libsvn_client/commit_util.c

Modified: subversion/branches/pin-externals/subversion/libsvn_client/commit_util.c
URL: http://svn.apache.org/viewvc/subversion/branches/pin-externals/subversion/libsvn_client/commit_util.c?rev=1654018&r1=1654017&r2=1654018&view=diff
==============================================================================
--- subversion/branches/pin-externals/subversion/libsvn_client/commit_util.c (original)
+++ subversion/branches/pin-externals/subversion/libsvn_client/commit_util.c Thu Jan 22 19:19:14
2015
@@ -1754,12 +1754,15 @@ do_item_commit(void **dir_baton,
          repository, a "not found" error does not occur immediately
          upon opening the directory.  It appears here during the delta
          transmisssion. */
-      err = svn_wc_transmit_prop_deltas2(
-              ctx->wc_ctx, local_abspath, editor,
-              (kind == svn_node_dir) ? *dir_baton : file_baton, pool);
+      if (local_abspath)
+        {
+          err = svn_wc_transmit_prop_deltas2(
+                  ctx->wc_ctx, local_abspath, editor,
+                  (kind == svn_node_dir) ? *dir_baton : file_baton, pool);
 
-      if (err)
-        goto fixup_error;
+          if (err)
+            goto fixup_error;
+        }
 
       /* Make any additional client -> repository prop changes. */
       if (item->outgoing_prop_changes)



Mime
View raw message