Skip to content

Commit d90b661

Browse files
committed
Backport merge limits from v5.4.1
1 parent 86e91b8 commit d90b661

2 files changed

Lines changed: 18 additions & 5 deletions

File tree

‎lib/loader.js‎

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -371,19 +371,28 @@ function captureSegment (state, start, end, checkJson) {
371371
}
372372
}
373373

374+
function chargeMergeWork (state) {
375+
state.totalMergeKeys++
376+
377+
if (state.maxTotalMergeKeys !== -1 && state.totalMergeKeys > state.maxTotalMergeKeys) {
378+
throwError(state, 'merge keys exceeded maxTotalMergeKeys (' + state.maxTotalMergeKeys + ')')
379+
}
380+
}
381+
374382
function mergeMappings (state, destination, source, overridableKeys) {
375383
if (!common.isObject(source)) {
376384
throwError(state, 'cannot merge mappings; the provided source object is unacceptable')
377385
}
378386

387+
// Count the source mapping itself to bound sequences of empty mappings.
388+
chargeMergeWork(state)
389+
379390
const sourceKeys = Object.keys(source)
380391

381392
for (let index = 0, quantity = sourceKeys.length; index < quantity; index += 1) {
382393
const key = sourceKeys[index]
383394

384-
if (state.maxTotalMergeKeys !== -1 && ++state.totalMergeKeys > state.maxTotalMergeKeys) {
385-
throwError(state, 'merge keys exceeded maxTotalMergeKeys (' + state.maxTotalMergeKeys + ')')
386-
}
395+
chargeMergeWork(state)
387396

388397
if (!_hasOwnProperty.call(destination, key)) {
389398
setProperty(destination, key, source[key])
@@ -426,6 +435,10 @@ function storeMappingPair (state, _result, overridableKeys, keyTag, keyNode, val
426435

427436
if (keyTag === 'tag:yaml.org,2002:merge') {
428437
if (Array.isArray(valueNode)) {
438+
if (valueNode.length > 100) {
439+
throwError(state, 'abnormal merge sequence size')
440+
}
441+
429442
for (let index = 0, quantity = valueNode.length; index < quantity; index += 1) {
430443
mergeMappings(state, _result, valueNode[index], overridableKeys)
431444
}

‎test/core/units/loader-parameters.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ describe('loader parameters', function () {
7878
'\n- <<: [' + Array.from({ length: n }, (_, i) => `*x${i}`).join(', ') + ']\n'
7979

8080
assert.doesNotThrow(function () {
81-
yaml.load(merge(3), { maxTotalMergeKeys: 5 })
81+
yaml.load(merge(3), { maxTotalMergeKeys: 6 })
8282
})
8383
assert.throws(function () {
8484
yaml.load(merge(3), { maxTotalMergeKeys: 2 })
@@ -102,7 +102,7 @@ b: { <<: *a }
102102
`
103103

104104
assert.doesNotThrow(function () {
105-
yaml.loadAll(src, { maxTotalMergeKeys: 4 })
105+
yaml.loadAll(src, { maxTotalMergeKeys: 6 })
106106
})
107107
assert.throws(function () {
108108
yaml.loadAll(src, { maxTotalMergeKeys: 3 })

0 commit comments

Comments
 (0)