216429 2020-09-11 18:25:55 -0700 [WebIDL] Remove need for [MayThrowException] on named deleters 2020-09-12 16:12:22 -0700 1 1 1 Unclassified WebKit Bindings WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 180019 1 sam sam cdumez darin esprehn+autocc ews-watchlist kondapallykalyan webkit-bug-importer oldest_to_newest 1687874 0 sam 2020-09-11 18:25:55 -0700 Rather than specifying [MayThrowException] on named deleters, we should deduce it based on the return type. 1687943 1 408602 sam 2020-09-12 10:36:44 -0700 Created attachment 408602 Patch 1688016 2 ews-feeder 2020-09-12 16:11:44 -0700 Committed r266983: <https://trac.webkit.org/changeset/266983> All reviewed patches have been landed. Closing bug and clearing flags on attachment 408602. 1688017 3 webkit-bug-importer 2020-09-12 16:12:22 -0700 <rdar://problem/68780102> 408602 2020-09-12 10:36:44 -0700 2020-09-12 16:11:44 -0700 Patch bug-216429-20200912103644.patch text/plain 15132 sam SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI2Njk3OCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM1IEBACisyMDIwLTA5LTEyICBTYW0gV2Vp bmlnICA8d2VpbmlnQGFwcGxlLmNvbT4KKworICAgICAgICBbV2ViSURMXSBSZW1vdmUgbmVlZCBm b3IgW01heVRocm93RXhjZXB0aW9uXSBvbiBuYW1lZCBkZWxldGVycworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE2NDI5CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisgICAgICAgIAorICAgICAgICBEZWR1Y2UgaW1wbGVtZW50 YXRpb24gcG90ZW50aWFsbHkgdGhvd2luZyBieSBpbnRyb3NwZWN0aW5nIHRoZSByZXR1cm4KKyAg ICAgICAgdHlwZSBvZiB0aGUgZGVsZXRlcnMgaW1wbGVtZW50YXRpb24uIFRoaXMgYWxsb3dzIHVz IHRvIHJlbW92ZSBhbm90aGVyCisgICAgICAgIHVzZSBvZiBbTWF5VGhyb3dFeGNlcHRpb25dLgor CisgICAgICAgICogYmluZGluZ3MvanMvSlNET01BYnN0cmFjdE9wZXJhdGlvbnMuaDoKKyAgICAg ICAgKFdlYkNvcmU6OnBlcmZvcm1MZWdhY3lQbGF0Zm9ybU9iamVjdERlbGV0ZU9wZXJhdGlvbik6 CisgICAgICAgIEFkZCBoZWxwZXIgZnVuY3Rpb24gdG8gaG91c2Ugc2hhcmVkIGltcGxlbWVudGF0 aW9uIG9mIHRoZSB2YXJpb3VzCisgICAgICAgIGNvbWJpbmF0aW9ucyBvZiByZXR1cm4gdHlwZXMg YWxsb3dlZC4gIAorICAgICAgICAKKyAgICAgICAgKiBiaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5l cmF0b3JKUy5wbToKKyAgICAgICAgKEdlbmVyYXRlRGVsZXRlUHJvcGVydHlDb21tb24pOgorICAg ICAgICBDb252ZXJ0IHRoZSBjb21tZW50ZWQgZXhwZWN0YXRpb24gdGhhdCB1bm5hbWVkIGRlbGV0 ZXJzIHJldHVybiBib29sCisgICAgICAgIG9yIEV4Y2VwdGlvbk9yPGJvb2w+IGludG8gYSBzdGF0 aWMgYXNzZXJ0aW9uIGFuZCB1c2UgdGhlIG5ldyBoZWxwZXIgCisgICAgICAgIGZ1bmN0aW9uIHRv IHNpbXBsaWZ5IGNvZGUgZ2VuZXJhdGlvbi4gCisKKyAgICAgICAgKiBzdG9yYWdlL1N0b3JhZ2Uu aWRsOgorICAgICAgICBSZW1vdmUgbm93IHVubmVlZGVkIFtNYXlUaHJvd0V4Y2VwdGlvbl0uCisK KyAgICAgICAgKiBiaW5kaW5ncy9zY3JpcHRzL3Rlc3QvSlMvSlNUZXN0TmFtZWREZWxldGVyTm9J ZGVudGlmaWVyLmNwcDoKKyAgICAgICAgKiBiaW5kaW5ncy9zY3JpcHRzL3Rlc3QvSlMvSlNUZXN0 TmFtZWREZWxldGVyVGhyb3dpbmdFeGNlcHRpb24uY3BwOgorICAgICAgICAqIGJpbmRpbmdzL3Nj cmlwdHMvdGVzdC9KUy9KU1Rlc3ROYW1lZERlbGV0ZXJXaXRoSWRlbnRpZmllci5jcHA6CisgICAg ICAgICogYmluZGluZ3Mvc2NyaXB0cy90ZXN0L0pTL0pTVGVzdE5hbWVkRGVsZXRlcldpdGhJbmRl eGVkR2V0dGVyLmNwcDoKKyAgICAgICAgKiBiaW5kaW5ncy9zY3JpcHRzL3Rlc3QvVGVzdE5hbWVk RGVsZXRlclRocm93aW5nRXhjZXB0aW9uLmlkbDoKKyAgICAgICAgVXBkYXRlIHRlc3RzL2V4cGVj dGF0aW9ucy4KKwogMjAyMC0wOS0xMiAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgog CiAgICAgICAgIFtMRkNdW0lGQ10gQWRkIHN1cHBvcnQgZm9yIG5vbi1yb290LWlubGluZS1ib3gg bGluZSBzcGFjaW5nCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0RPTUFic3Ry YWN0T3BlcmF0aW9ucy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pz L0pTRE9NQWJzdHJhY3RPcGVyYXRpb25zLmgJKHJldmlzaW9uIDI2Njk2OCkKKysrIFNvdXJjZS9X ZWJDb3JlL2JpbmRpbmdzL2pzL0pTRE9NQWJzdHJhY3RPcGVyYXRpb25zLmgJKHdvcmtpbmcgY29w eSkKQEAgLTI2LDYgKzI2LDcgQEAKICNwcmFnbWEgb25jZQogCiAjaW5jbHVkZSAiSlNET01Db252 ZXJ0U3RyaW5ncy5oIgorI2luY2x1ZGUgIkpTRE9NRXhjZXB0aW9uSGFuZGxpbmcuaCIKIAogbmFt ZXNwYWNlIFdlYkNvcmUgewogCkBAIC0xMTcsNCArMTE4LDI5IEBAIHN0YXRpYyBhdXRvIGFjY2Vz c1Zpc2libGVOYW1lZFByb3BlcnR5KEoKICAgICByZXR1cm4gcmVzdWx0OwogfQogCisvLyBUaGlz IGltcGxlbWVudHMgc3RlcHMgMi4yIHRocm91Z2ggMi41IG9mIGh0dHBzOi8vaGV5Y2FtLmdpdGh1 Yi5pby93ZWJpZGwvI2xlZ2FjeS1wbGF0Zm9ybS1vYmplY3QtZGVsZXRlLgordGVtcGxhdGU8dHlw ZW5hbWUgRnVuY3Rvcj4gYm9vbCBwZXJmb3JtTGVnYWN5UGxhdGZvcm1PYmplY3REZWxldGVPcGVy YXRpb24oSlNDOjpKU0dsb2JhbE9iamVjdCYgbGV4aWNhbEdsb2JhbE9iamVjdCwgRnVuY3RvciYm IGZ1bmN0b3IpCit7CisgICAgdXNpbmcgUmV0dXJuVHlwZSA9IHN0ZDo6aW52b2tlX3Jlc3VsdF90 PEZ1bmN0b3I+OworCisgICAgaWYgY29uc3RleHByIChJc0V4Y2VwdGlvbk9yPFJldHVyblR5cGU+ Ojp2YWx1ZSkgeworICAgICAgICBhdXRvIHJlc3VsdCA9IGZ1bmN0b3IoKTsKKyAgICAgICAgaWYg KHJlc3VsdC5oYXNFeGNlcHRpb24oKSkgeworICAgICAgICAgICAgYXV0byB0aHJvd1Njb3BlID0g REVDTEFSRV9USFJPV19TQ09QRShKU0M6OmdldFZNKCZsZXhpY2FsR2xvYmFsT2JqZWN0KSk7Cisg ICAgICAgICAgICBwcm9wYWdhdGVFeGNlcHRpb24obGV4aWNhbEdsb2JhbE9iamVjdCwgdGhyb3dT Y29wZSwgcmVzdWx0LnJlbGVhc2VFeGNlcHRpb24oKSk7CisgICAgICAgICAgICByZXR1cm4gdHJ1 ZTsKKyAgICAgICAgfQorICAgICAgICAKKyAgICAgICAgaWYgY29uc3RleHByIChzdGQ6OmlzX3Nh bWVfdjxSZXR1cm5UeXBlLCBFeGNlcHRpb25Pcjxib29sPj4pCisgICAgICAgICAgICByZXR1cm4g cmVzdWx0LnJlbGVhc2VSZXR1cm5WYWx1ZSgpOworICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICB9 CisKKyAgICBpZiBjb25zdGV4cHIgKHN0ZDo6aXNfc2FtZV92PFJldHVyblR5cGUsIGJvb2w+KQor ICAgICAgICByZXR1cm4gZnVuY3RvcigpOworICAgIAorICAgIGZ1bmN0b3IoKTsKKyAgICByZXR1 cm4gdHJ1ZTsKK30KKwogfQpJbmRleDogU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9D b2RlR2VuZXJhdG9ySlMucG0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvYmluZGluZ3Mv c2NyaXB0cy9Db2RlR2VuZXJhdG9ySlMucG0JKHJldmlzaW9uIDI2Njk2OCkKKysrIFNvdXJjZS9X ZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvckpTLnBtCSh3b3JraW5nIGNvcHkp CkBAIC0xMjc0LDMzICsxMjc0LDE0IEBAIHN1YiBHZW5lcmF0ZURlbGV0ZVByb3BlcnR5Q29tbW9u CiAgICAgbXkgJGZ1bmN0aW9uSW1wbGVtZW50YXRpb25OYW1lID0gJG9wZXJhdGlvbi0+ZXh0ZW5k ZWRBdHRyaWJ1dGVzLT57SW1wbGVtZW50ZWRBc30gfHwgJGNvZGVHZW5lcmF0b3ItPldLX2xjZmly c3QoJG9wZXJhdGlvbi0+bmFtZSkgfHwgImRlbGV0ZU5hbWVkUHJvcGVydHkiOwogICAgIG15ICRm dW5jdGlvbkNhbGwgPSAiaW1wbC4iIC4gJGZ1bmN0aW9uSW1wbGVtZW50YXRpb25OYW1lIC4gIihw cm9wZXJ0eU5hbWVUb1N0cmluZyhwcm9wZXJ0eU5hbWUpKSI7CiAKLSAgICAjIE5PVEU6IFdlIGV4 cGVjdCB0aGUgaW1wbGVtZW50YXRpb24gZnVuY3Rpb24gb2YgbmFtZWQgZGVsZXRlcnMgd2l0aG91 dCBhbiBpZGVudGlmaWVyIHRvCi0gICAgIyAgICAgICByZXR1cm4gZWl0aGVyIGJvb2wgb3IgRXhj ZXB0aW9uT3I8Ym9vbD4uIHRoZSBpbXBsZW1lbnRhdGlvbiBmdW5jdGlvbiBvZiBuYW1lZCBkZWxl dGVycwotICAgICMgICAgICAgd2l0aCBhbiBpZGVudGlmaWVyIGhhdmUgbm8gcmVzdHJpY3Rpb24s IGJ1dCBpZiB0aGUgcmV0dXJuIHZhbHVlIG9mIHRoZSBvcGVyYXRpb24gaXMKLSAgICAjICAgICAg IGJvb2xlYW4sIHdlIHJldHVybiB0aGF0IHZhbHVlLCBvdGhlcndpc2UgaXQgaXMgaWdub3JlZCAo YXMgcGVyIHNlY3Rpb24gNC4yKS4KLQotICAgIGlmICgkb3BlcmF0aW9uLT5leHRlbmRlZEF0dHJp YnV0ZXMtPntNYXlUaHJvd0V4Y2VwdGlvbn0pIHsKLSAgICAgICAgcHVzaChAJG91dHB1dEFycmF5 LCAiICAgICAgICBhdXRvIHJlc3VsdCA9ICR7ZnVuY3Rpb25DYWxsfTtcbiIpOwotICAgICAgICBw dXNoKEAkb3V0cHV0QXJyYXksICIgICAgICAgIGlmIChyZXN1bHQuaGFzRXhjZXB0aW9uKCkpIHtc biIpOwotICAgICAgICBwdXNoKEAkb3V0cHV0QXJyYXksICIgICAgICAgICAgICBhdXRvIHRocm93 U2NvcGUgPSBERUNMQVJFX1RIUk9XX1NDT1BFKEpTQzo6Z2V0Vk0obGV4aWNhbEdsb2JhbE9iamVj dCkpO1xuIik7Ci0gICAgICAgIHB1c2goQCRvdXRwdXRBcnJheSwgIiAgICAgICAgICAgIHByb3Bh Z2F0ZUV4Y2VwdGlvbigqbGV4aWNhbEdsb2JhbE9iamVjdCwgdGhyb3dTY29wZSwgcmVzdWx0LnJl bGVhc2VFeGNlcHRpb24oKSk7XG4iKTsKLSAgICAgICAgcHVzaChAJG91dHB1dEFycmF5LCAiICAg ICAgICAgICAgcmV0dXJuIHRydWU7XG4iKTsKLSAgICAgICAgcHVzaChAJG91dHB1dEFycmF5LCAi ICAgICAgICB9XG5cbiIpOwotCi0gICAgICAgIGlmICghJG9wZXJhdGlvbi0+bmFtZSB8fCAkb3Bl cmF0aW9uLT5uYW1lICYmICRvcGVyYXRpb24tPnR5cGUtPm5hbWUgZXEgImJvb2xlYW4iKSB7Ci0g ICAgICAgICAgICBwdXNoKEAkb3V0cHV0QXJyYXksICIgICAgICAgIHJldHVybiByZXN1bHQucmVs ZWFzZVJldHVyblZhbHVlKCk7XG4iKTsKLSAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgIHB1 c2goQCRvdXRwdXRBcnJheSwgIiAgICAgICAgcmV0dXJuIHRydWU7XG4iKTsKLSAgICAgICAgfQot ICAgIH0gZWxzZSB7Ci0gICAgICAgIGlmICghJG9wZXJhdGlvbi0+bmFtZSB8fCAkb3BlcmF0aW9u LT5uYW1lICYmICRvcGVyYXRpb24tPnR5cGUtPm5hbWUgZXEgImJvb2xlYW4iKSB7Ci0gICAgICAg ICAgICBwdXNoKEAkb3V0cHV0QXJyYXksICIgICAgICAgIHJldHVybiAke2Z1bmN0aW9uQ2FsbH07 XG4iKTsKLSAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgIHB1c2goQCRvdXRwdXRBcnJheSwg IiAgICAgICAgJHtmdW5jdGlvbkNhbGx9O1xuIik7Ci0gICAgICAgICAgICBwdXNoKEAkb3V0cHV0 QXJyYXksICIgICAgICAgIHJldHVybiB0cnVlO1xuIik7Ci0gICAgICAgIH0KKyAgICAjIE5PVEU6 IFdlIHJlcXVpcmUgdGhlIGltcGxlbWVudGF0aW9uIGZ1bmN0aW9uIG9mIG5hbWVkIGRlbGV0ZXJz IHdpdGhvdXQgYW4gaWRlbnRpZmllciB0bworICAgICMgICAgICAgcmV0dXJuIGVpdGhlciBib29s IG9yIEV4Y2VwdGlvbk9yPGJvb2w+LgorICAgIGlmICghJG9wZXJhdGlvbi0+bmFtZSkgeworICAg ICAgICBwdXNoKEAkb3V0cHV0QXJyYXksICIgICAgICAgIHVzaW5nIFJldHVyblR5cGUgPSBkZWNs dHlwZSgkZnVuY3Rpb25DYWxsKTtcbiIpOworICAgICAgICBwdXNoKEAkb3V0cHV0QXJyYXksICIg ICAgICAgIHN0YXRpY19hc3NlcnQoc3RkOjppc19zYW1lX3Y8UmV0dXJuVHlwZSwgRXhjZXB0aW9u T3I8Ym9vbD4+IHx8IHN0ZDo6aXNfc2FtZV92PFJldHVyblR5cGUsIGJvb2w+LCBcIlRoZSBpbXBs ZW1lbnRhdGlvbiBvZiBuYW1lZCBkZWxldGVycyB3aXRob3V0IGFuIGlkZW50aWZlciBtdXN0IHJl dHVybiBlaXRoZXIgYm9vbCBvciBFeGNlcHRpb25Pcjxib29sPi5cIik7XG4iKTsKICAgICB9CiAK KyAgICBwdXNoKEAkb3V0cHV0QXJyYXksICIgICAgICAgIHJldHVybiBwZXJmb3JtTGVnYWN5UGxh dGZvcm1PYmplY3REZWxldGVPcGVyYXRpb24oKmxleGljYWxHbG9iYWxPYmplY3QsIFsmXSB7IHJl dHVybiAkZnVuY3Rpb25DYWxsOyB9KTtcbiIpOwogICAgIHB1c2goQCRvdXRwdXRBcnJheSwgIiAg ICB9XG4iKTsKIH0KIApJbmRleDogU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0 L1Rlc3ROYW1lZERlbGV0ZXJUaHJvd2luZ0V4Y2VwdGlvbi5pZGwKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L1Rlc3ROYW1lZERlbGV0ZXJUaHJvd2lu Z0V4Y2VwdGlvbi5pZGwJKHJldmlzaW9uIDI2Njk2OCkKKysrIFNvdXJjZS9XZWJDb3JlL2JpbmRp bmdzL3NjcmlwdHMvdGVzdC9UZXN0TmFtZWREZWxldGVyVGhyb3dpbmdFeGNlcHRpb24uaWRsCSh3 b3JraW5nIGNvcHkpCkBAIC0yNCw3ICsyNCw3IEBACiAgKi8KIAogaW50ZXJmYWNlIFRlc3ROYW1l ZERlbGV0ZXJUaHJvd2luZ0V4Y2VwdGlvbiB7Ci0gICAgW01heVRocm93RXhjZXB0aW9uXSBkZWxl dGVyIHVuZGVmaW5lZCAoRE9NU3RyaW5nIG5hbWUpOworICAgIGRlbGV0ZXIgdW5kZWZpbmVkIChE T01TdHJpbmcgbmFtZSk7CiAKICAgICAvLyBOT1RFOiBOYW1lZCBkZWxldGVycyByZXF1aXJlIHRo ZSBwcmVzZW5jZSBvZiBhIG5hbWVkIGdldHRlciBhcyB3ZWxsLgogICAgIGdldHRlciBET01TdHJp bmcgKERPTVN0cmluZyBuYW1lKTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Njcmlw dHMvdGVzdC9KUy9KU1Rlc3ROYW1lZERlbGV0ZXJOb0lkZW50aWZpZXIuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9KUy9KU1Rlc3ROYW1lZERl bGV0ZXJOb0lkZW50aWZpZXIuY3BwCShyZXZpc2lvbiAyNjY5NjgpCisrKyBTb3VyY2UvV2ViQ29y ZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvSlMvSlNUZXN0TmFtZWREZWxldGVyTm9JZGVudGlmaWVy LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjA2LDcgKzIwNiw5IEBAIGJvb2wgSlNUZXN0TmFtZWRE ZWxldGVyTm9JZGVudGlmaWVyOjpkZWwKICAgICBhdXRvJiB0aGlzT2JqZWN0ID0gKmpzQ2FzdDxK U1Rlc3ROYW1lZERlbGV0ZXJOb0lkZW50aWZpZXIqPihjZWxsKTsKICAgICBhdXRvJiBpbXBsID0g dGhpc09iamVjdC53cmFwcGVkKCk7CiAgICAgaWYgKGlzVmlzaWJsZU5hbWVkUHJvcGVydHk8TGVn YWN5T3ZlcnJpZGVCdWlsdEluczo6Tm8+KCpsZXhpY2FsR2xvYmFsT2JqZWN0LCB0aGlzT2JqZWN0 LCBwcm9wZXJ0eU5hbWUpKSB7Ci0gICAgICAgIHJldHVybiBpbXBsLmRlbGV0ZU5hbWVkUHJvcGVy dHkocHJvcGVydHlOYW1lVG9TdHJpbmcocHJvcGVydHlOYW1lKSk7CisgICAgICAgIHVzaW5nIFJl dHVyblR5cGUgPSBkZWNsdHlwZShpbXBsLmRlbGV0ZU5hbWVkUHJvcGVydHkocHJvcGVydHlOYW1l VG9TdHJpbmcocHJvcGVydHlOYW1lKSkpOworICAgICAgICBzdGF0aWNfYXNzZXJ0KHN0ZDo6aXNf c2FtZV92PFJldHVyblR5cGUsIEV4Y2VwdGlvbk9yPGJvb2w+PiB8fCBzdGQ6OmlzX3NhbWVfdjxS ZXR1cm5UeXBlLCBib29sPiwgIlRoZSBpbXBsZW1lbnRhdGlvbiBvZiBuYW1lZCBkZWxldGVycyB3 aXRob3V0IGFuIGlkZW50aWZlciBtdXN0IHJldHVybiBlaXRoZXIgYm9vbCBvciBFeGNlcHRpb25P cjxib29sPi4iKTsKKyAgICAgICAgcmV0dXJuIHBlcmZvcm1MZWdhY3lQbGF0Zm9ybU9iamVjdERl bGV0ZU9wZXJhdGlvbigqbGV4aWNhbEdsb2JhbE9iamVjdCwgWyZdIHsgcmV0dXJuIGltcGwuZGVs ZXRlTmFtZWRQcm9wZXJ0eShwcm9wZXJ0eU5hbWVUb1N0cmluZyhwcm9wZXJ0eU5hbWUpKTsgfSk7 CiAgICAgfQogICAgIHJldHVybiBKU09iamVjdDo6ZGVsZXRlUHJvcGVydHkoY2VsbCwgbGV4aWNh bEdsb2JhbE9iamVjdCwgcHJvcGVydHlOYW1lLCBzbG90KTsKIH0KQEAgLTIxOCw3ICsyMjAsOSBA QCBib29sIEpTVGVzdE5hbWVkRGVsZXRlck5vSWRlbnRpZmllcjo6ZGVsCiAgICAgVk0mIHZtID0g SlNDOjpnZXRWTShsZXhpY2FsR2xvYmFsT2JqZWN0KTsKICAgICBhdXRvIHByb3BlcnR5TmFtZSA9 IElkZW50aWZpZXI6OmZyb20odm0sIGluZGV4KTsKICAgICBpZiAoaXNWaXNpYmxlTmFtZWRQcm9w ZXJ0eTxMZWdhY3lPdmVycmlkZUJ1aWx0SW5zOjpObz4oKmxleGljYWxHbG9iYWxPYmplY3QsIHRo aXNPYmplY3QsIHByb3BlcnR5TmFtZSkpIHsKLSAgICAgICAgcmV0dXJuIGltcGwuZGVsZXRlTmFt ZWRQcm9wZXJ0eShwcm9wZXJ0eU5hbWVUb1N0cmluZyhwcm9wZXJ0eU5hbWUpKTsKKyAgICAgICAg dXNpbmcgUmV0dXJuVHlwZSA9IGRlY2x0eXBlKGltcGwuZGVsZXRlTmFtZWRQcm9wZXJ0eShwcm9w ZXJ0eU5hbWVUb1N0cmluZyhwcm9wZXJ0eU5hbWUpKSk7CisgICAgICAgIHN0YXRpY19hc3NlcnQo c3RkOjppc19zYW1lX3Y8UmV0dXJuVHlwZSwgRXhjZXB0aW9uT3I8Ym9vbD4+IHx8IHN0ZDo6aXNf c2FtZV92PFJldHVyblR5cGUsIGJvb2w+LCAiVGhlIGltcGxlbWVudGF0aW9uIG9mIG5hbWVkIGRl bGV0ZXJzIHdpdGhvdXQgYW4gaWRlbnRpZmVyIG11c3QgcmV0dXJuIGVpdGhlciBib29sIG9yIEV4 Y2VwdGlvbk9yPGJvb2w+LiIpOworICAgICAgICByZXR1cm4gcGVyZm9ybUxlZ2FjeVBsYXRmb3Jt T2JqZWN0RGVsZXRlT3BlcmF0aW9uKCpsZXhpY2FsR2xvYmFsT2JqZWN0LCBbJl0geyByZXR1cm4g aW1wbC5kZWxldGVOYW1lZFByb3BlcnR5KHByb3BlcnR5TmFtZVRvU3RyaW5nKHByb3BlcnR5TmFt ZSkpOyB9KTsKICAgICB9CiAgICAgcmV0dXJuIEpTT2JqZWN0OjpkZWxldGVQcm9wZXJ0eUJ5SW5k ZXgoY2VsbCwgbGV4aWNhbEdsb2JhbE9iamVjdCwgaW5kZXgpOwogfQpJbmRleDogU291cmNlL1dl YkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L0pTL0pTVGVzdE5hbWVkRGVsZXRlclRocm93aW5n RXhjZXB0aW9uLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3Jp cHRzL3Rlc3QvSlMvSlNUZXN0TmFtZWREZWxldGVyVGhyb3dpbmdFeGNlcHRpb24uY3BwCShyZXZp c2lvbiAyNjY5NjgpCisrKyBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvSlMv SlNUZXN0TmFtZWREZWxldGVyVGhyb3dpbmdFeGNlcHRpb24uY3BwCSh3b3JraW5nIGNvcHkpCkBA IC0yMDYsMTQgKzIwNiw5IEBAIGJvb2wgSlNUZXN0TmFtZWREZWxldGVyVGhyb3dpbmdFeGNlcHRp b24KICAgICBhdXRvJiB0aGlzT2JqZWN0ID0gKmpzQ2FzdDxKU1Rlc3ROYW1lZERlbGV0ZXJUaHJv d2luZ0V4Y2VwdGlvbio+KGNlbGwpOwogICAgIGF1dG8mIGltcGwgPSB0aGlzT2JqZWN0LndyYXBw ZWQoKTsKICAgICBpZiAoaXNWaXNpYmxlTmFtZWRQcm9wZXJ0eTxMZWdhY3lPdmVycmlkZUJ1aWx0 SW5zOjpObz4oKmxleGljYWxHbG9iYWxPYmplY3QsIHRoaXNPYmplY3QsIHByb3BlcnR5TmFtZSkp IHsKLSAgICAgICAgYXV0byByZXN1bHQgPSBpbXBsLmRlbGV0ZU5hbWVkUHJvcGVydHkocHJvcGVy dHlOYW1lVG9TdHJpbmcocHJvcGVydHlOYW1lKSk7Ci0gICAgICAgIGlmIChyZXN1bHQuaGFzRXhj ZXB0aW9uKCkpIHsKLSAgICAgICAgICAgIGF1dG8gdGhyb3dTY29wZSA9IERFQ0xBUkVfVEhST1df U0NPUEUoSlNDOjpnZXRWTShsZXhpY2FsR2xvYmFsT2JqZWN0KSk7Ci0gICAgICAgICAgICBwcm9w YWdhdGVFeGNlcHRpb24oKmxleGljYWxHbG9iYWxPYmplY3QsIHRocm93U2NvcGUsIHJlc3VsdC5y ZWxlYXNlRXhjZXB0aW9uKCkpOwotICAgICAgICAgICAgcmV0dXJuIHRydWU7Ci0gICAgICAgIH0K LQotICAgICAgICByZXR1cm4gcmVzdWx0LnJlbGVhc2VSZXR1cm5WYWx1ZSgpOworICAgICAgICB1 c2luZyBSZXR1cm5UeXBlID0gZGVjbHR5cGUoaW1wbC5kZWxldGVOYW1lZFByb3BlcnR5KHByb3Bl cnR5TmFtZVRvU3RyaW5nKHByb3BlcnR5TmFtZSkpKTsKKyAgICAgICAgc3RhdGljX2Fzc2VydChz dGQ6OmlzX3NhbWVfdjxSZXR1cm5UeXBlLCBFeGNlcHRpb25Pcjxib29sPj4gfHwgc3RkOjppc19z YW1lX3Y8UmV0dXJuVHlwZSwgYm9vbD4sICJUaGUgaW1wbGVtZW50YXRpb24gb2YgbmFtZWQgZGVs ZXRlcnMgd2l0aG91dCBhbiBpZGVudGlmZXIgbXVzdCByZXR1cm4gZWl0aGVyIGJvb2wgb3IgRXhj ZXB0aW9uT3I8Ym9vbD4uIik7CisgICAgICAgIHJldHVybiBwZXJmb3JtTGVnYWN5UGxhdGZvcm1P YmplY3REZWxldGVPcGVyYXRpb24oKmxleGljYWxHbG9iYWxPYmplY3QsIFsmXSB7IHJldHVybiBp bXBsLmRlbGV0ZU5hbWVkUHJvcGVydHkocHJvcGVydHlOYW1lVG9TdHJpbmcocHJvcGVydHlOYW1l KSk7IH0pOwogICAgIH0KICAgICByZXR1cm4gSlNPYmplY3Q6OmRlbGV0ZVByb3BlcnR5KGNlbGws IGxleGljYWxHbG9iYWxPYmplY3QsIHByb3BlcnR5TmFtZSwgc2xvdCk7CiB9CkBAIC0yMjUsMTQg KzIyMCw5IEBAIGJvb2wgSlNUZXN0TmFtZWREZWxldGVyVGhyb3dpbmdFeGNlcHRpb24KICAgICBW TSYgdm0gPSBKU0M6OmdldFZNKGxleGljYWxHbG9iYWxPYmplY3QpOwogICAgIGF1dG8gcHJvcGVy dHlOYW1lID0gSWRlbnRpZmllcjo6ZnJvbSh2bSwgaW5kZXgpOwogICAgIGlmIChpc1Zpc2libGVO YW1lZFByb3BlcnR5PExlZ2FjeU92ZXJyaWRlQnVpbHRJbnM6Ok5vPigqbGV4aWNhbEdsb2JhbE9i amVjdCwgdGhpc09iamVjdCwgcHJvcGVydHlOYW1lKSkgewotICAgICAgICBhdXRvIHJlc3VsdCA9 IGltcGwuZGVsZXRlTmFtZWRQcm9wZXJ0eShwcm9wZXJ0eU5hbWVUb1N0cmluZyhwcm9wZXJ0eU5h bWUpKTsKLSAgICAgICAgaWYgKHJlc3VsdC5oYXNFeGNlcHRpb24oKSkgewotICAgICAgICAgICAg YXV0byB0aHJvd1Njb3BlID0gREVDTEFSRV9USFJPV19TQ09QRShKU0M6OmdldFZNKGxleGljYWxH bG9iYWxPYmplY3QpKTsKLSAgICAgICAgICAgIHByb3BhZ2F0ZUV4Y2VwdGlvbigqbGV4aWNhbEds b2JhbE9iamVjdCwgdGhyb3dTY29wZSwgcmVzdWx0LnJlbGVhc2VFeGNlcHRpb24oKSk7Ci0gICAg ICAgICAgICByZXR1cm4gdHJ1ZTsKLSAgICAgICAgfQotCi0gICAgICAgIHJldHVybiByZXN1bHQu cmVsZWFzZVJldHVyblZhbHVlKCk7CisgICAgICAgIHVzaW5nIFJldHVyblR5cGUgPSBkZWNsdHlw ZShpbXBsLmRlbGV0ZU5hbWVkUHJvcGVydHkocHJvcGVydHlOYW1lVG9TdHJpbmcocHJvcGVydHlO YW1lKSkpOworICAgICAgICBzdGF0aWNfYXNzZXJ0KHN0ZDo6aXNfc2FtZV92PFJldHVyblR5cGUs IEV4Y2VwdGlvbk9yPGJvb2w+PiB8fCBzdGQ6OmlzX3NhbWVfdjxSZXR1cm5UeXBlLCBib29sPiwg IlRoZSBpbXBsZW1lbnRhdGlvbiBvZiBuYW1lZCBkZWxldGVycyB3aXRob3V0IGFuIGlkZW50aWZl ciBtdXN0IHJldHVybiBlaXRoZXIgYm9vbCBvciBFeGNlcHRpb25Pcjxib29sPi4iKTsKKyAgICAg ICAgcmV0dXJuIHBlcmZvcm1MZWdhY3lQbGF0Zm9ybU9iamVjdERlbGV0ZU9wZXJhdGlvbigqbGV4 aWNhbEdsb2JhbE9iamVjdCwgWyZdIHsgcmV0dXJuIGltcGwuZGVsZXRlTmFtZWRQcm9wZXJ0eShw cm9wZXJ0eU5hbWVUb1N0cmluZyhwcm9wZXJ0eU5hbWUpKTsgfSk7CiAgICAgfQogICAgIHJldHVy biBKU09iamVjdDo6ZGVsZXRlUHJvcGVydHlCeUluZGV4KGNlbGwsIGxleGljYWxHbG9iYWxPYmpl Y3QsIGluZGV4KTsKIH0KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVz dC9KUy9KU1Rlc3ROYW1lZERlbGV0ZXJXaXRoSWRlbnRpZmllci5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L0pTL0pTVGVzdE5hbWVkRGVsZXRl cldpdGhJZGVudGlmaWVyLmNwcAkocmV2aXNpb24gMjY2OTY4KQorKysgU291cmNlL1dlYkNvcmUv YmluZGluZ3Mvc2NyaXB0cy90ZXN0L0pTL0pTVGVzdE5hbWVkRGVsZXRlcldpdGhJZGVudGlmaWVy LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjEyLDggKzIxMiw3IEBAIGJvb2wgSlNUZXN0TmFtZWRE ZWxldGVyV2l0aElkZW50aWZpZXI6OmQKICAgICBhdXRvJiB0aGlzT2JqZWN0ID0gKmpzQ2FzdDxK U1Rlc3ROYW1lZERlbGV0ZXJXaXRoSWRlbnRpZmllcio+KGNlbGwpOwogICAgIGF1dG8mIGltcGwg PSB0aGlzT2JqZWN0LndyYXBwZWQoKTsKICAgICBpZiAoaXNWaXNpYmxlTmFtZWRQcm9wZXJ0eTxM ZWdhY3lPdmVycmlkZUJ1aWx0SW5zOjpObz4oKmxleGljYWxHbG9iYWxPYmplY3QsIHRoaXNPYmpl Y3QsIHByb3BlcnR5TmFtZSkpIHsKLSAgICAgICAgaW1wbC5uYW1lZERlbGV0ZXIocHJvcGVydHlO YW1lVG9TdHJpbmcocHJvcGVydHlOYW1lKSk7Ci0gICAgICAgIHJldHVybiB0cnVlOworICAgICAg ICByZXR1cm4gcGVyZm9ybUxlZ2FjeVBsYXRmb3JtT2JqZWN0RGVsZXRlT3BlcmF0aW9uKCpsZXhp Y2FsR2xvYmFsT2JqZWN0LCBbJl0geyByZXR1cm4gaW1wbC5uYW1lZERlbGV0ZXIocHJvcGVydHlO YW1lVG9TdHJpbmcocHJvcGVydHlOYW1lKSk7IH0pOwogICAgIH0KICAgICByZXR1cm4gSlNPYmpl Y3Q6OmRlbGV0ZVByb3BlcnR5KGNlbGwsIGxleGljYWxHbG9iYWxPYmplY3QsIHByb3BlcnR5TmFt ZSwgc2xvdCk7CiB9CkBAIC0yMjUsOCArMjI0LDcgQEAgYm9vbCBKU1Rlc3ROYW1lZERlbGV0ZXJX aXRoSWRlbnRpZmllcjo6ZAogICAgIFZNJiB2bSA9IEpTQzo6Z2V0Vk0obGV4aWNhbEdsb2JhbE9i amVjdCk7CiAgICAgYXV0byBwcm9wZXJ0eU5hbWUgPSBJZGVudGlmaWVyOjpmcm9tKHZtLCBpbmRl eCk7CiAgICAgaWYgKGlzVmlzaWJsZU5hbWVkUHJvcGVydHk8TGVnYWN5T3ZlcnJpZGVCdWlsdElu czo6Tm8+KCpsZXhpY2FsR2xvYmFsT2JqZWN0LCB0aGlzT2JqZWN0LCBwcm9wZXJ0eU5hbWUpKSB7 Ci0gICAgICAgIGltcGwubmFtZWREZWxldGVyKHByb3BlcnR5TmFtZVRvU3RyaW5nKHByb3BlcnR5 TmFtZSkpOwotICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgcmV0dXJuIHBlcmZvcm1MZWdh Y3lQbGF0Zm9ybU9iamVjdERlbGV0ZU9wZXJhdGlvbigqbGV4aWNhbEdsb2JhbE9iamVjdCwgWyZd IHsgcmV0dXJuIGltcGwubmFtZWREZWxldGVyKHByb3BlcnR5TmFtZVRvU3RyaW5nKHByb3BlcnR5 TmFtZSkpOyB9KTsKICAgICB9CiAgICAgcmV0dXJuIEpTT2JqZWN0OjpkZWxldGVQcm9wZXJ0eUJ5 SW5kZXgoY2VsbCwgbGV4aWNhbEdsb2JhbE9iamVjdCwgaW5kZXgpOwogfQpJbmRleDogU291cmNl L1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L0pTL0pTVGVzdE5hbWVkRGVsZXRlcldpdGhJ bmRleGVkR2V0dGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9z Y3JpcHRzL3Rlc3QvSlMvSlNUZXN0TmFtZWREZWxldGVyV2l0aEluZGV4ZWRHZXR0ZXIuY3BwCShy ZXZpc2lvbiAyNjY5NjgpCisrKyBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3Qv SlMvSlNUZXN0TmFtZWREZWxldGVyV2l0aEluZGV4ZWRHZXR0ZXIuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC0yMjcsNyArMjI3LDkgQEAgYm9vbCBKU1Rlc3ROYW1lZERlbGV0ZXJXaXRoSW5kZXhlZEdl dHRlcgogICAgIGlmIChhdXRvIGluZGV4ID0gcGFyc2VJbmRleChwcm9wZXJ0eU5hbWUpKQogICAg ICAgICByZXR1cm4gIWltcGwuaXNTdXBwb3J0ZWRQcm9wZXJ0eUluZGV4KGluZGV4LnZhbHVlKCkp OwogICAgIGlmIChpc1Zpc2libGVOYW1lZFByb3BlcnR5PExlZ2FjeU92ZXJyaWRlQnVpbHRJbnM6 Ok5vPigqbGV4aWNhbEdsb2JhbE9iamVjdCwgdGhpc09iamVjdCwgcHJvcGVydHlOYW1lKSkgewot ICAgICAgICByZXR1cm4gaW1wbC5kZWxldGVOYW1lZFByb3BlcnR5KHByb3BlcnR5TmFtZVRvU3Ry aW5nKHByb3BlcnR5TmFtZSkpOworICAgICAgICB1c2luZyBSZXR1cm5UeXBlID0gZGVjbHR5cGUo aW1wbC5kZWxldGVOYW1lZFByb3BlcnR5KHByb3BlcnR5TmFtZVRvU3RyaW5nKHByb3BlcnR5TmFt ZSkpKTsKKyAgICAgICAgc3RhdGljX2Fzc2VydChzdGQ6OmlzX3NhbWVfdjxSZXR1cm5UeXBlLCBF eGNlcHRpb25Pcjxib29sPj4gfHwgc3RkOjppc19zYW1lX3Y8UmV0dXJuVHlwZSwgYm9vbD4sICJU aGUgaW1wbGVtZW50YXRpb24gb2YgbmFtZWQgZGVsZXRlcnMgd2l0aG91dCBhbiBpZGVudGlmZXIg bXVzdCByZXR1cm4gZWl0aGVyIGJvb2wgb3IgRXhjZXB0aW9uT3I8Ym9vbD4uIik7CisgICAgICAg IHJldHVybiBwZXJmb3JtTGVnYWN5UGxhdGZvcm1PYmplY3REZWxldGVPcGVyYXRpb24oKmxleGlj YWxHbG9iYWxPYmplY3QsIFsmXSB7IHJldHVybiBpbXBsLmRlbGV0ZU5hbWVkUHJvcGVydHkocHJv cGVydHlOYW1lVG9TdHJpbmcocHJvcGVydHlOYW1lKSk7IH0pOwogICAgIH0KICAgICByZXR1cm4g SlNPYmplY3Q6OmRlbGV0ZVByb3BlcnR5KGNlbGwsIGxleGljYWxHbG9iYWxPYmplY3QsIHByb3Bl cnR5TmFtZSwgc2xvdCk7CiB9CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9zdG9yYWdlL1N0b3JhZ2Uu aWRsCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3N0b3JhZ2UvU3RvcmFnZS5pZGwJKHJl dmlzaW9uIDI2Njk2OCkKKysrIFNvdXJjZS9XZWJDb3JlL3N0b3JhZ2UvU3RvcmFnZS5pZGwJKHdv cmtpbmcgY29weSkKQEAgLTMxLDYgKzMxLDYgQEAKICAgICBET01TdHJpbmc/IGtleSh1bnNpZ25l ZCBsb25nIGluZGV4KTsKICAgICBnZXR0ZXIgRE9NU3RyaW5nPyBnZXRJdGVtKERPTVN0cmluZyBr ZXkpOwogICAgIFtNYXlUaHJvd0V4Y2VwdGlvbl0gc2V0dGVyIHVuZGVmaW5lZCBzZXRJdGVtKERP TVN0cmluZyBrZXksIERPTVN0cmluZyBkYXRhKTsKLSAgICBbTWF5VGhyb3dFeGNlcHRpb25dIGRl bGV0ZXIgdW5kZWZpbmVkIHJlbW92ZUl0ZW0oRE9NU3RyaW5nIGtleSk7CisgICAgZGVsZXRlciB1 bmRlZmluZWQgcmVtb3ZlSXRlbShET01TdHJpbmcga2V5KTsKICAgICBbTWF5VGhyb3dFeGNlcHRp b25dIHVuZGVmaW5lZCBjbGVhcigpOwogfTsK