You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@subversion.apache.org by br...@apache.org on 2016/04/17 14:50:12 UTC

svn commit: r1739598 - /subversion/trunk/subversion/libsvn_client/conflicts.c

Author: brane
Date: Sun Apr 17 12:50:12 2016
New Revision: 1739598

URL: http://svn.apache.org/viewvc?rev=1739598&view=rev
Log:
Fix two uninitialized-variable warnings in the conflict resolver.

* subversion/libsvn_client/conflicts.c
  (conflict_tree_get_details_incoming_delete,
   conflict_tree_get_details_incoming_add): Initialize the 'details' variable
   if none of the conditional branches are entered.

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

Modified: subversion/trunk/subversion/libsvn_client/conflicts.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/conflicts.c?rev=1739598&r1=1739597&r2=1739598&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_client/conflicts.c Sun Apr 17 12:50:12 2016
@@ -2108,6 +2108,10 @@ conflict_tree_get_details_incoming_delet
                     conflict->pool, scratch_pool));
         }
     }
+  else
+    {
+      details = NULL;
+    }
 
   conflict->tree_conflict_details = details;
 
@@ -2310,6 +2314,10 @@ conflict_tree_get_details_incoming_add(s
           details->added_rev_author = NULL;
         }
     }
+  else
+    {
+      details = NULL;
+    }
 
   conflict->tree_conflict_details = details;