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 2014/02/26 18:42:45 UTC
svn commit: r1572175 - /subversion/trunk/subversion/libsvn_subr/sorts.c
Author: philip
Date: Wed Feb 26 17:42:44 2014
New Revision: 1572175
URL: http://svn.apache.org/r1572175
Log:
Fix an invalid memcpy identified by valgrind.
* subversion/libsvn_subr/sorts.c
(svn_priority_queue__pop): Use memmove as memory blocks overlap, tweak
whitespace.
Modified:
subversion/trunk/subversion/libsvn_subr/sorts.c
Modified: subversion/trunk/subversion/libsvn_subr/sorts.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/sorts.c?rev=1572175&r1=1572174&r2=1572175&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/sorts.c (original)
+++ subversion/trunk/subversion/libsvn_subr/sorts.c Wed Feb 26 17:42:44 2014
@@ -471,10 +471,10 @@ svn_priority_queue__pop(svn_priority_que
{
if (queue->elements->nelts)
{
- memcpy(queue->elements->elts,
- queue->elements->elts + (queue->elements->nelts - 1)
- * queue->elements->elt_size,
- queue->elements->elt_size);
+ memmove(queue->elements->elts,
+ queue->elements->elts
+ + (queue->elements->nelts - 1) * queue->elements->elt_size,
+ queue->elements->elt_size);
--queue->elements->nelts;
heap_bubble_up(queue, 0);
}