You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2012/05/01 05:20:11 UTC
svn commit: r1332511 - in /subversion/branches/ev2-export: ./
subversion/libsvn_delta/compat.c subversion/libsvn_subr/path.c
Author: hwright
Date: Tue May 1 03:20:11 2012
New Revision: 1332511
URL: http://svn.apache.org/viewvc?rev=1332511&view=rev
Log:
On the ev2-export branch:
Bring up-to-date with trunk.
Modified:
subversion/branches/ev2-export/ (props changed)
subversion/branches/ev2-export/subversion/libsvn_delta/compat.c
subversion/branches/ev2-export/subversion/libsvn_subr/path.c
Propchange: subversion/branches/ev2-export/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1332388-1332509
Modified: subversion/branches/ev2-export/subversion/libsvn_delta/compat.c
URL: http://svn.apache.org/viewvc/subversion/branches/ev2-export/subversion/libsvn_delta/compat.c?rev=1332511&r1=1332510&r2=1332511&view=diff
==============================================================================
--- subversion/branches/ev2-export/subversion/libsvn_delta/compat.c (original)
+++ subversion/branches/ev2-export/subversion/libsvn_delta/compat.c Tue May 1 03:20:11 2012
@@ -1042,7 +1042,9 @@ insert_change(const char *relpath,
change->changing = SVN_INVALID_REVNUM;
change->deleting = SVN_INVALID_REVNUM;
- apr_hash_set(changes, relpath, APR_HASH_KEY_STRING, change);
+ apr_hash_set(changes,
+ apr_pstrdup(result_pool, relpath), APR_HASH_KEY_STRING,
+ change);
return change;
}
Modified: subversion/branches/ev2-export/subversion/libsvn_subr/path.c
URL: http://svn.apache.org/viewvc/subversion/branches/ev2-export/subversion/libsvn_subr/path.c?rev=1332511&r1=1332510&r2=1332511&view=diff
==============================================================================
--- subversion/branches/ev2-export/subversion/libsvn_subr/path.c (original)
+++ subversion/branches/ev2-export/subversion/libsvn_subr/path.c Tue May 1 03:20:11 2012
@@ -399,8 +399,8 @@ svn_path_compare_paths(const char *path1
apr_size_t min_len = ((path1_len < path2_len) ? path1_len : path2_len);
apr_size_t i = 0;
- assert(is_canonical(path1, strlen(path1)));
- assert(is_canonical(path2, strlen(path2)));
+ assert(is_canonical(path1, path1_len));
+ assert(is_canonical(path2, path2_len));
/* Skip past common prefix. */
while (i < min_len && path1[i] == path2[i])