You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2014/02/28 17:38:05 UTC
svn commit: r1572989 - /subversion/trunk/subversion/libsvn_repos/log.c
Author: julianfoad
Date: Fri Feb 28 16:38:05 2014
New Revision: 1572989
URL: http://svn.apache.org/r1572989
Log:
* subversion/libsvn_repos/log.c
(do_logs): Tweak code that looked like it could leave a structure field
uninitialized, to make clear that it cannot.
Modified:
subversion/trunk/subversion/libsvn_repos/log.c
Modified: subversion/trunk/subversion/libsvn_repos/log.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_repos/log.c?rev=1572989&r1=1572988&r2=1572989&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_repos/log.c (original)
+++ subversion/trunk/subversion/libsvn_repos/log.c Fri Feb 28 16:38:05 2014
@@ -2235,19 +2235,18 @@ do_logs(svn_fs_t *fs,
if (added_mergeinfo || deleted_mergeinfo)
{
- svn_revnum_t *cur_rev = apr_pcalloc(pool, sizeof(*cur_rev));
+ svn_revnum_t *cur_rev =
+ apr_pmemdup(pool, current, sizeof(cur_rev));
struct added_deleted_mergeinfo *add_and_del_mergeinfo =
apr_palloc(pool, sizeof(*add_and_del_mergeinfo));
- if (added_mergeinfo)
- add_and_del_mergeinfo->added_mergeinfo =
- svn_mergeinfo_dup(added_mergeinfo, pool);
-
- if (deleted_mergeinfo)
- add_and_del_mergeinfo->deleted_mergeinfo =
- svn_mergeinfo_dup(deleted_mergeinfo, pool);
+ /* If we have added or deleted mergeinfo, both are non-null */
+ SVN_ERR_ASSERT(added_mergeinfo && deleted_mergeinfo);
+ add_and_del_mergeinfo->added_mergeinfo =
+ svn_mergeinfo_dup(added_mergeinfo, pool);
+ add_and_del_mergeinfo->deleted_mergeinfo =
+ svn_mergeinfo_dup(deleted_mergeinfo, pool);
- *cur_rev = current;
if (! rev_mergeinfo)
rev_mergeinfo = svn_hash__make(pool);
apr_hash_set(rev_mergeinfo, cur_rev, sizeof(*cur_rev),