Author: svn-role Date: Wed Apr 8 04:00:50 2020 New Revision: 1876266 URL: http://svn.apache.org/viewvc?rev=1876266&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, hartmannathan Modified: subversion/branches/1.14.x/ (props changed) subversion/branches/1.14.x/STATUS subversion/branches/1.14.x/subversion/libsvn_fs_fs/tree.c Propchange: subversion/branches/1.14.x/ ------------------------------------------------------------------------------ Merged /subversion/trunk:r1876054 Modified: subversion/branches/1.14.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1876266&r1=1876265&r2=1876266&view=diff ============================================================================== --- subversion/branches/1.14.x/STATUS (original) +++ subversion/branches/1.14.x/STATUS Wed Apr 8 04:00:50 2020 @@ -21,13 +21,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, hartmannathan - * r1876068 Add libsvn_shelf.h and libsvn_shelf2.h to msvc-export, needed for the private symbols Modified: subversion/branches/1.14.x/subversion/libsvn_fs_fs/tree.c URL: http://svn.apache.org/viewvc/subversion/branches/1.14.x/subversion/libsvn_fs_fs/tree.c?rev=1876266&r1=1876265&r2=1876266&view=diff ============================================================================== --- subversion/branches/1.14.x/subversion/libsvn_fs_fs/tree.c (original) +++ subversion/branches/1.14.x/subversion/libsvn_fs_fs/tree.c Wed Apr 8 04:00:50 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));