[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

error leak in do_file_merge

From: David Glasser <glasser_at_davidglasser.net>
Date: Wed, 9 Apr 2008 10:55:53 -0700

In libsvn_client/merge.c(do_file_merge), which is code I don't know
very well, I observe:

      if (i < remaining_ranges->nelts - 1 &&
          err = make_merge_conflict_error(target_wcpath, r, pool);

  /* Record updated WC mergeinfo to account for our new merges, minus
     any unresolved conflicts and skips. */
  if (record_mergeinfo && remaining_ranges->nelts)
      apr_hash_t *merges;
      SVN_ERR(determine_merges_performed(&merges, target_wcpath,
                                         &range, svn_depth_infinity,
                                         adm_access, notify_b, merge_b,
      /* If merge target has indirect mergeinfo set it before
         recording the first merge range. */
      if (indirect)
                                                adm_access, subpool));

      SVN_ERR(update_wc_mergeinfo(target_wcpath, entry, mergeinfo_path,
                                  merges, is_rollback, adm_access,
                                  ctx, subpool));


  /* Sleep to ensure timestamp integrity. */

  return err;

Hmm, that "if (record_mergeinfo && " block seems suspect to me.
Either (a) it should be skipped if 'err' is set or (b) it needs to
catch errors in the three calls it makes and clear either err or the
new error. I have no idea which one, though.


David Glasser | glasser@davidglasser.net | http://www.davidglasser.net/
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-04-09 19:56:05 CEST

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.