Author: svn-role
Date: Wed Jul  8 04:00:18 2026
New Revision: 1935989

Log:
Merge r1934786 from trunk:

 * r1934786
   Fix an uninitialized memory access bug in FSX.
   Justification:
     FSX is experimental, but is shouldn't corrupt memory.
   Votes:
     +1: brane, ivan, kotkov

Modified:
   subversion/branches/1.15.x/   (props changed)
   subversion/branches/1.15.x/STATUS
   subversion/branches/1.15.x/subversion/libsvn_fs_x/   (props changed)
   subversion/branches/1.15.x/subversion/libsvn_fs_x/revprops.c

Modified: subversion/branches/1.15.x/STATUS
==============================================================================
--- subversion/branches/1.15.x/STATUS   Wed Jul  8 04:00:10 2026        
(r1935988)
+++ subversion/branches/1.15.x/STATUS   Wed Jul  8 04:00:18 2026        
(r1935989)
@@ -67,13 +67,6 @@ Veto-blocked changes:
 Approved changes:
 =================
 
- * r1934786
-   Fix an uninitialized memory access bug in FSX.
-   Justification:
-     FSX is experimental, but is shouldn't corrupt memory.
-   Votes:
-     +1: brane, ivan, kotkov
-
  * r1934788, r1934920, r1935780, r1935781
    Use snprintf() instead sprintf() if available. Fixes deprecation warning on
    macOS newer versions of Xcode.

Modified: subversion/branches/1.15.x/subversion/libsvn_fs_x/revprops.c
==============================================================================
--- subversion/branches/1.15.x/subversion/libsvn_fs_x/revprops.c        Wed Jul 
 8 04:00:10 2026        (r1935988)
+++ subversion/branches/1.15.x/subversion/libsvn_fs_x/revprops.c        Wed Jul 
 8 04:00:18 2026        (r1935989)
@@ -1203,7 +1203,7 @@ repack_file_open(apr_file_t **file,
   if (revprops->entry.start_rev == start_rev)
     APR_ARRAY_IDX(revprops->manifest, idx, manifest_entry_t) = new_entry;
   else
-    SVN_ERR(svn_sort__array_insert2(revprops->manifest, &new_path, idx + 1));
+    SVN_ERR(svn_sort__array_insert2(revprops->manifest, &new_entry, idx + 1));
 
   /* open the file */
   new_path = get_revprop_pack_filepath(revprops, &new_entry, scratch_pool);

Reply via email to