214555 2020-07-20 09:42:27 -0700 pluginElementCustomGetOwnPropertySlot() should support VMInquiry requests. 2020-07-25 22:12:06 -0700 1 1 1 Unclassified WebKit WebCore JavaScript WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 mark.lam mark.lam cdumez ews-watchlist keith_miller msaboff saam tzagallo webkit-bug-importer ysuzuki oldest_to_newest 1673108 0 mark.lam 2020-07-20 09:42:27 -0700 <rdar://problem/65625807> 1673329 1 mark.lam 2020-07-20 17:07:36 -0700 <rdar://problem/65855400> 1674988 2 405220 mark.lam 2020-07-24 21:25:05 -0700 Created attachment 405220 proposed patch. 1674990 3 405221 mark.lam 2020-07-24 21:37:20 -0700 Created attachment 405221 proposed patch. 1675047 4 405221 ysuzuki 2020-07-25 21:20:10 -0700 Comment on attachment 405221 proposed patch. View in context: https://bugs.webkit.org/attachment.cgi?id=405221&action=review r=me > Source/JavaScriptCore/runtime/JSObjectInlines.h:136 > + if (slot.isVMInquiry() && slot.isTaintedByOpaqueObject()) Let's put `UNLIKELY`. > Source/JavaScriptCore/runtime/JSObjectInlines.h:179 > + if (slot.isVMInquiry() && slot.isTaintedByOpaqueObject()) Let's put UNLIKELY 1675055 5 mark.lam 2020-07-25 22:12:06 -0700 Thanks for the review. I've applied the fixes. Landed in r264895: <http://trac.webkit.org/r264895>. 405220 2020-07-24 21:25:05 -0700 2020-07-24 21:30:02 -0700 proposed patch. bug-214555.patch text/plain 8796 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjY0ODgyKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI5IEBA CisyMDIwLTA3LTI0ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBw bHVnaW5FbGVtZW50Q3VzdG9tR2V0T3duUHJvcGVydHlTbG90KCkgc2hvdWxkIHN1cHBvcnQgVk1J bnF1aXJ5IHJlcXVlc3RzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MjE0NTU1CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS82NTg1NTQwMD4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAxLiBBZGQgaGFuZGxp bmcgZm9yIFZNSW5xdWlyeSBmYWlsdXJlIGluIEpTT2JqZWN0OjpnZXRQcm9wZXJ0eVNsb3QoKSBh bmQKKyAgICAgICAgICAgSlNPYmplY3Q6OmdldE5vbkluZGV4UHJvcGVydHlTbG90KCkuICBCYXNp Y2FsbHksIGlmIHRoZSBxdWVyeSBpc1RhaW50ZWRCeU9wYXF1ZU9iamVjdCwKKyAgICAgICAgICAg dGhlbiB3ZSBzaG91bGQgdHJlYXQgdGhlIGZhbHNlIHJlc3VsdCBhcyBhIGZhaWxlZCBWTUlucXVp cnkuCisKKyAgICAgICAgMi4gRml4IEpTTW9kdWxlTmFtZXNwYWNlT2JqZWN0OjpnZXRPd25Qcm9w ZXJ0eVNsb3RDb21tb24oKSBhbmQKKyAgICAgICAgICAgUHJveHlPYmplY3Q6OmdldE93blByb3Bl cnR5U2xvdENvbW1vbigpIHRvIGluaXRpYWxpemUgdGhlIFByb3BlcnR5U2xvdCB0byBhCisgICAg ICAgICAgIGpzVW5kZWZpbmVkKCkgdmFsdWUgaWYgd2UgaGF2ZSBhIGZhaWxlZCBWTUlucXVpcnku ICBUaGUgY2xpZW50IHNob3VsZG4ndAorICAgICAgICAgICBiZSByZWFkaW5nIHRoZSB2YWx1ZSBp ZiB0aGUgVk1JbnF1aXJ5IGZhaWxlZCwgYnV0IGFzIGEgZGVmZW5zaXZlIGFjdGlvbiwgd2UnbGwK KyAgICAgICAgICAgaW5pdGlhbGl6ZSB0aGUgc2xvdCB0byBlZmZlY3RpdmVseSByZXR1cm4gYW4g dW5kZWZpbmVkIHZhbHVlLgorCisgICAgICAgICogcnVudGltZS9KU01vZHVsZU5hbWVzcGFjZU9i amVjdC5jcHA6CisgICAgICAgIChKU0M6OkpTTW9kdWxlTmFtZXNwYWNlT2JqZWN0OjpnZXRPd25Q cm9wZXJ0eVNsb3RDb21tb24pOgorICAgICAgICAqIHJ1bnRpbWUvSlNPYmplY3RJbmxpbmVzLmg6 CisgICAgICAgIChKU0M6OkpTT2JqZWN0OjpnZXRQcm9wZXJ0eVNsb3QpOgorICAgICAgICAoSlND OjpKU09iamVjdDo6Z2V0Tm9uSW5kZXhQcm9wZXJ0eVNsb3QpOgorICAgICAgICAqIHJ1bnRpbWUv UHJveHlPYmplY3QuY3BwOgorICAgICAgICAoSlNDOjpQcm94eU9iamVjdDo6Z2V0T3duUHJvcGVy dHlTbG90Q29tbW9uKToKKwogMjAyMC0wNy0yNCAgRGVhbiBKYWNrc29uICA8ZGlub0BhcHBsZS5j b20+CiAKICAgICAgICAgSmF2YVNjcmlwdENvcmUgWGNvZGUgcHJvamVjdCBoYXMgc29tZSBlcnJv cnMKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTTW9kdWxlTmFtZXNwYWNl T2JqZWN0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9K U01vZHVsZU5hbWVzcGFjZU9iamVjdC5jcHAJKHJldmlzaW9uIDI2NDg4MSkKKysrIFNvdXJjZS9K YXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTTW9kdWxlTmFtZXNwYWNlT2JqZWN0LmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtMSw1ICsxLDUgQEAKIC8qCi0gKiBDb3B5cmlnaHQgKEMpIDIwMTUtMjAxOSBB cHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmlnaHQgKEMpIDIwMTUtMjAy MCBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICogUmVkaXN0cmlidXRpb24g YW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CiAgKiBt b2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNv bmRpdGlvbnMKQEAgLTE1Nyw2ICsxNTcsNyBAQCBib29sIEpTTW9kdWxlTmFtZXNwYWNlT2JqZWN0 OjpnZXRPd25Qcm9wCiAgICAgfQogCiAgICAgY2FzZSBQcm9wZXJ0eVNsb3Q6OkludGVybmFsTWV0 aG9kVHlwZTo6Vk1JbnF1aXJ5OgorICAgICAgICBzbG90LnNldFZhbHVlKHRoaXMsIHN0YXRpY19j YXN0PHVuc2lnbmVkPihKU0M6OlByb3BlcnR5QXR0cmlidXRlOjpOb25lKSwganNVbmRlZmluZWQo KSk7CiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICB9CiAKSW5kZXg6IFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9ydW50aW1lL0pTT2JqZWN0SW5saW5lcy5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9K YXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTT2JqZWN0SW5saW5lcy5oCShyZXZpc2lvbiAyNjQ4ODEp CisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU09iamVjdElubGluZXMuaAkod29y a2luZyBjb3B5KQpAQCAtMTMzLDYgKzEzMyw4IEBAIEFMV0FZU19JTkxJTkUgYm9vbCBKU09iamVj dDo6Z2V0UHJvcGVydHkKICAgICAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwgZmFsc2Up OwogICAgICAgICBpZiAoaGFzU2xvdCkKICAgICAgICAgICAgIHJldHVybiB0cnVlOworICAgICAg ICBpZiAoc2xvdC5pc1ZNSW5xdWlyeSgpICYmIHNsb3QuaXNUYWludGVkQnlPcGFxdWVPYmplY3Qo KSkKKyAgICAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICAgICAgaWYgKG9iamVjdC0+dHlwZSgp ID09IFByb3h5T2JqZWN0VHlwZSAmJiBzbG90LmludGVybmFsTWV0aG9kVHlwZSgpID09IFByb3Bl cnR5U2xvdDo6SW50ZXJuYWxNZXRob2RUeXBlOjpIYXNQcm9wZXJ0eSkKICAgICAgICAgICAgIHJl dHVybiBmYWxzZTsKICAgICAgICAgSlNWYWx1ZSBwcm90b3R5cGU7CkBAIC0xNzQsNiArMTc2LDgg QEAgQUxXQVlTX0lOTElORSBib29sIEpTT2JqZWN0OjpnZXROb25JbmRleAogICAgICAgICAgICAg UkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwgZmFsc2UpOwogICAgICAgICAgICAgaWYgKGhhc1Ns b3QpCiAgICAgICAgICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgICAgICBpZiAoc2xvdC5p c1ZNSW5xdWlyeSgpICYmIHNsb3QuaXNUYWludGVkQnlPcGFxdWVPYmplY3QoKSkKKyAgICAgICAg ICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgICAgICAgICBpZiAob2JqZWN0LT50eXBlKCkgPT0g UHJveHlPYmplY3RUeXBlICYmIHNsb3QuaW50ZXJuYWxNZXRob2RUeXBlKCkgPT0gUHJvcGVydHlT bG90OjpJbnRlcm5hbE1ldGhvZFR5cGU6Okhhc1Byb3BlcnR5KQogICAgICAgICAgICAgICAgIHJl dHVybiBmYWxzZTsKICAgICAgICAgfQpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRp bWUvUHJveHlPYmplY3QuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9y dW50aW1lL1Byb3h5T2JqZWN0LmNwcAkocmV2aXNpb24gMjY0ODgxKQorKysgU291cmNlL0phdmFT Y3JpcHRDb3JlL3J1bnRpbWUvUHJveHlPYmplY3QuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xLDUg KzEsNSBAQAogLyoKLSAqIENvcHlyaWdodCAoQykgMjAxNi0yMDE5IEFwcGxlIEluYy4gQWxsIFJp Z2h0cyBSZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAxNi0yMDIwIEFwcGxlIEluYy4gQWxs IFJpZ2h0cyBSZXNlcnZlZC4KICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJj ZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNhdGlvbiwgYXJl IHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtMzMy LDggKzMzMiwxMCBAQCBib29sIFByb3h5T2JqZWN0OjpnZXRPd25Qcm9wZXJ0eVNsb3RDb21tCiAg ICAgc2xvdC5kaXNhYmxlQ2FjaGluZygpOwogICAgIHNsb3Quc2V0SXNUYWludGVkQnlPcGFxdWVP YmplY3QoKTsKIAotICAgIGlmIChzbG90LmludGVybmFsTWV0aG9kVHlwZSgpID09IFByb3BlcnR5 U2xvdDo6SW50ZXJuYWxNZXRob2RUeXBlOjpWTUlucXVpcnkpCisgICAgaWYgKHNsb3QuaXNWTUlu cXVpcnkoKSkgeworICAgICAgICBzbG90LnNldFZhbHVlKHRoaXMsIHN0YXRpY19jYXN0PHVuc2ln bmVkPihKU0M6OlByb3BlcnR5QXR0cmlidXRlOjpOb25lKSwganNVbmRlZmluZWQoKSk7CiAgICAg ICAgIHJldHVybiBmYWxzZTsKKyAgICB9CiAKICAgICBWTSYgdm0gPSBnbG9iYWxPYmplY3QtPnZt KCk7CiAgICAgYXV0byBzY29wZSA9IERFQ0xBUkVfVEhST1dfU0NPUEUodm0pOwpJbmRleDogU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkocmV2aXNpb24gMjY0ODgxKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMjYgQEAKKzIwMjAtMDctMjQgIE1hcmsgTGFtICA8bWFyay5s YW1AYXBwbGUuY29tPgorCisgICAgICAgIHBsdWdpbkVsZW1lbnRDdXN0b21HZXRPd25Qcm9wZXJ0 eVNsb3QoKSBzaG91bGQgc3VwcG9ydCBWTUlucXVpcnkgcmVxdWVzdHMuCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTQ1NTUKKyAgICAgICAgPHJkYXI6 Ly9wcm9ibGVtLzY1ODU1NDAwPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIDEuIEFkZCBoYW5kbGluZyBmb3IgVk1JbnF1aXJ5IGZhaWx1cmUgaW4gQ29k ZUdlbmVyYXRvckpTLgorCisgICAgICAgIDIuIEZpeCBwbHVnaW5FbGVtZW50Q3VzdG9tR2V0T3du UHJvcGVydHlTbG90KCkgdG8gc2V0SXNUYWludGVkQnlPcGFxdWVPYmplY3QoKS4KKworICAgICAg ICAzLiBGaXggcGx1Z2luRWxlbWVudEN1c3RvbUdldE93blByb3BlcnR5U2xvdCgpIGhhbmRsZSBh IFZNSW5xdWlyeSBmYWlsdXJlIGNhc2UKKyAgICAgICAgICAgYW5kIGlmIHNvLCB0byBpbml0aWFs aXplIHRoZSBQcm9wZXJ0eVNsb3QgdG8gYSBqc1VuZGVmaW5lZCgpIHZhbHVlLiAgVGhlIGNsaWVu dAorICAgICAgICAgICBzaG91bGRuJ3QgYmUgcmVhZGluZyB0aGUgdmFsdWUgaWYgdGhlIFZNSW5x dWlyeSBmYWlsZWQsIGJ1dCBhcyBhIGRlZmVuc2l2ZQorICAgICAgICAgICBhY3Rpb24sIHdlJ2xs IGluaXRpYWxpemUgdGhlIHNsb3QgdG8gZWZmZWN0aXZlbHkgcmV0dXJuIGFuIHVuZGVmaW5lZCB2 YWx1ZS4KKworICAgICAgICAqIGJpbmRpbmdzL2pzL0pTUGx1Z2luRWxlbWVudEZ1bmN0aW9ucy5j cHA6CisgICAgICAgIChXZWJDb3JlOjpwbHVnaW5FbGVtZW50Q3VzdG9tR2V0T3duUHJvcGVydHlT bG90KToKKyAgICAgICAgKiBiaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JKUy5wbToKKyAg ICAgICAgKEdlbmVyYXRlR2V0T3duUHJvcGVydHlTbG90KToKKyAgICAgICAgKEdlbmVyYXRlR2V0 T3duUHJvcGVydHlTbG90QnlJbmRleCk6CisKIDIwMjAtMDctMjQgIEJyYWR5IEVpZHNvbiAgPGJl aWRzb25AYXBwbGUuY29tPgogCiAgICAgICAgIEJ1aWxkIGZpeCBhZnRlciByMjY0ODc0CkluZGV4 OiBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU1BsdWdpbkVsZW1lbnRGdW5jdGlvbnMuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTUGx1Z2luRWxlbWVu dEZ1bmN0aW9ucy5jcHAJKHJldmlzaW9uIDI2NDg4MSkKKysrIFNvdXJjZS9XZWJDb3JlL2JpbmRp bmdzL2pzL0pTUGx1Z2luRWxlbWVudEZ1bmN0aW9ucy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEs NiArMSw2IEBACiAvKgogICogIENvcHlyaWdodCAoQykgMTk5OS0yMDAwIEhhcnJpIFBvcnRlbiAo cG9ydGVuQGtkZS5vcmcpCi0gKiAgQ29weXJpZ2h0IChDKSAyMDA0LTIwMTkgQXBwbGUgSW5jLiBB bGwgcmlnaHRzIHJlc2VydmVkLgorICogIENvcHlyaWdodCAoQykgMjAwNC0yMDIwIEFwcGxlIElu Yy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqCiAgKiAgVGhpcyBsaWJyYXJ5IGlzIGZyZWUgc29m dHdhcmU7IHlvdSBjYW4gcmVkaXN0cmlidXRlIGl0IGFuZC9vcgogICogIG1vZGlmeSBpdCB1bmRl ciB0aGUgdGVybXMgb2YgdGhlIEdOVSBMZXNzZXIgR2VuZXJhbCBQdWJsaWMKQEAgLTExMSwxMiAr MTExLDE5IEBAIHN0YXRpYyBFbmNvZGVkSlNWYWx1ZSBwbHVnaW5FbGVtZW50UHJvcGUKIAogYm9v bCBwbHVnaW5FbGVtZW50Q3VzdG9tR2V0T3duUHJvcGVydHlTbG90KEpTSFRNTEVsZW1lbnQqIGVs ZW1lbnQsIEpTR2xvYmFsT2JqZWN0KiBsZXhpY2FsR2xvYmFsT2JqZWN0LCBQcm9wZXJ0eU5hbWUg cHJvcGVydHlOYW1lLCBQcm9wZXJ0eVNsb3QmIHNsb3QpCiB7CisgICAgc2xvdC5zZXRJc1RhaW50 ZWRCeU9wYXF1ZU9iamVjdCgpOworCiAgICAgaWYgKCFlbGVtZW50LT5nbG9iYWxPYmplY3QoKS0+ d29ybGQoKS5pc05vcm1hbCgpKSB7CiAgICAgICAgIEpTQzo6SlNWYWx1ZSBwcm90byA9IGVsZW1l bnQtPmdldFByb3RvdHlwZURpcmVjdChsZXhpY2FsR2xvYmFsT2JqZWN0LT52bSgpKTsKICAgICAg ICAgaWYgKHByb3RvLmlzT2JqZWN0KCkgJiYgSlNDOjpqc0Nhc3Q8SlNDOjpKU09iamVjdCo+KGFz T2JqZWN0KHByb3RvKSktPmhhc1Byb3BlcnR5KGxleGljYWxHbG9iYWxPYmplY3QsIHByb3BlcnR5 TmFtZSkpCiAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgfQogCisgICAgaWYgKHNsb3Qu aXNWTUlucXVpcnkoKSkgeworICAgICAgICBzbG90LnNldFZhbHVlKGVsZW1lbnQsIHN0YXRpY19j YXN0PHVuc2lnbmVkPihKU0M6OlByb3BlcnR5QXR0cmlidXRlOjpOb25lKSwganNVbmRlZmluZWQo KSk7CisgICAgICAgIHJldHVybiBmYWxzZTsgLy8gQ2FuJ3QgZXhlY3V0ZSBzdHVmZiBiZWxvdyBi ZWNhdXNlIHRoZXkgY2FuIGNhbGwgYmFjayBpbnRvIEpTLgorICAgIH0KKwogICAgIEpTT2JqZWN0 KiBzY3JpcHRPYmplY3QgPSBwbHVnaW5TY3JpcHRPYmplY3QobGV4aWNhbEdsb2JhbE9iamVjdCwg ZWxlbWVudCk7CiAgICAgaWYgKCFzY3JpcHRPYmplY3QpCiAgICAgICAgIHJldHVybiBmYWxzZTsK SW5kZXg6IFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvckpTLnBt Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVy YXRvckpTLnBtCShyZXZpc2lvbiAyNjQ4ODEpCisrKyBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9z Y3JpcHRzL0NvZGVHZW5lcmF0b3JKUy5wbQkod29ya2luZyBjb3B5KQpAQCAtNzA2LDYgKzcwNiw5 IEBAIHN1YiBHZW5lcmF0ZUdldE93blByb3BlcnR5U2xvdAogICAgICAgICBBZGRUb0ltcGxJbmNs dWRlcygiSlNQbHVnaW5FbGVtZW50RnVuY3Rpb25zLmgiKTsKICAgICAgICAgcHVzaChAJG91dHB1 dEFycmF5LCAiICAgIGlmIChwbHVnaW5FbGVtZW50Q3VzdG9tR2V0T3duUHJvcGVydHlTbG90KHRo aXNPYmplY3QsIGxleGljYWxHbG9iYWxPYmplY3QsIHByb3BlcnR5TmFtZSwgc2xvdCkpXG4iKTsK ICAgICAgICAgcHVzaChAJG91dHB1dEFycmF5LCAiICAgICAgICByZXR1cm4gdHJ1ZTtcbiIpOwor ICAgICAgICBwdXNoKEAkb3V0cHV0QXJyYXksICIgICAgQVNTRVJUKHNsb3QuaXNUYWludGVkQnlP cGFxdWVPYmplY3QoKSk7XG4iKTsKKyAgICAgICAgcHVzaChAJG91dHB1dEFycmF5LCAiICAgIGlm IChzbG90LmlzVk1JbnF1aXJ5KCkpXG4iKTsKKyAgICAgICAgcHVzaChAJG91dHB1dEFycmF5LCAi ICAgICAgICByZXR1cm4gZmFsc2U7XG4iKTsKICAgICB9CiAKICAgICAjIDMuIFJldHVybiBPcmRp bmFyeUdldE93blByb3BlcnR5KE8sIFApLgpAQCAtODE5LDYgKzgyMiw5IEBAIHN1YiBHZW5lcmF0 ZUdldE93blByb3BlcnR5U2xvdEJ5SW5kZXgKICAgICAgICAgQWRkVG9JbXBsSW5jbHVkZXMoIkpT UGx1Z2luRWxlbWVudEZ1bmN0aW9ucy5oIik7CiAgICAgICAgIHB1c2goQCRvdXRwdXRBcnJheSwg IiAgICBpZiAocGx1Z2luRWxlbWVudEN1c3RvbUdldE93blByb3BlcnR5U2xvdCh0aGlzT2JqZWN0 LCBsZXhpY2FsR2xvYmFsT2JqZWN0LCBwcm9wZXJ0eU5hbWUsIHNsb3QpKVxuIik7CiAgICAgICAg IHB1c2goQCRvdXRwdXRBcnJheSwgIiAgICAgICAgcmV0dXJuIHRydWU7XG4iKTsKKyAgICAgICAg cHVzaChAJG91dHB1dEFycmF5LCAiICAgIEFTU0VSVChzbG90LmlzVGFpbnRlZEJ5T3BhcXVlT2Jq ZWN0KCkpO1xuIik7CisgICAgICAgIHB1c2goQCRvdXRwdXRBcnJheSwgIiAgICBpZiAoc2xvdC5p c1ZNSW5xdWlyeSgpKVxuIik7CisgICAgICAgIHB1c2goQCRvdXRwdXRBcnJheSwgIiAgICAgICAg cmV0dXJuIGZhbHNlO1xuIik7CiAgICAgfQogCiAgICAgIyAzLiBSZXR1cm4gT3JkaW5hcnlHZXRP d25Qcm9wZXJ0eShPLCBQKS4K 405221 2020-07-24 21:37:20 -0700 2020-07-25 21:20:10 -0700 proposed patch. bug-214555.patch text/plain 10166 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjY0ODgyKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI5IEBA CisyMDIwLTA3LTI0ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBw bHVnaW5FbGVtZW50Q3VzdG9tR2V0T3duUHJvcGVydHlTbG90KCkgc2hvdWxkIHN1cHBvcnQgVk1J bnF1aXJ5IHJlcXVlc3RzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MjE0NTU1CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS82NTg1NTQwMD4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAxLiBBZGQgaGFuZGxp bmcgZm9yIFZNSW5xdWlyeSBmYWlsdXJlIGluIEpTT2JqZWN0OjpnZXRQcm9wZXJ0eVNsb3QoKSBh bmQKKyAgICAgICAgICAgSlNPYmplY3Q6OmdldE5vbkluZGV4UHJvcGVydHlTbG90KCkuICBCYXNp Y2FsbHksIGlmIHRoZSBxdWVyeSBpc1RhaW50ZWRCeU9wYXF1ZU9iamVjdCwKKyAgICAgICAgICAg dGhlbiB3ZSBzaG91bGQgdHJlYXQgdGhlIGZhbHNlIHJlc3VsdCBhcyBhIGZhaWxlZCBWTUlucXVp cnkuCisKKyAgICAgICAgMi4gRml4IEpTTW9kdWxlTmFtZXNwYWNlT2JqZWN0OjpnZXRPd25Qcm9w ZXJ0eVNsb3RDb21tb24oKSBhbmQKKyAgICAgICAgICAgUHJveHlPYmplY3Q6OmdldE93blByb3Bl cnR5U2xvdENvbW1vbigpIHRvIGluaXRpYWxpemUgdGhlIFByb3BlcnR5U2xvdCB0byBhCisgICAg ICAgICAgIGpzVW5kZWZpbmVkKCkgdmFsdWUgaWYgd2UgaGF2ZSBhIGZhaWxlZCBWTUlucXVpcnku ICBUaGUgY2xpZW50IHNob3VsZG4ndAorICAgICAgICAgICBiZSByZWFkaW5nIHRoZSB2YWx1ZSBp ZiB0aGUgVk1JbnF1aXJ5IGZhaWxlZCwgYnV0IGFzIGEgZGVmZW5zaXZlIGFjdGlvbiwgd2UnbGwK KyAgICAgICAgICAgaW5pdGlhbGl6ZSB0aGUgc2xvdCB0byBlZmZlY3RpdmVseSByZXR1cm4gYW4g dW5kZWZpbmVkIHZhbHVlLgorCisgICAgICAgICogcnVudGltZS9KU01vZHVsZU5hbWVzcGFjZU9i amVjdC5jcHA6CisgICAgICAgIChKU0M6OkpTTW9kdWxlTmFtZXNwYWNlT2JqZWN0OjpnZXRPd25Q cm9wZXJ0eVNsb3RDb21tb24pOgorICAgICAgICAqIHJ1bnRpbWUvSlNPYmplY3RJbmxpbmVzLmg6 CisgICAgICAgIChKU0M6OkpTT2JqZWN0OjpnZXRQcm9wZXJ0eVNsb3QpOgorICAgICAgICAoSlND OjpKU09iamVjdDo6Z2V0Tm9uSW5kZXhQcm9wZXJ0eVNsb3QpOgorICAgICAgICAqIHJ1bnRpbWUv UHJveHlPYmplY3QuY3BwOgorICAgICAgICAoSlNDOjpQcm94eU9iamVjdDo6Z2V0T3duUHJvcGVy dHlTbG90Q29tbW9uKToKKwogMjAyMC0wNy0yNCAgRGVhbiBKYWNrc29uICA8ZGlub0BhcHBsZS5j b20+CiAKICAgICAgICAgSmF2YVNjcmlwdENvcmUgWGNvZGUgcHJvamVjdCBoYXMgc29tZSBlcnJv cnMKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTTW9kdWxlTmFtZXNwYWNl T2JqZWN0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9K U01vZHVsZU5hbWVzcGFjZU9iamVjdC5jcHAJKHJldmlzaW9uIDI2NDg4MSkKKysrIFNvdXJjZS9K YXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTTW9kdWxlTmFtZXNwYWNlT2JqZWN0LmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtMSw1ICsxLDUgQEAKIC8qCi0gKiBDb3B5cmlnaHQgKEMpIDIwMTUtMjAxOSBB cHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmlnaHQgKEMpIDIwMTUtMjAy MCBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICogUmVkaXN0cmlidXRpb24g YW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CiAgKiBt b2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNv bmRpdGlvbnMKQEAgLTE1Nyw2ICsxNTcsNyBAQCBib29sIEpTTW9kdWxlTmFtZXNwYWNlT2JqZWN0 OjpnZXRPd25Qcm9wCiAgICAgfQogCiAgICAgY2FzZSBQcm9wZXJ0eVNsb3Q6OkludGVybmFsTWV0 aG9kVHlwZTo6Vk1JbnF1aXJ5OgorICAgICAgICBzbG90LnNldFZhbHVlKHRoaXMsIHN0YXRpY19j YXN0PHVuc2lnbmVkPihKU0M6OlByb3BlcnR5QXR0cmlidXRlOjpOb25lKSwganNVbmRlZmluZWQo KSk7CiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICB9CiAKSW5kZXg6IFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9ydW50aW1lL0pTT2JqZWN0SW5saW5lcy5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9K YXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTT2JqZWN0SW5saW5lcy5oCShyZXZpc2lvbiAyNjQ4ODEp CisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU09iamVjdElubGluZXMuaAkod29y a2luZyBjb3B5KQpAQCAtMTMzLDYgKzEzMyw4IEBAIEFMV0FZU19JTkxJTkUgYm9vbCBKU09iamVj dDo6Z2V0UHJvcGVydHkKICAgICAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwgZmFsc2Up OwogICAgICAgICBpZiAoaGFzU2xvdCkKICAgICAgICAgICAgIHJldHVybiB0cnVlOworICAgICAg ICBpZiAoc2xvdC5pc1ZNSW5xdWlyeSgpICYmIHNsb3QuaXNUYWludGVkQnlPcGFxdWVPYmplY3Qo KSkKKyAgICAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICAgICAgaWYgKG9iamVjdC0+dHlwZSgp ID09IFByb3h5T2JqZWN0VHlwZSAmJiBzbG90LmludGVybmFsTWV0aG9kVHlwZSgpID09IFByb3Bl cnR5U2xvdDo6SW50ZXJuYWxNZXRob2RUeXBlOjpIYXNQcm9wZXJ0eSkKICAgICAgICAgICAgIHJl dHVybiBmYWxzZTsKICAgICAgICAgSlNWYWx1ZSBwcm90b3R5cGU7CkBAIC0xNzQsNiArMTc2LDgg QEAgQUxXQVlTX0lOTElORSBib29sIEpTT2JqZWN0OjpnZXROb25JbmRleAogICAgICAgICAgICAg UkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwgZmFsc2UpOwogICAgICAgICAgICAgaWYgKGhhc1Ns b3QpCiAgICAgICAgICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgICAgICBpZiAoc2xvdC5p c1ZNSW5xdWlyeSgpICYmIHNsb3QuaXNUYWludGVkQnlPcGFxdWVPYmplY3QoKSkKKyAgICAgICAg ICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgICAgICAgICBpZiAob2JqZWN0LT50eXBlKCkgPT0g UHJveHlPYmplY3RUeXBlICYmIHNsb3QuaW50ZXJuYWxNZXRob2RUeXBlKCkgPT0gUHJvcGVydHlT bG90OjpJbnRlcm5hbE1ldGhvZFR5cGU6Okhhc1Byb3BlcnR5KQogICAgICAgICAgICAgICAgIHJl dHVybiBmYWxzZTsKICAgICAgICAgfQpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRp bWUvUHJveHlPYmplY3QuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9y dW50aW1lL1Byb3h5T2JqZWN0LmNwcAkocmV2aXNpb24gMjY0ODgxKQorKysgU291cmNlL0phdmFT Y3JpcHRDb3JlL3J1bnRpbWUvUHJveHlPYmplY3QuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xLDUg KzEsNSBAQAogLyoKLSAqIENvcHlyaWdodCAoQykgMjAxNi0yMDE5IEFwcGxlIEluYy4gQWxsIFJp Z2h0cyBSZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAxNi0yMDIwIEFwcGxlIEluYy4gQWxs IFJpZ2h0cyBSZXNlcnZlZC4KICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJj ZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNhdGlvbiwgYXJl IHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtMzMy LDggKzMzMiwxMCBAQCBib29sIFByb3h5T2JqZWN0OjpnZXRPd25Qcm9wZXJ0eVNsb3RDb21tCiAg ICAgc2xvdC5kaXNhYmxlQ2FjaGluZygpOwogICAgIHNsb3Quc2V0SXNUYWludGVkQnlPcGFxdWVP YmplY3QoKTsKIAotICAgIGlmIChzbG90LmludGVybmFsTWV0aG9kVHlwZSgpID09IFByb3BlcnR5 U2xvdDo6SW50ZXJuYWxNZXRob2RUeXBlOjpWTUlucXVpcnkpCisgICAgaWYgKHNsb3QuaXNWTUlu cXVpcnkoKSkgeworICAgICAgICBzbG90LnNldFZhbHVlKHRoaXMsIHN0YXRpY19jYXN0PHVuc2ln bmVkPihKU0M6OlByb3BlcnR5QXR0cmlidXRlOjpOb25lKSwganNVbmRlZmluZWQoKSk7CiAgICAg ICAgIHJldHVybiBmYWxzZTsKKyAgICB9CiAKICAgICBWTSYgdm0gPSBnbG9iYWxPYmplY3QtPnZt KCk7CiAgICAgYXV0byBzY29wZSA9IERFQ0xBUkVfVEhST1dfU0NPUEUodm0pOwpJbmRleDogU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkocmV2aXNpb24gMjY0ODgyKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMjkgQEAKKzIwMjAtMDctMjQgIE1hcmsgTGFtICA8bWFyay5s YW1AYXBwbGUuY29tPgorCisgICAgICAgIHBsdWdpbkVsZW1lbnRDdXN0b21HZXRPd25Qcm9wZXJ0 eVNsb3QoKSBzaG91bGQgc3VwcG9ydCBWTUlucXVpcnkgcmVxdWVzdHMuCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTQ1NTUKKyAgICAgICAgPHJkYXI6 Ly9wcm9ibGVtLzY1ODU1NDAwPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIDEuIEFkZCBoYW5kbGluZyBmb3IgVk1JbnF1aXJ5IGZhaWx1cmUgaW4gQ29k ZUdlbmVyYXRvckpTLgorCisgICAgICAgIDIuIEZpeCBwbHVnaW5FbGVtZW50Q3VzdG9tR2V0T3du UHJvcGVydHlTbG90KCkgdG8gc2V0SXNUYWludGVkQnlPcGFxdWVPYmplY3QoKS4KKworICAgICAg ICAzLiBGaXggcGx1Z2luRWxlbWVudEN1c3RvbUdldE93blByb3BlcnR5U2xvdCgpIGhhbmRsZSBh IFZNSW5xdWlyeSBmYWlsdXJlIGNhc2UKKyAgICAgICAgICAgYW5kIGlmIHNvLCB0byBpbml0aWFs aXplIHRoZSBQcm9wZXJ0eVNsb3QgdG8gYSBqc1VuZGVmaW5lZCgpIHZhbHVlLiAgVGhlIGNsaWVu dAorICAgICAgICAgICBzaG91bGRuJ3QgYmUgcmVhZGluZyB0aGUgdmFsdWUgaWYgdGhlIFZNSW5x dWlyeSBmYWlsZWQsIGJ1dCBhcyBhIGRlZmVuc2l2ZQorICAgICAgICAgICBhY3Rpb24sIHdlJ2xs IGluaXRpYWxpemUgdGhlIHNsb3QgdG8gZWZmZWN0aXZlbHkgcmV0dXJuIGFuIHVuZGVmaW5lZCB2 YWx1ZS4KKworICAgICAgICAqIGJpbmRpbmdzL2pzL0pTUGx1Z2luRWxlbWVudEZ1bmN0aW9ucy5j cHA6CisgICAgICAgIChXZWJDb3JlOjpwbHVnaW5FbGVtZW50Q3VzdG9tR2V0T3duUHJvcGVydHlT bG90KToKKyAgICAgICAgKiBiaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JKUy5wbToKKyAg ICAgICAgKEdlbmVyYXRlR2V0T3duUHJvcGVydHlTbG90KToKKyAgICAgICAgKEdlbmVyYXRlR2V0 T3duUHJvcGVydHlTbG90QnlJbmRleCk6CisgICAgICAgICogYmluZGluZ3Mvc2NyaXB0cy90ZXN0 L0pTL0pTVGVzdFBsdWdpbkludGVyZmFjZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpKU1Rlc3RQ bHVnaW5JbnRlcmZhY2U6OmdldE93blByb3BlcnR5U2xvdCk6CisgICAgICAgIChXZWJDb3JlOjpK U1Rlc3RQbHVnaW5JbnRlcmZhY2U6OmdldE93blByb3BlcnR5U2xvdEJ5SW5kZXgpOgorCiAyMDIw LTA3LTI0ICBCcmFkeSBFaWRzb24gIDxiZWlkc29uQGFwcGxlLmNvbT4KIAogICAgICAgICBCdWls ZCBmaXggYWZ0ZXIgcjI2NDg3NApJbmRleDogU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNQ bHVnaW5FbGVtZW50RnVuY3Rpb25zLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9i aW5kaW5ncy9qcy9KU1BsdWdpbkVsZW1lbnRGdW5jdGlvbnMuY3BwCShyZXZpc2lvbiAyNjQ4ODEp CisrKyBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU1BsdWdpbkVsZW1lbnRGdW5jdGlvbnMu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xLDYgKzEsNiBAQAogLyoKICAqICBDb3B5cmlnaHQgKEMp IDE5OTktMjAwMCBIYXJyaSBQb3J0ZW4gKHBvcnRlbkBrZGUub3JnKQotICogIENvcHlyaWdodCAo QykgMjAwNC0yMDE5IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqICBDb3B5cmln aHQgKEMpIDIwMDQtMjAyMCBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICog IFRoaXMgbGlicmFyeSBpcyBmcmVlIHNvZnR3YXJlOyB5b3UgY2FuIHJlZGlzdHJpYnV0ZSBpdCBh bmQvb3IKICAqICBtb2RpZnkgaXQgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBHTlUgTGVzc2VyIEdl bmVyYWwgUHVibGljCkBAIC0xMTEsMTIgKzExMSwxOSBAQCBzdGF0aWMgRW5jb2RlZEpTVmFsdWUg cGx1Z2luRWxlbWVudFByb3BlCiAKIGJvb2wgcGx1Z2luRWxlbWVudEN1c3RvbUdldE93blByb3Bl cnR5U2xvdChKU0hUTUxFbGVtZW50KiBlbGVtZW50LCBKU0dsb2JhbE9iamVjdCogbGV4aWNhbEds b2JhbE9iamVjdCwgUHJvcGVydHlOYW1lIHByb3BlcnR5TmFtZSwgUHJvcGVydHlTbG90JiBzbG90 KQogeworICAgIHNsb3Quc2V0SXNUYWludGVkQnlPcGFxdWVPYmplY3QoKTsKKwogICAgIGlmICgh ZWxlbWVudC0+Z2xvYmFsT2JqZWN0KCktPndvcmxkKCkuaXNOb3JtYWwoKSkgewogICAgICAgICBK U0M6OkpTVmFsdWUgcHJvdG8gPSBlbGVtZW50LT5nZXRQcm90b3R5cGVEaXJlY3QobGV4aWNhbEds b2JhbE9iamVjdC0+dm0oKSk7CiAgICAgICAgIGlmIChwcm90by5pc09iamVjdCgpICYmIEpTQzo6 anNDYXN0PEpTQzo6SlNPYmplY3QqPihhc09iamVjdChwcm90bykpLT5oYXNQcm9wZXJ0eShsZXhp Y2FsR2xvYmFsT2JqZWN0LCBwcm9wZXJ0eU5hbWUpKQogICAgICAgICAgICAgcmV0dXJuIGZhbHNl OwogICAgIH0KIAorICAgIGlmIChzbG90LmlzVk1JbnF1aXJ5KCkpIHsKKyAgICAgICAgc2xvdC5z ZXRWYWx1ZShlbGVtZW50LCBzdGF0aWNfY2FzdDx1bnNpZ25lZD4oSlNDOjpQcm9wZXJ0eUF0dHJp YnV0ZTo6Tm9uZSksIGpzVW5kZWZpbmVkKCkpOworICAgICAgICByZXR1cm4gZmFsc2U7IC8vIENh bid0IGV4ZWN1dGUgc3R1ZmYgYmVsb3cgYmVjYXVzZSB0aGV5IGNhbiBjYWxsIGJhY2sgaW50byBK Uy4KKyAgICB9CisKICAgICBKU09iamVjdCogc2NyaXB0T2JqZWN0ID0gcGx1Z2luU2NyaXB0T2Jq ZWN0KGxleGljYWxHbG9iYWxPYmplY3QsIGVsZW1lbnQpOwogICAgIGlmICghc2NyaXB0T2JqZWN0 KQogICAgICAgICByZXR1cm4gZmFsc2U7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9z Y3JpcHRzL0NvZGVHZW5lcmF0b3JKUy5wbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9i aW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JKUy5wbQkocmV2aXNpb24gMjY0ODgxKQorKysg U291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9ySlMucG0JKHdvcmtp bmcgY29weSkKQEAgLTcwNiw2ICs3MDYsOSBAQCBzdWIgR2VuZXJhdGVHZXRPd25Qcm9wZXJ0eVNs b3QKICAgICAgICAgQWRkVG9JbXBsSW5jbHVkZXMoIkpTUGx1Z2luRWxlbWVudEZ1bmN0aW9ucy5o Iik7CiAgICAgICAgIHB1c2goQCRvdXRwdXRBcnJheSwgIiAgICBpZiAocGx1Z2luRWxlbWVudEN1 c3RvbUdldE93blByb3BlcnR5U2xvdCh0aGlzT2JqZWN0LCBsZXhpY2FsR2xvYmFsT2JqZWN0LCBw cm9wZXJ0eU5hbWUsIHNsb3QpKVxuIik7CiAgICAgICAgIHB1c2goQCRvdXRwdXRBcnJheSwgIiAg ICAgICAgcmV0dXJuIHRydWU7XG4iKTsKKyAgICAgICAgcHVzaChAJG91dHB1dEFycmF5LCAiICAg IEFTU0VSVChzbG90LmlzVGFpbnRlZEJ5T3BhcXVlT2JqZWN0KCkpO1xuIik7CisgICAgICAgIHB1 c2goQCRvdXRwdXRBcnJheSwgIiAgICBpZiAoc2xvdC5pc1ZNSW5xdWlyeSgpKVxuIik7CisgICAg ICAgIHB1c2goQCRvdXRwdXRBcnJheSwgIiAgICAgICAgcmV0dXJuIGZhbHNlO1xuIik7CiAgICAg fQogCiAgICAgIyAzLiBSZXR1cm4gT3JkaW5hcnlHZXRPd25Qcm9wZXJ0eShPLCBQKS4KQEAgLTgx OSw2ICs4MjIsOSBAQCBzdWIgR2VuZXJhdGVHZXRPd25Qcm9wZXJ0eVNsb3RCeUluZGV4CiAgICAg ICAgIEFkZFRvSW1wbEluY2x1ZGVzKCJKU1BsdWdpbkVsZW1lbnRGdW5jdGlvbnMuaCIpOwogICAg ICAgICBwdXNoKEAkb3V0cHV0QXJyYXksICIgICAgaWYgKHBsdWdpbkVsZW1lbnRDdXN0b21HZXRP d25Qcm9wZXJ0eVNsb3QodGhpc09iamVjdCwgbGV4aWNhbEdsb2JhbE9iamVjdCwgcHJvcGVydHlO YW1lLCBzbG90KSlcbiIpOwogICAgICAgICBwdXNoKEAkb3V0cHV0QXJyYXksICIgICAgICAgIHJl dHVybiB0cnVlO1xuIik7CisgICAgICAgIHB1c2goQCRvdXRwdXRBcnJheSwgIiAgICBBU1NFUlQo c2xvdC5pc1RhaW50ZWRCeU9wYXF1ZU9iamVjdCgpKTtcbiIpOworICAgICAgICBwdXNoKEAkb3V0 cHV0QXJyYXksICIgICAgaWYgKHNsb3QuaXNWTUlucXVpcnkoKSlcbiIpOworICAgICAgICBwdXNo KEAkb3V0cHV0QXJyYXksICIgICAgICAgIHJldHVybiBmYWxzZTtcbiIpOwogICAgIH0KIAogICAg ICMgMy4gUmV0dXJuIE9yZGluYXJ5R2V0T3duUHJvcGVydHkoTywgUCkuCkluZGV4OiBTb3VyY2Uv V2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvSlMvSlNUZXN0UGx1Z2luSW50ZXJmYWNlLmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvSlMv SlNUZXN0UGx1Z2luSW50ZXJmYWNlLmNwcAkocmV2aXNpb24gMjY0ODgxKQorKysgU291cmNlL1dl YkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L0pTL0pTVGVzdFBsdWdpbkludGVyZmFjZS5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTE1Niw2ICsxNTYsOSBAQCBib29sIEpTVGVzdFBsdWdpbkludGVy ZmFjZTo6Z2V0T3duUHJvcGVyCiAgICAgQVNTRVJUX0dDX09CSkVDVF9JTkhFUklUUyh0aGlzT2Jq ZWN0LCBpbmZvKCkpOwogICAgIGlmIChwbHVnaW5FbGVtZW50Q3VzdG9tR2V0T3duUHJvcGVydHlT bG90KHRoaXNPYmplY3QsIGxleGljYWxHbG9iYWxPYmplY3QsIHByb3BlcnR5TmFtZSwgc2xvdCkp CiAgICAgICAgIHJldHVybiB0cnVlOworICAgIEFTU0VSVChzbG90LmlzVGFpbnRlZEJ5T3BhcXVl T2JqZWN0KCkpOworICAgIGlmIChzbG90LmlzVk1JbnF1aXJ5KCkpCisgICAgICAgIHJldHVybiBm YWxzZTsKICAgICByZXR1cm4gSlNPYmplY3Q6OmdldE93blByb3BlcnR5U2xvdChvYmplY3QsIGxl eGljYWxHbG9iYWxPYmplY3QsIHByb3BlcnR5TmFtZSwgc2xvdCk7CiB9CiAKQEAgLTE2Nyw2ICsx NzAsOSBAQCBib29sIEpTVGVzdFBsdWdpbkludGVyZmFjZTo6Z2V0T3duUHJvcGVyCiAgICAgYXV0 byBwcm9wZXJ0eU5hbWUgPSBJZGVudGlmaWVyOjpmcm9tKHZtLCBpbmRleCk7CiAgICAgaWYgKHBs dWdpbkVsZW1lbnRDdXN0b21HZXRPd25Qcm9wZXJ0eVNsb3QodGhpc09iamVjdCwgbGV4aWNhbEds b2JhbE9iamVjdCwgcHJvcGVydHlOYW1lLCBzbG90KSkKICAgICAgICAgcmV0dXJuIHRydWU7Cisg ICAgQVNTRVJUKHNsb3QuaXNUYWludGVkQnlPcGFxdWVPYmplY3QoKSk7CisgICAgaWYgKHNsb3Qu aXNWTUlucXVpcnkoKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIHJldHVybiBKU09iamVj dDo6Z2V0T3duUHJvcGVydHlTbG90QnlJbmRleChvYmplY3QsIGxleGljYWxHbG9iYWxPYmplY3Qs IGluZGV4LCBzbG90KTsKIH0KIAo=