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

Posted to commits@subversion.apache.org by iv...@apache.org on 2015/09/09 15:07:29 UTC

svn commit: r1701997 - /subversion/trunk/subversion/libsvn_client/merge.c

Author: ivan
Date: Wed Sep  9 13:07:29 2015
New Revision: 1701997

URL: http://svn.apache.org/r1701997
Log:
Fix crash due access to uninitialized pointer. I don't know exact reproduction
script, but crash was reported multiple times using TortoiseSVN crash reporter
tool.

* subversion/libsvn_client/merge.c
  (merge_reintegrate_locked): Initialize output parameter *CONFLICT_REPORT to
   NULL if no merge source was found.

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

Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=1701997&r1=1701996&r2=1701997&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Wed Sep  9 13:07:29 2015
@@ -11700,6 +11700,7 @@ merge_reintegrate_locked(conflict_report
 
   if (! source)
     {
+      *conflict_report = NULL;
       return SVN_NO_ERROR;
     }