[PATCH] subversion/libsvn_diff/diff3.c

Hi,

just a missing initialization that crashed at me...

-- 
Martin

* subversion/libsvn_diff/diff3.c
 (svn_diff__resolve_conflict): added missing initialization of
 resolved_diff member in newly created svn_diff_t's.

Index: subversion/libsvn_diff/diff3.c
===================================================================
--- subversion/libsvn_diff/diff3.c (revision 7208)
+++ subversion/libsvn_diff/diff3.c (working copy)
@@ -201,6 +201,7 @@
             (*diff_ref)->latest_start = latest_start - 1;
             (*diff_ref)->latest_length = lcs->position[1]->offset
                                          - latest_start;
+ (*diff_ref)->resolved_diff = NULL;

             diff_ref = &(*diff_ref)->next;
           }
@@ -221,6 +222,7 @@
         (*diff_ref)->modified_length = lcs->length;
         (*diff_ref)->latest_start = latest_start - 1;
         (*diff_ref)->latest_length = lcs->length;
+ (*diff_ref)->resolved_diff = NULL;

         diff_ref = &(*diff_ref)->next;

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Sep 29 20:46:50 2003