You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2010/07/23 19:21:48 UTC
svn commit: r967169 - in /subversion/trunk/subversion: include/svn_ra.h
libsvn_ra_local/ra_plugin.c libsvn_ra_neon/commit.c libsvn_ra_serf/commit.c
libsvn_ra_svn/client.c
Author: hwright
Date: Fri Jul 23 17:21:47 2010
New Revision: 967169
URL: http://svn.apache.org/viewvc?rev=967169&view=rev
Log:
Fix a segfault caused by providing a NULL commit callback. This loosens
the restrictions of the ra API somewhat, but in a backward-compatible way.
Found by: danielsh
* subversion/libsvn_ra_local/ra_plugin.c
(deltify_etc): Optionally call the commit callback.
* subversion/libsvn_ra_svn/client.c
(ra_svn_end_commit): Same.
* subversion/libsvn_ra_neon/commit.c
(commit_close_edit): Same.
* subversion/libsvn_ra_serf/commit.c
(close_edit): Same.
* subversion/include/svn_ra.h
(svn_ra_get_commit_editor3): Update docs.
Modified:
subversion/trunk/subversion/include/svn_ra.h
subversion/trunk/subversion/libsvn_ra_local/ra_plugin.c
subversion/trunk/subversion/libsvn_ra_neon/commit.c
subversion/trunk/subversion/libsvn_ra_serf/commit.c
subversion/trunk/subversion/libsvn_ra_svn/client.c
Modified: subversion/trunk/subversion/include/svn_ra.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_ra.h?rev=967169&r1=967168&r2=967169&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_ra.h (original)
+++ subversion/trunk/subversion/include/svn_ra.h Fri Jul 23 17:21:47 2010
@@ -777,8 +777,8 @@ svn_ra_rev_prop(svn_ra_session_t *sessio
* or @c SVN_PROP_REVISION_AUTHOR.
*
* Before @c close_edit returns, but after the commit has succeeded,
- * it will invoke @a callback with the new revision number, the
- * commit date (as a <tt>const char *</tt>), commit author (as a
+ * it will invoke @a callback (if non-NULL) with the new revision number,
+ * the commit date (as a <tt>const char *</tt>), commit author (as a
* <tt>const char *</tt>), and @a callback_baton as arguments. If
* @a callback returns an error, that error will be returned from @c
* close_edit, otherwise @c close_edit will return successfully
Modified: subversion/trunk/subversion/libsvn_ra_local/ra_plugin.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_local/ra_plugin.c?rev=967169&r1=967168&r2=967169&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_local/ra_plugin.c (original)
+++ subversion/trunk/subversion/libsvn_ra_local/ra_plugin.c Fri Jul 23 17:21:47 2010
@@ -341,14 +341,16 @@ deltify_etc(const svn_commit_info_t *com
void *baton, apr_pool_t *pool)
{
struct deltify_etc_baton *db = baton;
- svn_error_t *err1, *err2;
+ svn_error_t *err1 = SVN_NO_ERROR;
+ svn_error_t *err2;
apr_hash_index_t *hi;
apr_pool_t *iterpool;
/* Invoke the original callback first, in case someone's waiting to
know the revision number so they can go off and annotate an
issue or something. */
- err1 = (*db->callback)(commit_info, db->callback_baton, pool);
+ if (*db->callback)
+ err1 = (*db->callback)(commit_info, db->callback_baton, pool);
/* Maybe unlock the paths. */
if (db->lock_tokens)
Modified: subversion/trunk/subversion/libsvn_ra_neon/commit.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_neon/commit.c?rev=967169&r1=967168&r2=967169&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_neon/commit.c (original)
+++ subversion/trunk/subversion/libsvn_ra_neon/commit.c Fri Jul 23 17:21:47 2010
@@ -1357,7 +1357,7 @@ static svn_error_t * commit_close_edit(v
SVN_ERR(delete_activity(edit_baton, pool));
SVN_ERR(svn_ra_neon__maybe_store_auth_info(cc->ras, pool));
- if (commit_info->revision != SVN_INVALID_REVNUM)
+ if (cc->callback && commit_info->revision != SVN_INVALID_REVNUM)
SVN_ERR(cc->callback(commit_info, cc->callback_baton, pool));
return SVN_NO_ERROR;
Modified: subversion/trunk/subversion/libsvn_ra_serf/commit.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/commit.c?rev=967169&r1=967168&r2=967169&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/commit.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/commit.c Fri Jul 23 17:21:47 2010
@@ -1992,8 +1992,9 @@ close_edit(void *edit_baton,
}
/* Inform the WC that we did a commit. */
- SVN_ERR(ctx->callback(svn_ra_serf__merge_get_commit_info(merge_ctx),
- ctx->callback_baton, pool));
+ if (ctx->callback)
+ SVN_ERR(ctx->callback(svn_ra_serf__merge_get_commit_info(merge_ctx),
+ ctx->callback_baton, pool));
/* If we're using activities, DELETE our completed activity. */
if (ctx->activity_url)
Modified: subversion/trunk/subversion/libsvn_ra_svn/client.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_svn/client.c?rev=967169&r1=967168&r2=967169&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_svn/client.c (original)
+++ subversion/trunk/subversion/libsvn_ra_svn/client.c Fri Jul 23 17:21:47 2010
@@ -885,8 +885,10 @@ static svn_error_t *ra_svn_end_commit(vo
&(commit_info->author),
&(commit_info->post_commit_err)));
- return ccb->callback(commit_info, ccb->callback_baton, ccb->pool);
+ if (ccb->callback)
+ SVN_ERR(ccb->callback(commit_info, ccb->callback_baton, ccb->pool));
+ return SVN_NO_ERROR;
}
static svn_error_t *ra_svn_commit(svn_ra_session_t *session,