Author: svn-role
Date: Mon Aug 17 04:00:17 2020
New Revision: 1880916
URL: http://svn.apache.org/viewvc?rev=1880916&view=rev
Log:
Merge the 1.14.x-r1880374-fsfs branch:
* r1880374:subversion/libsvn_fs_fs
Fix an uninitialized read in svn_fs_fs__index_append().
Justification:
Uninitialized reads are potentially undefined behaviour.
Branch:
1.14.x-r1880374-fsfs
Votes:
+1: danielsh, hartmannathan, jamessan
Modified:
subversion/branches/1.14.x/ (props changed)
subversion/branches/1.14.x/STATUS
subversion/branches/1.14.x/subversion/libsvn_fs_fs/ (props changed)
subversion/branches/1.14.x/subversion/libsvn_fs_fs/index.c
Propchange: subversion/branches/1.14.x/
------------------------------------------------------------------------------
Merged /subversion/branches/1.14.x-r1880374-fsfs:r1880459-1880915
Modified: subversion/branches/1.14.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1880916&r1=1880915&r2=1880916&view=diff
==============================================================================
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Mon Aug 17 04:00:17 2020
@@ -44,13 +44,3 @@ Veto-blocked changes:
Approved changes:
=================
-
- * r1880374:subversion/libsvn_fs_fs
- Fix an uninitialized read in svn_fs_fs__index_append().
- Justification:
- Uninitialized reads are potentially undefined behaviour.
- Branch:
- 1.14.x-r1880374-fsfs
- Votes:
- +1: danielsh, hartmannathan, jamessan
-
Propchange: subversion/branches/1.14.x/subversion/libsvn_fs_fs/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Aug 17 04:00:17 2020
@@ -0,0 +1,108 @@
+/subversion/branches/1.10-cache-improvements/subversion/libsvn_fs_fs:1669168-1694487
+/subversion/branches/1.11.x/subversion/libsvn_fs_fs:1841316,1841548
+/subversion/branches/1.14.x-r1880374-fsfs/subversion/libsvn_fs_fs:1880459-1880915
+/subversion/branches/1.5.x-r30215/subversion/libsvn_fs_fs:870312
+/subversion/branches/1.7.x-fs-verify/subversion/libsvn_fs_fs:1146708,1161180
+/subversion/branches/1.9-cache-improvements/subversion/libsvn_fs_fs:1678948-1679863
+/subversion/branches/1.9.x/subversion/libsvn_fs_fs:1735680
+/subversion/branches/10Gb/subversion/libsvn_fs_fs:1388102,1388163-1388190,1388195,1388202,1388205,1388211,1388276,1388362,1388375,1388394,1388636,1388639-1388640,1388643-1388644,1388654,1388720,1388789,1388795,1388801,1388805,1388807,1388810,1388816,1389044,1389276,1389289,1389662,1389867,1390017,1390209,1390216,1390407,1390409,1390414,1390419,1390955
+/subversion/branches/atomic-revprop/subversion/libsvn_fs_fs:965046-1000689
+/subversion/branches/authzperf/subversion/libsvn_fs_fs:1613053-1776831
+/subversion/branches/auto-props-sdc/subversion/libsvn_fs_fs:1384106-1401643
+/subversion/branches/bdb-reverse-deltas/subversion/libsvn_fs_fs:872050-872529
+/subversion/branches/cache-server/subversion/libsvn_fs_fs:1458643-1476567
+/subversion/branches/decouple-shelving-cli/subversion/libsvn_fs_fs:1874630-1875035
+/subversion/branches/diff-callbacks3/subversion/libsvn_fs_fs:870059-870761
+/subversion/branches/diff-optimizations/subversion/libsvn_fs_fs:1031270-1037352
+/subversion/branches/diff-optimizations-bytes/subversion/libsvn_fs_fs:1037353-1067789
+/subversion/branches/dont-save-plaintext-passwords-by-default/subversion/libsvn_fs_fs:870728-871118
+/subversion/branches/double-delete/subversion/libsvn_fs_fs:870511-872970
+/subversion/branches/dump-load-cross-check/subversion/libsvn_fs_fs:1654853-1657295
+/subversion/branches/ev2-export/subversion/libsvn_fs_fs:1325914,1332738,1413107
+/subversion/branches/explore-wc/subversion/libsvn_fs_fs:875486,875493,875497,875507,875511,875514,875559,875580-875581,875584,875587,875611,875627,875647,875667-875668,875711-875712,875733-875734,875736,875744-875748,875751,875758,875782,875795-875796,875830,875836,875838,875842,875852,875855,875864,875870,875873,875880,875885-875888,875890,875897-875898,875905,875907-875909,875935,875943-875944,875946,875979,875982-875983,875985-875986,875990,875997
+/subversion/branches/file-externals/subversion/libsvn_fs_fs:871779-873302
+/subversion/branches/fs-rep-sharing/subversion/libsvn_fs_fs:869036-873803
+/subversion/branches/fsfs-format7/subversion/libsvn_fs_fs:1426304,1430673,1433848,1438408,1438982,1441129,1442051,1442068,1442504,1442910,1443171,1443803,1444690,1444693,1444695,1445040,1445080,1446103,1451129,1453590,1454307,1460579,1461851,1461865,1462837,1462904,1463120,1467362,1467382,1469487,1471208,1477166,1478055,1481447,1489817,1489949,1490673-1490674,1491784,1493042,1498029,1498103,1498155,1500054,1507729-1507731,1507735-1507736
+/subversion/branches/fsfs-improvements/subversion/libsvn_fs_fs:1499981-1547039
+/subversion/branches/fsfs-lock-many/subversion/libsvn_fs_fs:1571740-1577217
+/subversion/branches/fsfs-pack/subversion/libsvn_fs_fs:873717-874575
+/subversion/branches/fsx/subversion/libsvn_fs_fs:1507845-1509914
+/subversion/branches/fsx-1.10/subversion/libsvn_fs_fs:1658219-1694500
+/subversion/branches/fsx-id/subversion/libsvn_fs_fs:1645603-1649011
+/subversion/branches/gnome-keyring/subversion/libsvn_fs_fs:870558-871410
+/subversion/branches/gpg-agent-password-store/subversion/libsvn_fs_fs:1005036-1150766
+/subversion/branches/gtest_addition/subversion/libsvn_fs_fs:1452117-1502138
+/subversion/branches/http-protocol-v2/subversion/libsvn_fs_fs:874395-876041
+/subversion/branches/in-memory-cache/subversion/libsvn_fs_fs:869829-871452
+/subversion/branches/in-repo-authz/subversion/libsvn_fs_fs:1414342-1424779
+/subversion/branches/inheritable-props/subversion/libsvn_fs_fs:1297080-1395089
+/subversion/branches/integrate-cache-item-serialization/subversion/libsvn_fs_fs:1068724-1068739
+/subversion/branches/integrate-cache-membuffer/subversion/libsvn_fs_fs:998649-998852
+/subversion/branches/integrate-compression-level/subversion/libsvn_fs_fs:1068651-1072287
+/subversion/branches/integrate-io-improvements/subversion/libsvn_fs_fs:1068684-1072297
+/subversion/branches/integrate-is-cachable/subversion/libsvn_fs_fs:1072568-1074082
+/subversion/branches/integrate-partial-getter/subversion/libsvn_fs_fs:1072558-1076552
+/subversion/branches/integrate-readline-speedup/subversion/libsvn_fs_fs:1072553-1072555
+/subversion/branches/integrate-stream-api-extensions/subversion/libsvn_fs_fs:1068695-1072516
+/subversion/branches/integrate-string-improvements/subversion/libsvn_fs_fs:1068251-1190617
+/subversion/branches/integrate-txdelta-caching/subversion/libsvn_fs_fs:1072541-1078213
+/subversion/branches/issue-2779-dev/subversion/libsvn_fs_fs:965496-984198
+/subversion/branches/issue-2843-dev/subversion/libsvn_fs_fs:871432-874179
+/subversion/branches/issue-3000/subversion/libsvn_fs_fs:871713,871716-871719,871721-871726,871728,871734
+/subversion/branches/issue-3067-deleted-subtrees/subversion/libsvn_fs_fs:873375-874084
+/subversion/branches/issue-3148-dev/subversion/libsvn_fs_fs:875193-875204
+/subversion/branches/issue-3220-dev/subversion/libsvn_fs_fs:872210-872226
+/subversion/branches/issue-3242-dev/subversion/libsvn_fs_fs:879653-896436
+/subversion/branches/issue-3334-dirs/subversion/libsvn_fs_fs:875156-875867
+/subversion/branches/issue-3975/subversion/libsvn_fs_fs:1152931-1160746
+/subversion/branches/issue-4116-dev/subversion/libsvn_fs_fs:1424719-1425040
+/subversion/branches/issue-4194-dev/subversion/libsvn_fs_fs:1410507-1414880
+/subversion/branches/java10-compat/subversion/libsvn_fs_fs:1840620-1841179
+/subversion/branches/javahl-ra/subversion/libsvn_fs_fs:991978-1494640
+/subversion/branches/kwallet/subversion/libsvn_fs_fs:870785-871314
+/subversion/branches/log-addressing/subversion/libsvn_fs_fs:1509279-1546844
+/subversion/branches/log-g-performance/subversion/libsvn_fs_fs:870941-871032
+/subversion/branches/merge-skips-obstructions/subversion/libsvn_fs_fs:874525-874615
+/subversion/branches/move-tracking-2/subversion/libsvn_fs_fs:1606692-1714632
+/subversion/branches/multi-layer-moves/subversion/libsvn_fs_fs:1239019-1300930
+/subversion/branches/nfc-nfd-aware-client/subversion/libsvn_fs_fs:870276,870376
+/subversion/branches/node_pool/subversion/libsvn_fs_fs:1304828-1305388
+/subversion/branches/patch-exec/subversion/libsvn_fs_fs:1692717-1705390
+/subversion/branches/performance/subversion/libsvn_fs_fs:979193,980118,981087,981090,981189,981194,981287,981684,981827,982043,982355,983398,983406,983430,983474,983488,983490,983760,983764,983766,983770,984927,984973,984984,985014,985037,985046,985472,985477,985482,985487-985488,985493,985497,985500,985514,985601,985603,985606,985669,985673,985695,985697,986453,986465,986485,986491-986492,986517,986521,986605,986608,986817,986832,987865,987868-987869,987872,987886-987888,987893,988319,988898,990330,990533,990535-990537,990541,990568,990572,990574-990575,990600,990759,992899,992904,992911,993127,993141,994956,995478,995507,995603,998012,998858,999098,1001413,1001417,1004291,1022668,1022670,1022676,1022715,1022719,1025660,1025672,1027193,1027203,1027206,1027214,1027227,1028077,1028092,1028094,1028104,1028107,1028111,1028354,1029038,1029042-1029043,1029054-1029055,1029062-1029063,1029078,1029080,1029090,1029092-1029093,1029111,1029151,1029158,1029229-1029230,1029232,1029335-1029336,10
29339-1029340,1029342,1029344,1030763,1030827,1031203,1031235,1032285,1032333,1033040,1033057,1033294,1035869,1035882,1039511,1043705,1053735,1056015,1066452,1067683,1067697-1078365
+/subversion/branches/pin-externals/subversion/libsvn_fs_fs:1643757-1659392
+/subversion/branches/py-tests-as-modules/subversion/libsvn_fs_fs:956579-1033052
+/subversion/branches/ra-svn-tuning/subversion/libsvn_fs_fs:1658201-1694489
+/subversion/branches/ra_serf-digest-authn/subversion/libsvn_fs_fs:875693-876404
+/subversion/branches/reintegrate-improvements/subversion/libsvn_fs_fs:873853-874164
+/subversion/branches/remote-only-status/subversion/libsvn_fs_fs:1581845-1586090
+/subversion/branches/resolve-incoming-add/subversion/libsvn_fs_fs:1762797-1764284
+/subversion/branches/revprop-cache/subversion/libsvn_fs_fs:1298521-1326293
+/subversion/branches/revprop-caching-ng/subversion/libsvn_fs_fs:1620597,1620599
+/subversion/branches/revprop-packing/subversion/libsvn_fs_fs:1143907,1143971,1143997,1144017,1144499,1144568,1146145
+/subversion/branches/shelve/subversion/libsvn_fs_fs:1802592-1815226
+/subversion/branches/shelve-checkpoint/subversion/libsvn_fs_fs:1801593-1801923,1801970,1817320,1828508,1828521
+/subversion/branches/shelving-v3/subversion/libsvn_fs_fs:1853394-1853901
+/subversion/branches/subtree-mergeinfo/subversion/libsvn_fs_fs:876734-878766
+/subversion/branches/svn-auth-x509/subversion/libsvn_fs_fs:1603509-1655900
+/subversion/branches/svn-info-detail/subversion/libsvn_fs_fs:1660035-1662618
+/subversion/branches/svn-mergeinfo-enhancements/subversion/libsvn_fs_fs:870119-870195,870197-870288
+/subversion/branches/svn-mergeinfo-normalizer/subversion/libsvn_fs_fs:1642232-1695991
+/subversion/branches/svn-patch-improvements/subversion/libsvn_fs_fs:918519-934609
+/subversion/branches/svn_mutex/subversion/libsvn_fs_fs:1141683-1182099
+/subversion/branches/svnpatch-diff/subversion/libsvn_fs_fs:865738-876477
+/subversion/branches/svnraisetc/subversion/libsvn_fs_fs:874709-875149
+/subversion/branches/svnserve-logging/subversion/libsvn_fs_fs:869828-870893
+/subversion/branches/swig-py3/subversion/libsvn_fs_fs:1813660-1869353
+/subversion/branches/tc-issue-3334/subversion/libsvn_fs_fs:874697-874773
+/subversion/branches/tc-merge-notify/subversion/libsvn_fs_fs:874017-874062
+/subversion/branches/tc-resolve/subversion/libsvn_fs_fs:874191-874239
+/subversion/branches/tc_url_rev/subversion/libsvn_fs_fs:874351-874483
+/subversion/branches/tree-conflicts/subversion/libsvn_fs_fs:868291-873154
+/subversion/branches/tree-conflicts-notify/subversion/libsvn_fs_fs:873926-874008
+/subversion/branches/tristate-chunked-request/subversion/libsvn_fs_fs:1502394-1502681
+/subversion/branches/tweak-build-take-two/subversion/libsvn_fs_fs:1424288-1425049,1425051-1425613
+/subversion/branches/uris-as-urls/subversion/libsvn_fs_fs:1060426-1064427
+/subversion/branches/verify-at-commit/subversion/libsvn_fs_fs:1462039-1462408
+/subversion/branches/verify-keep-going/subversion/libsvn_fs_fs:1439280-1546110
+/subversion/branches/wc-collate-path/subversion/libsvn_fs_fs:1402685-1480384
+/subversion/trunk/subversion/libsvn_fs_fs:1875680,1875726,1875742,1875762,1875918,1875921,1875925,1875973,1876010,1876016,1876020,1876050,1876054,1876068,1876410,1876662,1876707,1876734,1876906,1877072,1877259,1877318,1877712,1877788,1877960,1878141-1878144,1878413,1878909,1878918,1878950,1879198,1880374
Modified: subversion/branches/1.14.x/subversion/libsvn_fs_fs/index.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/subversion/libsvn_fs_fs/index.c?rev=1880916&r1=1880915&r2=1880916&view=diff
==============================================================================
--- subversion/branches/1.14.x/subversion/libsvn_fs_fs/index.c (original)
+++ subversion/branches/1.14.x/subversion/libsvn_fs_fs/index.c Mon Aug 17
04:00:17 2020
@@ -827,7 +827,7 @@ svn_fs_fs__l2p_index_append(svn_checksum
&eof, local_pool));
/* handle new revision */
- if ((entry > 0 && proto_entry.offset == 0) || eof)
+ if (eof || (entry > 0 && proto_entry.offset == 0))
{
/* dump entries, grouped into pages */
