120034 2013-08-19 16:14:46 -0700 Remove custom getOwnPropertyDescriptor for global objects 2013-08-19 22:46:13 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 barraclough barraclough commit-queue ggaren sam oldest_to_newest 918842 0 barraclough 2013-08-19 16:14:46 -0700 Fix attributes of JSC SynbolTableObject entries, ensure that cross frame access is safe, and suppress prototype chain walk. 918848 1 209137 barraclough 2013-08-19 16:21:06 -0700 Created attachment 209137 Fix 918849 2 commit-queue 2013-08-19 16:23:15 -0700 Attachment 209137 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/JavaScriptCore/ChangeLog', u'Source/JavaScriptCore/runtime/JSGlobalObject.cpp', u'Source/JavaScriptCore/runtime/JSSymbolTableObject.h', u'Source/JavaScriptCore/runtime/PropertyDescriptor.h', u'Source/JavaScriptCore/runtime/PropertySlot.h', u'Source/WebCore/ChangeLog', u'Source/WebCore/bindings/js/JSDOMWindowCustom.cpp']" exit_code: 1 Source/JavaScriptCore/runtime/PropertyDescriptor.h:94: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Total errors found: 1 in 7 files If any of these errors are false positives, please file a bug against check-webkit-style. 918885 3 209137 ggaren 2013-08-19 17:30:29 -0700 Comment on attachment 209137 Fix r=me 918942 4 barraclough 2013-08-19 22:46:13 -0700 Committed revision 154313. 209137 2013-08-19 16:21:06 -0700 2013-08-19 17:30:29 -0700 Fix 120034.1.patch text/plain 12610 barraclough SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTU0MzA0KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBA CisyMDEzLTA4LTE5ICBHYXZpbiBCYXJyYWNsb3VnaCAgPGJhcnJhY2xvdWdoQGFwcGxlLmNvbT4K KworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTIwMDM0 CisgICAgICAgIFJlbW92ZSBjdXN0b20gZ2V0T3duUHJvcGVydHlEZXNjcmlwdG9yIGZvciBnbG9i YWwgb2JqZWN0cworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIEZpeCBhdHRyaWJ1dGVzIG9mIEpTQyBTeW5ib2xUYWJsZU9iamVjdCBlbnRyaWVzLCBlbnN1 cmUgdGhhdCBjcm9zcyBmcmFtZSBhY2Nlc3MgaXMgc2FmZSwgYW5kIHN1cHByZXNzIHByb3RvdHlw ZSBjaGFpbiB3YWxrLgorCisgICAgICAgICogcnVudGltZS9KU0dsb2JhbE9iamVjdC5jcHA6Cisg ICAgICAgICAgICAtIFJlbW92ZSBjdXN0b20gZ2V0T3duUHJvcGVydHlEZXNjcmlwdG9yIGltcGxl bWVudGF0aW9uLgorICAgICAgICAqIHJ1bnRpbWUvSlNTeW1ib2xUYWJsZU9iamVjdC5oOgorICAg ICAgICAoSlNDOjpzeW1ib2xUYWJsZUdldCk6CisgICAgICAgICAgICAtIFRoZSBzeW1ib2wgdGFi bGUgZG9lcyBub3Qgc3RvcmUgdGhlIERvbnREZWxldGUgYXR0cmlidXRlLCB3ZSBzaG91bGQgYmUg YWRkaW5nIGl0IGJhY2sgaW4uCisgICAgICAgICogcnVudGltZS9Qcm9wZXJ0eURlc2NyaXB0b3Iu aDoKKyAgICAgICAgICAgIC0gSlNET01XaW5kb3cgd2Fsa3MgdGhlIHByb3RvdHlwZSBjaGFpbiBv biBvd24gYWNjZXNzLiBUaGlzIGlzIGJhZCwgYnV0IGZvciBub3cgd29ya2Fyb3VuZCBmb3IgdGhl IGdldE93blByb3BlcnR5RGVzY3JpcHRvciBjYXNlLgorICAgICAgICAqIHJ1bnRpbWUvUHJvcGVy dHlTbG90Lmg6CisgICAgICAgIChKU0M6OlByb3BlcnR5U2xvdDo6c2V0VW5kZWZpbmVkKToKKyAg ICAgICAgICAgIC0gVGhpcyBpcyB1c2VkIGJ5IFdlYkNvcmUgd2hlbiBibG9ja2luZyBhY2Nlc3Mg dG8gcHJvcGVydGllcyBvbiBjcm9zcy1mcmFtZSBhY2Nlc3MuCisgICAgICAgICAgICAgIE1hcmsg YmxvY2tlZCBwcm9wZXJ0aWVzIGFzIHJlYWQtb25seSwgbm9uLWNvbmZpZ3VyYWJsZSB0byBwcmV2 ZW50IGRlZmluZVByb3BlcnR5LgorCiAyMDEzLTA4LTE4ICBGaWxpcCBQaXpsbyAgPGZwaXpsb0Bh cHBsZS5jb20+CiAKICAgICAgICAgPGh0dHBzOi8vd2Via2l0Lm9yZy9iLzExOTk5ND4gREZHIG5l dyBBcnJheSgpIGlubGluaW5nIGNvdWxkIGdldCBjb25mdXNlZCBhYm91dCBnbG9iYWwgb2JqZWN0 cwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNHbG9iYWxPYmplY3QuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTR2xvYmFsT2Jq ZWN0LmNwcAkocmV2aXNpb24gMTU0Mjk5KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRp bWUvSlNHbG9iYWxPYmplY3QuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC02NDEsMTMgKzY0MSw3IEBA IGJvb2wgSlNHbG9iYWxPYmplY3Q6OmdldE93blByb3BlcnR5U2xvdCgKICAgICByZXR1cm4gc3lt Ym9sVGFibGVHZXQodGhpc09iamVjdCwgcHJvcGVydHlOYW1lLCBzbG90KTsKIH0KIAotYm9vbCBK U0dsb2JhbE9iamVjdDo6Z2V0T3duUHJvcGVydHlEZXNjcmlwdG9yKEpTT2JqZWN0KiBvYmplY3Qs IEV4ZWNTdGF0ZSogZXhlYywgUHJvcGVydHlOYW1lIHByb3BlcnR5TmFtZSwgUHJvcGVydHlEZXNj cmlwdG9yJiBkZXNjcmlwdG9yKQotewotICAgIEpTR2xvYmFsT2JqZWN0KiB0aGlzT2JqZWN0ID0g anNDYXN0PEpTR2xvYmFsT2JqZWN0Kj4ob2JqZWN0KTsKLSAgICBpZiAoZ2V0U3RhdGljRnVuY3Rp b25EZXNjcmlwdG9yPEJhc2U+KGV4ZWMsIEV4ZWNTdGF0ZTo6Z2xvYmFsT2JqZWN0VGFibGUoZXhl YyksIHRoaXNPYmplY3QsIHByb3BlcnR5TmFtZSwgZGVzY3JpcHRvcikpCi0gICAgICAgIHJldHVy biB0cnVlOwotICAgIHJldHVybiBzeW1ib2xUYWJsZUdldCh0aGlzT2JqZWN0LCBwcm9wZXJ0eU5h bWUsIGRlc2NyaXB0b3IpOwotfQorR0VUX09XTl9QUk9QRVJUWV9ERVNDUklQVE9SX0lNUEwoSlNH bG9iYWxPYmplY3QpCiAKIHZvaWQgSlNHbG9iYWxPYmplY3Q6OmNsZWFyUmFyZURhdGEoSlNDZWxs KiBjZWxsKQogewpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNTeW1ib2xU YWJsZU9iamVjdC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1l L0pTU3ltYm9sVGFibGVPYmplY3QuaAkocmV2aXNpb24gMTU0Mjk5KQorKysgU291cmNlL0phdmFT Y3JpcHRDb3JlL3J1bnRpbWUvSlNTeW1ib2xUYWJsZU9iamVjdC5oCSh3b3JraW5nIGNvcHkpCkBA IC03OSw3ICs3OSw3IEBAIGlubGluZSBib29sIHN5bWJvbFRhYmxlR2V0KAogICAgICAgICByZXR1 cm4gZmFsc2U7CiAgICAgU3ltYm9sVGFibGVFbnRyeTo6RmFzdCBlbnRyeSA9IGl0ZXItPnZhbHVl OwogICAgIEFTU0VSVCghZW50cnkuaXNOdWxsKCkpOwotICAgIHNsb3Quc2V0VmFsdWUob2JqZWN0 LCBlbnRyeS5nZXRBdHRyaWJ1dGVzKCksIG9iamVjdC0+cmVnaXN0ZXJBdChlbnRyeS5nZXRJbmRl eCgpKS5nZXQoKSk7CisgICAgc2xvdC5zZXRWYWx1ZShvYmplY3QsIGVudHJ5LmdldEF0dHJpYnV0 ZXMoKSB8IERvbnREZWxldGUsIG9iamVjdC0+cmVnaXN0ZXJBdChlbnRyeS5nZXRJbmRleCgpKS5n ZXQoKSk7CiAgICAgcmV0dXJuIHRydWU7CiB9CiAKQEAgLTExMSw3ICsxMTEsNyBAQCBpbmxpbmUg Ym9vbCBzeW1ib2xUYWJsZUdldCgKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIFN5bWJvbFRh YmxlRW50cnk6OkZhc3QgZW50cnkgPSBpdGVyLT52YWx1ZTsKICAgICBBU1NFUlQoIWVudHJ5Lmlz TnVsbCgpKTsKLSAgICBzbG90LnNldFZhbHVlKG9iamVjdCwgZW50cnkuZ2V0QXR0cmlidXRlcygp LCBvYmplY3QtPnJlZ2lzdGVyQXQoZW50cnkuZ2V0SW5kZXgoKSkuZ2V0KCkpOworICAgIHNsb3Qu c2V0VmFsdWUob2JqZWN0LCBlbnRyeS5nZXRBdHRyaWJ1dGVzKCkgfCBEb250RGVsZXRlLCBvYmpl Y3QtPnJlZ2lzdGVyQXQoZW50cnkuZ2V0SW5kZXgoKSkuZ2V0KCkpOwogICAgIHNsb3RJc1dyaXRl YWJsZSA9ICFlbnRyeS5pc1JlYWRPbmx5KCk7CiAgICAgcmV0dXJuIHRydWU7CiB9CkluZGV4OiBT b3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9Qcm9wZXJ0eURlc2NyaXB0b3IuaAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9Qcm9wZXJ0eURlc2NyaXB0b3Iu aAkocmV2aXNpb24gMTU0MzAwKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvUHJv cGVydHlEZXNjcmlwdG9yLmgJKHdvcmtpbmcgY29weSkKQEAgLTkxLDYgKzkxLDkgQEAgYm9vbCBD bGFzc05hbWU6OmdldE93blByb3BlcnR5RGVzY3JpcHRvcgogICAgIEpTQzo6UHJvcGVydHlTbG90 IHNsb3Qob2JqZWN0KTsgXAogICAgIGlmICghZ2V0T3duUHJvcGVydHlTbG90KG9iamVjdCwgZXhl YywgcHJvcGVydHlOYW1lLCBzbG90KSkgXAogICAgICAgICByZXR1cm4gZmFsc2U7IFwKKyAgICAv KiBXb3JrYXJvdW5kLCBKU0RPTVdpbmRvdzo6Z2V0T3duUHJvcGVydHlTbG90IHNlYXJjaGVzIHRo ZSBwcm90b3R5cGUgY2hhaW4uIDotKCAqLyBcCisgICAgaWYgKHNsb3Quc2xvdEJhc2UoKSAmJiBz bG90LnNsb3RCYXNlKCkgIT0gb2JqZWN0KSBcCisgICAgICAgIHJldHVybiBmYWxzZTsgXAogICAg IGlmIChzbG90LmlzR2V0dGVyKCkpIFwKICAgICAgICAgZGVzY3JpcHRvci5zZXRBY2Nlc3NvckRl c2NyaXB0b3Ioc2xvdC5nZXR0ZXJTZXR0ZXIoKSwgc2xvdC5hdHRyaWJ1dGVzKCkpOyBcCiAgICAg ZWxzZSBcCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9Qcm9wZXJ0eVNsb3Qu aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9Qcm9wZXJ0eVNs b3QuaAkocmV2aXNpb24gMTU0MzAwKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUv UHJvcGVydHlTbG90LmgJKHdvcmtpbmcgY29weSkKQEAgLTIwMCw2ICsyMDAsNyBAQCBwdWJsaWM6 CiAgICAgdm9pZCBzZXRVbmRlZmluZWQoKQogICAgIHsKICAgICAgICAgbV9kYXRhLnZhbHVlID0g SlNWYWx1ZTo6ZW5jb2RlKGpzVW5kZWZpbmVkKCkpOworICAgICAgICBtX2F0dHJpYnV0ZXMgPSBS ZWFkT25seSB8IERvbnREZWxldGUgfCBEb250RW51bTsKIAogICAgICAgICBtX3Nsb3RCYXNlID0g MDsKICAgICAgICAgbV9wcm9wZXJ0eVR5cGUgPSBUeXBlVmFsdWU7CkluZGV4OiBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCShy ZXZpc2lvbiAxNTQzMDQpCisrKyBTb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cJKHdvcmtpbmcgY29w eSkKQEAgLTEsMyArMSwxNyBAQAorMjAxMy0wOC0xOSAgR2F2aW4gQmFycmFjbG91Z2ggIDxiYXJy YWNsb3VnaEBhcHBsZS5jb20+CisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTEyMDAzNAorICAgICAgICBSZW1vdmUgY3VzdG9tIGdldE93blByb3BlcnR5 RGVzY3JpcHRvciBmb3IgZ2xvYmFsIG9iamVjdHMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBGaXggYXR0cmlidXRlcyBvZiBKU0MgU3luYm9sVGFibGVP YmplY3QgZW50cmllcywgZW5zdXJlIHRoYXQgY3Jvc3MgZnJhbWUgYWNjZXNzIGlzIHNhZmUsIGFu ZCBzdXBwcmVzcyBwcm90b3R5cGUgY2hhaW4gd2Fsay4KKworICAgICAgICAqIGJpbmRpbmdzL2pz L0pTRE9NV2luZG93Q3VzdG9tLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkpTRE9NV2luZG93Ojpn ZXRPd25Qcm9wZXJ0eVNsb3QpOgorICAgICAgICAgICAgLSBSZW1vdmUgY3VzdG9tIGdldE93blBy b3BlcnR5RGVzY3JpcHRvciBpbXBsZW1lbnRhdGlvbiwgb24gY3Jvc3MtZnJhbWUgYWNjZXNzIGVu c3VyZQorICAgICAgICAgICAgICBhbGwgcHJvcGVydGllcyBhcmUgbWFya2VkIGFzIHJlYWQtb25s eSwgbm9uLWNvbmZpZ3VyYWJsZSB0byBwcmV2ZW50IGRlZmluZVByb3BlcnR5LgorCiAyMDEzLTA4 LTE5ICBHYXZpbiBCYXJyYWNsb3VnaCAgPGJhcnJhY2xvdWdoQGFwcGxlLmNvbT4KIAogICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE5OTk1CkluZGV4OiBT b3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0RPTVdpbmRvd0N1c3RvbS5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNET01XaW5kb3dDdXN0b20uY3BwCShy ZXZpc2lvbiAxNTQyOTkpCisrKyBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0RPTVdpbmRv d0N1c3RvbS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE2MSwyMiArMTYxLDIyIEBAIGJvb2wgSlNE T01XaW5kb3c6OmdldE93blByb3BlcnR5U2xvdChKU08KICAgICAgICAgaWYgKGVudHJ5LT5hdHRy aWJ1dGVzKCkgJiBKU0M6OkZ1bmN0aW9uKSB7CiAgICAgICAgICAgICBpZiAoZW50cnktPmZ1bmN0 aW9uKCkgPT0ganNET01XaW5kb3dQcm90b3R5cGVGdW5jdGlvbkJsdXIpIHsKICAgICAgICAgICAg ICAgICBpZiAoIWFsbG93c0FjY2VzcykgewotICAgICAgICAgICAgICAgICAgICBzbG90LnNldEN1 c3RvbSh0aGlzT2JqZWN0LCBlbnRyeS0+YXR0cmlidXRlcygpLCBub25DYWNoaW5nU3RhdGljRnVu Y3Rpb25HZXR0ZXI8anNET01XaW5kb3dQcm90b3R5cGVGdW5jdGlvbkJsdXIsIDA+KTsKKyAgICAg ICAgICAgICAgICAgICAgc2xvdC5zZXRDdXN0b20odGhpc09iamVjdCwgUmVhZE9ubHkgfCBEb250 RGVsZXRlIHwgRG9udEVudW0sIG5vbkNhY2hpbmdTdGF0aWNGdW5jdGlvbkdldHRlcjxqc0RPTVdp bmRvd1Byb3RvdHlwZUZ1bmN0aW9uQmx1ciwgMD4pOwogICAgICAgICAgICAgICAgICAgICByZXR1 cm4gdHJ1ZTsKICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICB9IGVsc2UgaWYgKGVudHJ5 LT5mdW5jdGlvbigpID09IGpzRE9NV2luZG93UHJvdG90eXBlRnVuY3Rpb25DbG9zZSkgewogICAg ICAgICAgICAgICAgIGlmICghYWxsb3dzQWNjZXNzKSB7Ci0gICAgICAgICAgICAgICAgICAgIHNs b3Quc2V0Q3VzdG9tKHRoaXNPYmplY3QsIGVudHJ5LT5hdHRyaWJ1dGVzKCksIG5vbkNhY2hpbmdT dGF0aWNGdW5jdGlvbkdldHRlcjxqc0RPTVdpbmRvd1Byb3RvdHlwZUZ1bmN0aW9uQ2xvc2UsIDA+ KTsKKyAgICAgICAgICAgICAgICAgICAgc2xvdC5zZXRDdXN0b20odGhpc09iamVjdCwgUmVhZE9u bHkgfCBEb250RGVsZXRlIHwgRG9udEVudW0sIG5vbkNhY2hpbmdTdGF0aWNGdW5jdGlvbkdldHRl cjxqc0RPTVdpbmRvd1Byb3RvdHlwZUZ1bmN0aW9uQ2xvc2UsIDA+KTsKICAgICAgICAgICAgICAg ICAgICAgcmV0dXJuIHRydWU7CiAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgfSBlbHNl IGlmIChlbnRyeS0+ZnVuY3Rpb24oKSA9PSBqc0RPTVdpbmRvd1Byb3RvdHlwZUZ1bmN0aW9uRm9j dXMpIHsKICAgICAgICAgICAgICAgICBpZiAoIWFsbG93c0FjY2VzcykgewotICAgICAgICAgICAg ICAgICAgICBzbG90LnNldEN1c3RvbSh0aGlzT2JqZWN0LCBlbnRyeS0+YXR0cmlidXRlcygpLCBu b25DYWNoaW5nU3RhdGljRnVuY3Rpb25HZXR0ZXI8anNET01XaW5kb3dQcm90b3R5cGVGdW5jdGlv bkZvY3VzLCAwPik7CisgICAgICAgICAgICAgICAgICAgIHNsb3Quc2V0Q3VzdG9tKHRoaXNPYmpl Y3QsIFJlYWRPbmx5IHwgRG9udERlbGV0ZSB8IERvbnRFbnVtLCBub25DYWNoaW5nU3RhdGljRnVu Y3Rpb25HZXR0ZXI8anNET01XaW5kb3dQcm90b3R5cGVGdW5jdGlvbkZvY3VzLCAwPik7CiAgICAg ICAgICAgICAgICAgICAgIHJldHVybiB0cnVlOwogICAgICAgICAgICAgICAgIH0KICAgICAgICAg ICAgIH0gZWxzZSBpZiAoZW50cnktPmZ1bmN0aW9uKCkgPT0ganNET01XaW5kb3dQcm90b3R5cGVG dW5jdGlvblBvc3RNZXNzYWdlKSB7CiAgICAgICAgICAgICAgICAgaWYgKCFhbGxvd3NBY2Nlc3Mp IHsKLSAgICAgICAgICAgICAgICAgICAgc2xvdC5zZXRDdXN0b20odGhpc09iamVjdCwgZW50cnkt PmF0dHJpYnV0ZXMoKSwgbm9uQ2FjaGluZ1N0YXRpY0Z1bmN0aW9uR2V0dGVyPGpzRE9NV2luZG93 UHJvdG90eXBlRnVuY3Rpb25Qb3N0TWVzc2FnZSwgMj4pOworICAgICAgICAgICAgICAgICAgICBz bG90LnNldEN1c3RvbSh0aGlzT2JqZWN0LCBSZWFkT25seSB8IERvbnREZWxldGUgfCBEb250RW51 bSwgbm9uQ2FjaGluZ1N0YXRpY0Z1bmN0aW9uR2V0dGVyPGpzRE9NV2luZG93UHJvdG90eXBlRnVu Y3Rpb25Qb3N0TWVzc2FnZSwgMj4pOwogICAgICAgICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsK ICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICB9IGVsc2UgaWYgKGVudHJ5LT5mdW5jdGlv bigpID09IGpzRE9NV2luZG93UHJvdG90eXBlRnVuY3Rpb25TaG93TW9kYWxEaWFsb2cpIHsKQEAg LTE5OCw3ICsxOTgsNyBAQCBib29sIEpTRE9NV2luZG93OjpnZXRPd25Qcm9wZXJ0eVNsb3QoSlNP CiAKICAgICBlbnRyeSA9IEpTRE9NV2luZG93OjppbmZvKCktPnByb3BIYXNoVGFibGUoZXhlYykt PmVudHJ5KGV4ZWMsIHByb3BlcnR5TmFtZSk7CiAgICAgaWYgKGVudHJ5KSB7Ci0gICAgICAgIHNs b3Quc2V0Q3VzdG9tKHRoaXNPYmplY3QsIGVudHJ5LT5hdHRyaWJ1dGVzKCksIGVudHJ5LT5wcm9w ZXJ0eUdldHRlcigpKTsKKyAgICAgICAgc2xvdC5zZXRDdXN0b20odGhpc09iamVjdCwgYWxsb3dz QWNjZXNzID8gZW50cnktPmF0dHJpYnV0ZXMoKSA6IFJlYWRPbmx5IHwgRG9udERlbGV0ZSB8IERv bnRFbnVtLCBlbnRyeS0+cHJvcGVydHlHZXR0ZXIoKSk7CiAgICAgICAgIHJldHVybiB0cnVlOwog ICAgIH0KIApAQCAtMzMxLDc4ICszMzEsNyBAQCBib29sIEpTRE9NV2luZG93OjpnZXRPd25Qcm9w ZXJ0eVNsb3RCeUluCiAgICAgcmV0dXJuIEJhc2U6OmdldE93blByb3BlcnR5U2xvdEJ5SW5kZXgo dGhpc09iamVjdCwgZXhlYywgaW5kZXgsIHNsb3QpOwogfQogCi1ib29sIEpTRE9NV2luZG93Ojpn ZXRPd25Qcm9wZXJ0eURlc2NyaXB0b3IoSlNPYmplY3QqIG9iamVjdCwgRXhlY1N0YXRlKiBleGVj LCBQcm9wZXJ0eU5hbWUgcHJvcGVydHlOYW1lLCBQcm9wZXJ0eURlc2NyaXB0b3ImIGRlc2NyaXB0 b3IpCi17Ci0gICAgSlNET01XaW5kb3cqIHRoaXNPYmplY3QgPSBqc0Nhc3Q8SlNET01XaW5kb3cq PihvYmplY3QpOwotICAgIC8vIE5ldmVyIGFsbG93IGNyb3NzLWRvbWFpbiBnZXRPd25Qcm9wZXJ0 eURlc2NyaXB0b3IKLSAgICBpZiAoIUJpbmRpbmdTZWN1cml0eTo6c2hvdWxkQWxsb3dBY2Nlc3NU b0RPTVdpbmRvdyhleGVjLCB0aGlzT2JqZWN0LT5pbXBsKCkpKQotICAgICAgICByZXR1cm4gZmFs c2U7Ci0KLSAgICBjb25zdCBIYXNoRW50cnkqIGVudHJ5OwotICAgIAotICAgIC8vIFdlIGRvbid0 IHdhbnQgYW55IHByb3BlcnRpZXMgb3RoZXIgdGhhbiAiY2xvc2UiIGFuZCAiY2xvc2VkIiBvbiBh IGNsb3NlZCB3aW5kb3cuCi0gICAgaWYgKCF0aGlzT2JqZWN0LT5pbXBsKCktPmZyYW1lKCkpIHsK LSAgICAgICAgLy8gVGhlIGZvbGxvd2luZyBjb2RlIGlzIHNhZmUgZm9yIGNyb3NzLWRvbWFpbiBh bmQgc2FtZSBkb21haW4gdXNlLgotICAgICAgICAvLyBJdCBpZ25vcmVzIGFueSBjdXN0b20gcHJv cGVydGllcyB0aGF0IG1pZ2h0IGJlIHNldCBvbiB0aGUgRE9NV2luZG93IChpbmNsdWRpbmcgYSBj dXN0b20gcHJvdG90eXBlKS4KLSAgICAgICAgZW50cnkgPSBzX2luZm8ucHJvcEhhc2hUYWJsZShl eGVjKS0+ZW50cnkoZXhlYywgcHJvcGVydHlOYW1lKTsKLSAgICAgICAgaWYgKGVudHJ5ICYmICEo ZW50cnktPmF0dHJpYnV0ZXMoKSAmIEpTQzo6RnVuY3Rpb24pICYmIGVudHJ5LT5wcm9wZXJ0eUdl dHRlcigpID09IGpzRE9NV2luZG93Q2xvc2VkKSB7Ci0gICAgICAgICAgICBkZXNjcmlwdG9yLnNl dERlc2NyaXB0b3IoanNCb29sZWFuKHRydWUpLCBSZWFkT25seSB8IERvbnREZWxldGUgfCBEb250 RW51bSk7Ci0gICAgICAgICAgICByZXR1cm4gdHJ1ZTsKLSAgICAgICAgfQotICAgICAgICBlbnRy eSA9IEpTRE9NV2luZG93UHJvdG90eXBlOjppbmZvKCktPnByb3BIYXNoVGFibGUoZXhlYyktPmVu dHJ5KGV4ZWMsIHByb3BlcnR5TmFtZSk7Ci0gICAgICAgIGlmIChlbnRyeSAmJiAoZW50cnktPmF0 dHJpYnV0ZXMoKSAmIEpTQzo6RnVuY3Rpb24pICYmIGVudHJ5LT5mdW5jdGlvbigpID09IGpzRE9N V2luZG93UHJvdG90eXBlRnVuY3Rpb25DbG9zZSkgewotICAgICAgICAgICAgUHJvcGVydHlTbG90 IHNsb3QodGhpc09iamVjdCk7Ci0gICAgICAgICAgICBzbG90LnNldEN1c3RvbSh0aGlzT2JqZWN0 LCBSZWFkT25seSB8IERvbnREZWxldGUgfCBEb250RW51bSwgbm9uQ2FjaGluZ1N0YXRpY0Z1bmN0 aW9uR2V0dGVyPGpzRE9NV2luZG93UHJvdG90eXBlRnVuY3Rpb25DbG9zZSwgMD4pOwotICAgICAg ICAgICAgZGVzY3JpcHRvci5zZXREZXNjcmlwdG9yKHNsb3QuZ2V0VmFsdWUoZXhlYywgcHJvcGVy dHlOYW1lKSwgUmVhZE9ubHkgfCBEb250RGVsZXRlIHwgRG9udEVudW0pOwotICAgICAgICAgICAg cmV0dXJuIHRydWU7Ci0gICAgICAgIH0KLSAgICAgICAgZGVzY3JpcHRvci5zZXRVbmRlZmluZWQo KTsKLSAgICAgICAgcmV0dXJuIHRydWU7Ci0gICAgfQotCi0gICAgZW50cnkgPSBKU0RPTVdpbmRv dzo6aW5mbygpLT5wcm9wSGFzaFRhYmxlKGV4ZWMpLT5lbnRyeShleGVjLCBwcm9wZXJ0eU5hbWUp OwotICAgIGlmIChlbnRyeSkgewotICAgICAgICBQcm9wZXJ0eVNsb3Qgc2xvdCh0aGlzT2JqZWN0 KTsKLSAgICAgICAgc2xvdC5zZXRDdXN0b20odGhpc09iamVjdCwgZW50cnktPmF0dHJpYnV0ZXMo KSwgZW50cnktPnByb3BlcnR5R2V0dGVyKCkpOwotICAgICAgICBkZXNjcmlwdG9yLnNldERlc2Ny aXB0b3Ioc2xvdC5nZXRWYWx1ZShleGVjLCBwcm9wZXJ0eU5hbWUpLCBlbnRyeS0+YXR0cmlidXRl cygpKTsKLSAgICAgICAgcmV0dXJuIHRydWU7Ci0gICAgfQotICAgIAotICAgIC8vIENoZWNrIGZv ciBjaGlsZCBmcmFtZXMgYnkgbmFtZSBiZWZvcmUgYnVpbHQtaW4gcHJvcGVydGllcyB0bwotICAg IC8vIG1hdGNoIE1vemlsbGEuIFRoaXMgZG9lcyBub3QgbWF0Y2ggSUUsIGJ1dCBzb21lIHNpdGVz IGVuZCB1cAotICAgIC8vIG5hbWluZyBmcmFtZXMgdGhpbmdzIHRoYXQgY29uZmxpY3Qgd2l0aCB3 aW5kb3cgcHJvcGVydGllcyB0aGF0Ci0gICAgLy8gYXJlIGluIE1veiBidXQgbm90IElFLiBTaW5j ZSB3ZSBoYXZlIHNvbWUgb2YgdGhlc2UsIHdlIGhhdmUgdG8gZG8KLSAgICAvLyBpdCB0aGUgTW96 IHdheS4KLSAgICBpZiAodGhpc09iamVjdC0+aW1wbCgpLT5mcmFtZSgpLT50cmVlKCktPnNjb3Bl ZENoaWxkKHByb3BlcnR5TmFtZVRvQXRvbWljU3RyaW5nKHByb3BlcnR5TmFtZSkpKSB7Ci0gICAg ICAgIFByb3BlcnR5U2xvdCBzbG90KHRoaXNPYmplY3QpOwotICAgICAgICBzbG90LnNldEN1c3Rv bSh0aGlzT2JqZWN0LCBSZWFkT25seSB8IERvbnREZWxldGUgfCBEb250RW51bSwgY2hpbGRGcmFt ZUdldHRlcik7Ci0gICAgICAgIGRlc2NyaXB0b3Iuc2V0RGVzY3JpcHRvcihzbG90LmdldFZhbHVl KGV4ZWMsIHByb3BlcnR5TmFtZSksIFJlYWRPbmx5IHwgRG9udERlbGV0ZSB8IERvbnRFbnVtKTsK LSAgICAgICAgcmV0dXJuIHRydWU7Ci0gICAgfQotICAgIAotICAgIHVuc2lnbmVkIGkgPSBwcm9w ZXJ0eU5hbWUuYXNJbmRleCgpOwotICAgIGlmIChpIDwgdGhpc09iamVjdC0+aW1wbCgpLT5mcmFt ZSgpLT50cmVlKCktPnNjb3BlZENoaWxkQ291bnQoKSkgewotICAgICAgICBBU1NFUlQoaSAhPSBQ cm9wZXJ0eU5hbWU6Ok5vdEFuSW5kZXgpOwotICAgICAgICBQcm9wZXJ0eVNsb3Qgc2xvdCh0aGlz T2JqZWN0KTsKLSAgICAgICAgc2xvdC5zZXRDdXN0b21JbmRleCh0aGlzT2JqZWN0LCBSZWFkT25s eSB8IERvbnREZWxldGUgfCBEb250RW51bSwgaSwgaW5kZXhHZXR0ZXIpOwotICAgICAgICBkZXNj cmlwdG9yLnNldERlc2NyaXB0b3Ioc2xvdC5nZXRWYWx1ZShleGVjLCBwcm9wZXJ0eU5hbWUpLCBS ZWFkT25seSB8IERvbnREZWxldGUgfCBEb250RW51bSk7Ci0gICAgICAgIHJldHVybiB0cnVlOwot ICAgIH0KLQotICAgIC8vIEFsbG93IHNob3J0Y3V0cyBsaWtlICdJbWFnZTEnIGluc3RlYWQgb2Yg ZG9jdW1lbnQuaW1hZ2VzLkltYWdlMQotICAgIERvY3VtZW50KiBkb2N1bWVudCA9IHRoaXNPYmpl Y3QtPmltcGwoKS0+ZnJhbWUoKS0+ZG9jdW1lbnQoKTsKLSAgICBpZiAoZG9jdW1lbnQtPmlzSFRN TERvY3VtZW50KCkpIHsKLSAgICAgICAgQXRvbWljU3RyaW5nSW1wbCogYXRvbWljUHJvcGVydHlO YW1lID0gZmluZEF0b21pY1N0cmluZyhwcm9wZXJ0eU5hbWUpOwotICAgICAgICBpZiAoYXRvbWlj UHJvcGVydHlOYW1lICYmIHRvSFRNTERvY3VtZW50KGRvY3VtZW50KS0+aGFzV2luZG93TmFtZWRJ dGVtKGF0b21pY1Byb3BlcnR5TmFtZSkpIHsKLSAgICAgICAgICAgIFByb3BlcnR5U2xvdCBzbG90 KHRoaXNPYmplY3QpOwotICAgICAgICAgICAgc2xvdC5zZXRDdXN0b20odGhpc09iamVjdCwgUmVh ZE9ubHkgfCBEb250RGVsZXRlIHwgRG9udEVudW0sIG5hbWVkSXRlbUdldHRlcik7Ci0gICAgICAg ICAgICBkZXNjcmlwdG9yLnNldERlc2NyaXB0b3Ioc2xvdC5nZXRWYWx1ZShleGVjLCBwcm9wZXJ0 eU5hbWUpLCBSZWFkT25seSB8IERvbnREZWxldGUgfCBEb250RW51bSk7Ci0gICAgICAgICAgICBy ZXR1cm4gdHJ1ZTsKLSAgICAgICAgfQotICAgIH0KLSAgICAKLSAgICByZXR1cm4gQmFzZTo6Z2V0 T3duUHJvcGVydHlEZXNjcmlwdG9yKHRoaXNPYmplY3QsIGV4ZWMsIHByb3BlcnR5TmFtZSwgZGVz Y3JpcHRvcik7Ci19CitHRVRfT1dOX1BST1BFUlRZX0RFU0NSSVBUT1JfSU1QTChKU0RPTVdpbmRv dykKIAogdm9pZCBKU0RPTVdpbmRvdzo6cHV0KEpTQ2VsbCogY2VsbCwgRXhlY1N0YXRlKiBleGVj LCBQcm9wZXJ0eU5hbWUgcHJvcGVydHlOYW1lLCBKU1ZhbHVlIHZhbHVlLCBQdXRQcm9wZXJ0eVNs b3QmIHNsb3QpCiB7Cg==