Skip to content

Commit 50968b8

Browse files
committed
dist rebuild
1 parent d092d86 commit 50968b8

File tree

3 files changed

+44
-33
lines changed

3 files changed

+44
-33
lines changed

dist/js-yaml.js

Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11

2-
/*! js-yaml 4.1.0 https://github.com/nodeca/js-yaml @license MIT */
2+
/*! js-yaml 4.1.1 https://github.com/nodeca/js-yaml @license MIT */
33
(function (global, factory) {
44
typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
55
typeof define === 'function' && define.amd ? define(['exports'], factory) :
66
(global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.jsyaml = {}));
7-
}(this, (function (exports) { 'use strict';
7+
})(this, (function (exports) { 'use strict';
88

99
function isNothing(subject) {
1010
return (typeof subject === 'undefined') || (subject === null);
@@ -1216,6 +1216,22 @@
12161216
);
12171217
}
12181218

1219+
// set a property of a literal object, while protecting against prototype pollution,
1220+
// see https://github.com/nodeca/js-yaml/issues/164 for more details
1221+
function setProperty(object, key, value) {
1222+
// used for this specific key only because Object.defineProperty is slow
1223+
if (key === '__proto__') {
1224+
Object.defineProperty(object, key, {
1225+
configurable: true,
1226+
enumerable: true,
1227+
writable: true,
1228+
value: value
1229+
});
1230+
} else {
1231+
object[key] = value;
1232+
}
1233+
}
1234+
12191235
var simpleEscapeCheck = new Array(256); // integer, for fast access
12201236
var simpleEscapeMap = new Array(256);
12211237
for (var i = 0; i < 256; i++) {
@@ -1394,7 +1410,7 @@
13941410
key = sourceKeys[index];
13951411

13961412
if (!_hasOwnProperty$1.call(destination, key)) {
1397-
destination[key] = source[key];
1413+
setProperty(destination, key, source[key]);
13981414
overridableKeys[key] = true;
13991415
}
14001416
}
@@ -1454,17 +1470,7 @@
14541470
throwError(state, 'duplicated mapping key');
14551471
}
14561472

1457-
// used for this specific key only because Object.defineProperty is slow
1458-
if (keyNode === '__proto__') {
1459-
Object.defineProperty(_result, keyNode, {
1460-
configurable: true,
1461-
enumerable: true,
1462-
writable: true,
1463-
value: valueNode
1464-
});
1465-
} else {
1466-
_result[keyNode] = valueNode;
1467-
}
1473+
setProperty(_result, keyNode, valueNode);
14681474
delete overridableKeys[keyNode];
14691475
}
14701476

@@ -3860,7 +3866,7 @@
38603866
exports.Schema = Schema;
38613867
exports.Type = Type;
38623868
exports.YAMLException = YAMLException;
3863-
exports.default = jsYaml;
3869+
exports["default"] = jsYaml;
38643870
exports.dump = dump;
38653871
exports.load = load;
38663872
exports.loadAll = loadAll;
@@ -3871,4 +3877,4 @@
38713877

38723878
Object.defineProperty(exports, '__esModule', { value: true });
38733879

3874-
})));
3880+
}));

0 commit comments

Comments
 (0)