Author: svn-role
Date: Fri Apr 3 04:00:09 2020
New Revision: 1876072
URL: http://svn.apache.org/viewvc?rev=1876072&view=rev
Log:
Merge the r1865987 group from trunk:
* r1865987, r1866588
Fix formatting type size mismatches in FSFS.
Justification:
Could cause wrong output or uninitialised memory read on some platforms.
Votes:
+1: brane, jamessan, stsp
Modified:
subversion/branches/1.10.x/ (props changed)
subversion/branches/1.10.x/STATUS
subversion/branches/1.10.x/subversion/libsvn_fs_fs/verify.c
Propchange: subversion/branches/1.10.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1865987,1866588
Modified: subversion/branches/1.10.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1876072&r1=1876071&r2=1876072&view=diff
==============================================================================
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Fri Apr 3 04:00:09 2020
@@ -51,10 +51,3 @@ Veto-blocked changes:
Approved changes:
=================
-
- * r1865987, r1866588
- Fix formatting type size mismatches in FSFS.
- Justification:
- Could cause wrong output or uninitialised memory read on some platforms.
- Votes:
- +1: brane, jamessan, stsp
Modified: subversion/branches/1.10.x/subversion/libsvn_fs_fs/verify.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.10.x/subversion/libsvn_fs_fs/verify.c?rev=1876072&r1=1876071&r2=1876072&view=diff
==============================================================================
--- subversion/branches/1.10.x/subversion/libsvn_fs_fs/verify.c (original)
+++ subversion/branches/1.10.x/subversion/libsvn_fs_fs/verify.c Fri Apr 3
04:00:09 2020
@@ -681,10 +681,10 @@ compare_p2l_to_rev(svn_fs_t *fs,
NULL,
_("p2l index entry for revision r%ld"
" at offset %s contains invalid item"
- " type %d"),
+ " type %u"),
start,
apr_off_t_toa(pool, offset),
- entry->type);
+ (unsigned int)entry->type);
/* There can be only one changes entry and that has a fixed type
* and item number. Its presence and parse-ability will be checked
@@ -694,11 +694,12 @@ compare_p2l_to_rev(svn_fs_t *fs,
return svn_error_createf(SVN_ERR_FS_INDEX_CORRUPTION,
NULL,
_("p2l index entry for changes in"
- " revision r%ld is item %ld of type"
- " %d at offset %s"),
+ " revision r%ld is item"
+ " %"APR_UINT64_T_FMT
+ " of type %u at offset %s"),
entry->item.revision,
entry->item.number,
- entry->type,
+ (unsigned int)entry->type,
apr_off_t_toa(pool, offset));
/* Check contents. */
