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

Posted to commits@subversion.apache.org by ph...@apache.org on 2010/02/01 21:21:55 UTC

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

Author: philip
Date: Mon Feb  1 20:21:55 2010
New Revision: 905403

URL: http://svn.apache.org/viewvc?rev=905403&view=rev
Log:
Fix an invalid memory write tracked down with valgrind.

* subversion/libsvn_client/merge.c
  (do_file_merge): Alloc memory sufficient for a struct not a pointer.

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=905403&r1=905402&r2=905403&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Mon Feb  1 20:21:55 2010
@@ -6577,7 +6577,7 @@
                                                          merges,
                                                          subpool));
               notify->merge_range = apr_pcalloc(subpool,
-                                                sizeof(svn_merge_range_t *));
+                                                sizeof(svn_merge_range_t));
               notify->merge_range->start = oldest_rev;
               notify->merge_range->end = youngest_rev;
               notify->merge_range->inheritable = TRUE;