You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by sv...@apache.org on 2020/12/18 04:00:08 UTC
svn commit: r1884587 - in /subversion/branches/1.10.x: ./ STATUS
subversion/libsvn_fs_fs/tree.c
Author: svn-role
Date: Fri Dec 18 04:00:08 2020
New Revision: 1884587
URL: http://svn.apache.org/viewvc?rev=1884587&view=rev
Log:
Merge r1876054 from trunk:
* r1876054
Fix undefined behavior when constructing ID for txn_node_cache in fsfs.
Justification:
Fixes potential crash in apr_pstrcat(). Pretty obvious fix.
Votes:
+1: stsp, jamessan, jcorvel
Modified:
subversion/branches/1.10.x/ (props changed)
subversion/branches/1.10.x/STATUS
subversion/branches/1.10.x/subversion/libsvn_fs_fs/tree.c
Propchange: subversion/branches/1.10.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1876054
Modified: subversion/branches/1.10.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1884587&r1=1884586&r2=1884587&view=diff
==============================================================================
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Fri Dec 18 04:00:08 2020
@@ -90,13 +90,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1876054
- Fix undefined behavior when constructing ID for txn_node_cache in fsfs.
- Justification:
- Fixes potential crash in apr_pstrcat(). Pretty obvious fix.
- Votes:
- +1: stsp, jamessan, jcorvel
-
* r1879198
Fix an invalid quoting in working copy upgrade system that only works
because SQLite automatically fixed this. More recent SQLite functions
Modified: subversion/branches/1.10.x/subversion/libsvn_fs_fs/tree.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.10.x/subversion/libsvn_fs_fs/tree.c?rev=1884587&r1=1884586&r2=1884587&view=diff
==============================================================================
--- subversion/branches/1.10.x/subversion/libsvn_fs_fs/tree.c (original)
+++ subversion/branches/1.10.x/subversion/libsvn_fs_fs/tree.c Fri Dec 18 04:00:08 2020
@@ -4644,7 +4644,7 @@ make_txn_root(svn_fs_root_t **root_p,
svn_fs_fs__dag_deserialize,
APR_HASH_KEY_STRING,
32, 20, FALSE,
- apr_pstrcat(pool, txn, ":TXN",
+ apr_pstrcat(pool, root->txn, ":TXN",
SVN_VA_NULL),
root->pool));