Skip to content

Commit 5a708f9

Browse files
puzrinpuzrin
committed
dist rebuild
1 parent 3485bc0 commit 5a708f9

2 files changed

Lines changed: 18 additions & 5 deletions

File tree

‎dist/js-yaml.js‎

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*! js-yaml 3.15.1 https://github.com/nodeca/js-yaml */(function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.jsyaml = f()}})(function(){var define,module,exports;return (function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(require,module,exports){
1+
/*! js-yaml 3.15.2 https://github.com/nodeca/js-yaml */(function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.jsyaml = f()}})(function(){var define,module,exports;return (function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(require,module,exports){
22
'use strict';
33

44

@@ -1283,21 +1283,30 @@ function captureSegment(state, start, end, checkJson) {
12831283
}
12841284
}
12851285

1286+
function chargeMergeWork(state) {
1287+
state.totalMergeKeys += 1;
1288+
1289+
if (state.maxTotalMergeKeys !== -1 && state.totalMergeKeys > state.maxTotalMergeKeys) {
1290+
throwError(state, 'merge keys exceeded maxTotalMergeKeys (' + state.maxTotalMergeKeys + ')');
1291+
}
1292+
}
1293+
12861294
function mergeMappings(state, destination, source, overridableKeys) {
12871295
var sourceKeys, key, index, quantity;
12881296

12891297
if (!common.isObject(source)) {
12901298
throwError(state, 'cannot merge mappings; the provided source object is unacceptable');
12911299
}
12921300

1301+
// Count the source mapping itself to bound sequences of empty mappings.
1302+
chargeMergeWork(state);
1303+
12931304
sourceKeys = Object.keys(source);
12941305

12951306
for (index = 0, quantity = sourceKeys.length; index < quantity; index += 1) {
12961307
key = sourceKeys[index];
12971308

1298-
if (state.maxTotalMergeKeys !== -1 && ++state.totalMergeKeys > state.maxTotalMergeKeys) {
1299-
throwError(state, 'merge keys exceeded maxTotalMergeKeys (' + state.maxTotalMergeKeys + ')');
1300-
}
1309+
chargeMergeWork(state);
13011310

13021311
if (!_hasOwnProperty.call(destination, key)) {
13031312
setProperty(destination, key, source[key]);
@@ -1342,6 +1351,10 @@ function storeMappingPair(state, _result, overridableKeys, keyTag, keyNode, valu
13421351

13431352
if (keyTag === 'tag:yaml.org,2002:merge') {
13441353
if (Array.isArray(valueNode)) {
1354+
if (valueNode.length > 100) {
1355+
throwError(state, 'abnormal merge sequence size');
1356+
}
1357+
13451358
for (index = 0, quantity = valueNode.length; index < quantity; index += 1) {
13461359
mergeMappings(state, _result, valueNode[index], overridableKeys);
13471360
}

0 commit comments

Comments
 (0)