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

[philip]

Author: philip
Date: Wed Nov 23 14:09:16 2011
New Revision: 1205402

URL: http://svn.apache.org/viewvc?rev=1205402&view=rev
Log:
Fix an unitialised memory read in the notify callback identified
by valgrind when running update_tests.py 36.

* subversion/libsvn_client/merge.c
  (merge_props_changed): Always set the property state.

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=1205402&r1=1205401&r2=1205402&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Wed Nov 23 14:09:16 2011
@@ -1254,6 +1254,8 @@ merge_props_changed(svn_wc_notify_state_
       else if (err)
         return svn_error_trace(err);
     }
+  else if (state)
+    *state = svn_wc_notify_state_unchanged;
 
   return SVN_NO_ERROR;
 }