svn commit: r1664469 - in /subversion/branches/1.9.x: ./ STATUS subversion/libsvn_ra_svn/editorp.c

[svn-role]

Author: svn-role
Date: Thu Mar  5 19:57:33 2015
New Revision: 1664469

URL: http://svn.apache.org/r1664469
Log:
Merge r1663450 from trunk:

 * r1663450
   Fix removing cache tokens in the ra_svn editor implementation
   Justification:
     Unbounded memory usage and potential access to invalid memory.
   Notes:
     This regression was introduced in r1658194. Reverting this change
     is just as valid as backporting this fix.
   Votes:
     +1: rhuijben, philip, brane
     -0: ivan (prefer r1658194 micro-optimization to be reverted)

Modified:
    subversion/branches/1.9.x/   (props changed)
    subversion/branches/1.9.x/STATUS
    subversion/branches/1.9.x/subversion/libsvn_ra_svn/editorp.c

Propchange: subversion/branches/1.9.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar  5 19:57:33 2015
@@ -89,4 +89,4 @@
 /subversion/branches/verify-at-commit:1462039-1462408
 /subversion/branches/verify-keep-going:1439280-1546110
 /subversion/branches/wc-collate-path:1402685-1480384
-/subversion/trunk:1660545-1660547,1660549-1662901,1663003,1663697,1663706,1663749,1664084-1664085
+/subversion/trunk:1660545-1660547,1660549-1662901,1663003,1663450,1663697,1663706,1663749,1664084-1664085

Modified: subversion/branches/1.9.x/STATUS
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.9.x/STATUS?rev=1664469&r1=1664468&r2=1664469&view=diff
==============================================================================
--- subversion/branches/1.9.x/STATUS (original)
+++ subversion/branches/1.9.x/STATUS Thu Mar  5 19:57:33 2015
@@ -130,14 +130,3 @@ Veto-blocked changes:
 
 Approved changes:
 =================
-
- * r1663450
-   Fix removing cache tokens in the ra_svn editor implementation
-   Justification:
-     Unbounded memory usage and potential access to invalid memory.
-   Notes:
-     This regression was introduced in r1658194. Reverting this change
-     is just as valid as backporting this fix.
-   Votes:
-     +1: rhuijben, philip, brane
-     -0: ivan (prefer r1658194 micro-optimization to be reverted)
\ No newline at end of file

Modified: subversion/branches/1.9.x/subversion/libsvn_ra_svn/editorp.c
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/libsvn_ra_svn/editorp.c?rev=1664469&r1=1664468&r2=1664469&view=diff
==============================================================================
--- subversion/branches/1.9.x/subversion/libsvn_ra_svn/editorp.c (original)
+++ subversion/branches/1.9.x/subversion/libsvn_ra_svn/editorp.c Thu Mar  5 
19:57:33 2015
@@ -633,7 +633,7 @@ static svn_error_t *ra_svn_handle_close_
 
   /* Close the directory and destroy the baton. */
   SVN_CMD_ERR(ds->editor->close_directory(entry->baton, pool));
-  svn_hash_sets(ds->tokens, token, NULL);
+  apr_hash_set(ds->tokens, token->data, token->len, NULL);
   svn_pool_destroy(entry->pool);
   return SVN_NO_ERROR;
 }
@@ -812,7 +812,7 @@ static svn_error_t *ra_svn_handle_close_
 
   /* Close the file and destroy the baton. */
   SVN_CMD_ERR(ds->editor->close_file(entry->baton, text_checksum, pool));
-  svn_hash_sets(ds->tokens, token, NULL);
+  apr_hash_set(ds->tokens, token->data, token->len, NULL);
   if (--ds->file_refs == 0)
     svn_pool_clear(ds->file_pool);
   return SVN_NO_ERROR;