svn commit: r1570276 - /subversion/trunk/subversion/libsvn_client/diff.c

[rh...@apache.org]

Author: rhuijben
Date: Thu Feb 20 17:08:19 2014
New Revision: 1570276

URL: http://svn.apache.org/r1570276
Log:
* subversion/libsvn_client/diff.c
  (diff_prepare_repos_repos): Resolve an operator precedence bug identified
    by the warning buildbot. This resolves some possible segfaults.

Modified:
    subversion/trunk/subversion/libsvn_client/diff.c

Modified: subversion/trunk/subversion/libsvn_client/diff.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/diff.c?rev=1570276&r1=1570275&r2=1570276&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/diff.c (original)
+++ subversion/trunk/subversion/libsvn_client/diff.c Thu Feb 20 17:08:19 2014
@@ -1417,8 +1417,8 @@ diff_prepare_repos_repos(const char **ur
          location fails... But in many such cases we prefer diffing against
          an not existing location to show adds od removes (see issue #4153) */
       if (resolved2
-          && (peg_kind != svn_opt_revision_unspecified)
-              || path_or_url1 == path_or_url2)
+          && (peg_kind != svn_opt_revision_unspecified
+              || path_or_url1 == path_or_url2))
         *url1 = resolved2->url;
       else if (svn_path_is_url(path_or_url1))
         *url1 = path_or_url1;
@@ -1443,8 +1443,8 @@ diff_prepare_repos_repos(const char **ur
          location fails... But in many such cases we prefer diffing against
          an not existing location to show adds od removes (see issue #4153) */
       if (resolved1
-          && (peg_kind != svn_opt_revision_unspecified)
-              || path_or_url1 == path_or_url2)
+          && (peg_kind != svn_opt_revision_unspecified
+              || path_or_url1 == path_or_url2))
         *url2 = resolved1->url;
       else if (svn_path_is_url(path_or_url2))
         *url2 = path_or_url2;