233842 2021-12-03 16:13:27 -0800 WKWebpagePreferences._activeContentRuleListActionPatterns should be an NSDictionary of identifier to allowed patterns 2021-12-06 09:47:24 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen cdumez ews-watchlist japhet timothy webkit-bug-importer oldest_to_newest 1820341 0 achristensen 2021-12-03 16:13:27 -0800 WKWebpagePreferences._activeContentRuleListActionPatterns should be an NSDictionary of identifier to allowed patterns 1820342 1 445910 achristensen 2021-12-03 16:14:35 -0800 Created attachment 445910 Patch 1820641 2 ews-feeder 2021-12-06 09:46:08 -0800 Committed r286545 (244877@main): <https://commits.webkit.org/244877@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 445910. 1820642 3 webkit-bug-importer 2021-12-06 09:47:24 -0800 <rdar://problem/86108970> 445910 2021-12-03 16:14:35 -0800 2021-12-06 09:46:09 -0800 Patch bug-233842-20211203161434.patch text/plain 19669 achristensen U3VidmVyc2lvbiBSZXZpc2lvbjogMjg2NDkyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDk2ZDhiOTQxMGZlYjY4 NTQ1NzA1YWJmYzk3ZjUyYmM1ZmI1ZTJkZi4uYTBiMTM3OGFlZjBlMzI3YzgzYWRkY2E1YjY0MmQ1 MTNmYTc5ZGY4ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIxLTEyLTAzICBBbGV4 IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgV0tXZWJw YWdlUHJlZmVyZW5jZXMuX2FjdGl2ZUNvbnRlbnRSdWxlTGlzdEFjdGlvblBhdHRlcm5zIHNob3Vs ZCBiZSBhbiBOU0RpY3Rpb25hcnkgb2YgaWRlbnRpZmllciB0byBhbGxvd2VkIHBhdHRlcm5zCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzM4NDIKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGVyZSdzIG5v IG5lZWQgZm9yIG5pbCB0byBtYXRjaCBldmVyeXRoaW5nIGJlY2F1c2UgYSBwYXR0ZXJuIGNhbiBi ZSB3cml0dGVuIHRvIHF1aWNrbHkgbWF0Y2ggZXZlcnl0aGluZy4KKyAgICAgICAgVGhlcmUgaXMg YSBuZWVkIGZvciBkaWZmZXJlbnQgZXh0ZW5zaW9ucyAod2l0aCBkaWZmZXJlbnQgaWRlbnRpZmll cnMpIHRvIGhhdmUgZGlmZmVyZW50IGFjdGl2ZSBhY3Rpb24gcGVybWlzc2lvbnMsIHRob3VnaC4K KworICAgICAgICAqIGNvbnRlbnRleHRlbnNpb25zL0NvbnRlbnRFeHRlbnNpb25zQmFja2VuZC5j cHA6CisgICAgICAgIChXZWJDb3JlOjpDb250ZW50RXh0ZW5zaW9uczo6Q29udGVudEV4dGVuc2lv bnNCYWNrZW5kOjpwcm9jZXNzQ29udGVudFJ1bGVMaXN0c0ZvckxvYWQpOgorICAgICAgICAqIGxv YWRlci9Eb2N1bWVudExvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudExvYWRl cjo6RG9jdW1lbnRMb2FkZXIpOgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnRMb2FkZXI6OnNl dEFjdGl2ZUNvbnRlbnRSdWxlTGlzdEFjdGlvblBhdHRlcm5zKToKKyAgICAgICAgKFdlYkNvcmU6 OkRvY3VtZW50TG9hZGVyOjphbGxvd3NBY3RpdmVDb250ZW50UnVsZUxpc3RBY3Rpb25zRm9yVVJM IGNvbnN0KToKKyAgICAgICAgKiBsb2FkZXIvRG9jdW1lbnRMb2FkZXIuaDoKKwogMjAyMS0xMi0w MyAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgogCiAgICAgICAg IEFkZCByb29tIGZvciBtb3JlIGJ5dGVjb2RlIGluIFdLQ29udGVudFJ1bGVMaXN0IGZpbGUgZm9y bWF0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQv Q2hhbmdlTG9nCmluZGV4IDRhNTQwZTg2NDExNzE2NzZkN2M5NTBiNWRiYmIzMjc3ZTY3MjQ5MWUu LmRlYjBiMzZhYTA3Yjk3ZGFlYmUwYTUwOTZhNzU0YjliMDNkOGM5OGQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMTkgQEAKKzIwMjEtMTItMDMgIEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5A d2Via2l0Lm9yZz4KKworICAgICAgICBXS1dlYnBhZ2VQcmVmZXJlbmNlcy5fYWN0aXZlQ29udGVu dFJ1bGVMaXN0QWN0aW9uUGF0dGVybnMgc2hvdWxkIGJlIGFuIE5TRGljdGlvbmFyeSBvZiBpZGVu dGlmaWVyIHRvIGFsbG93ZWQgcGF0dGVybnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIzMzg0MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogU2hhcmVkL1dlYnNpdGVQb2xpY2llc0RhdGEuY3BwOgorICAg ICAgICAoV2ViS2l0OjpXZWJzaXRlUG9saWNpZXNEYXRhOjpkZWNvZGUpOgorICAgICAgICAqIFNo YXJlZC9XZWJzaXRlUG9saWNpZXNEYXRhLmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9BUElX ZWJzaXRlUG9saWNpZXMuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLV2VicGFn ZVByZWZlcmVuY2VzLm1tOgorICAgICAgICAoLVtXS1dlYnBhZ2VQcmVmZXJlbmNlcyBfc2V0QWN0 aXZlQ29udGVudFJ1bGVMaXN0QWN0aW9uUGF0dGVybnM6XSk6CisgICAgICAgICgtW1dLV2VicGFn ZVByZWZlcmVuY2VzIF9hY3RpdmVDb250ZW50UnVsZUxpc3RBY3Rpb25QYXR0ZXJuc10pOgorICAg ICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJwYWdlUHJlZmVyZW5jZXNQcml2YXRlLmg6 CisKIDIwMjEtMTItMDMgIEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9y Zz4KIAogICAgICAgICBBZGQgcm9vbSBmb3IgbW9yZSBieXRlY29kZSBpbiBXS0NvbnRlbnRSdWxl TGlzdCBmaWxlIGZvcm1hdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY29udGVudGV4dGVu c2lvbnMvQ29udGVudEV4dGVuc2lvbnNCYWNrZW5kLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2NvbnRl bnRleHRlbnNpb25zL0NvbnRlbnRFeHRlbnNpb25zQmFja2VuZC5jcHAKaW5kZXggYjg0ZDQwYmJh MzU2ZDc2ZjQwZWRiMDEwZjlmNWFhNzRjZTJlZTMxNi4uZTc5YzlhMGEzNjc2NGU1ODE0NDkwZDA4 NTAwNTVmMjhlYTdhMmI0YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY29udGVudGV4dGVu c2lvbnMvQ29udGVudEV4dGVuc2lvbnNCYWNrZW5kLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9j b250ZW50ZXh0ZW5zaW9ucy9Db250ZW50RXh0ZW5zaW9uc0JhY2tlbmQuY3BwCkBAIC0yMjgsMTEg KzIyOCwxMSBAQCBDb250ZW50UnVsZUxpc3RSZXN1bHRzIENvbnRlbnRFeHRlbnNpb25zQmFja2Vu ZDo6cHJvY2Vzc0NvbnRlbnRSdWxlTGlzdHNGb3JMb2FkKAogICAgICAgICAgICAgfSwgWyZdKGNv bnN0IElnbm9yZVByZXZpb3VzUnVsZXNBY3Rpb24mKSB7CiAgICAgICAgICAgICAgICAgUkVMRUFT RV9BU1NFUlRfTk9UX1JFQUNIRUQoKTsKICAgICAgICAgICAgIH0sIFsmXSAoY29uc3QgTW9kaWZ5 SGVhZGVyc0FjdGlvbiYgYWN0aW9uKSB7Ci0gICAgICAgICAgICAgICAgaWYgKGluaXRpYXRpbmdE b2N1bWVudExvYWRlci5hbGxvd3NBY3RpdmVDb250ZW50UnVsZUxpc3RBY3Rpb25zRm9yVVJMKHVy bCkpCisgICAgICAgICAgICAgICAgaWYgKGluaXRpYXRpbmdEb2N1bWVudExvYWRlci5hbGxvd3NB Y3RpdmVDb250ZW50UnVsZUxpc3RBY3Rpb25zRm9yVVJMKGNvbnRlbnRSdWxlTGlzdElkZW50aWZp ZXIsIHVybCkpCiAgICAgICAgICAgICAgICAgICAgIHJlc3VsdHMuc3VtbWFyeS5tb2RpZnlIZWFk ZXJzQWN0aW9ucy5hcHBlbmQoYWN0aW9uKTsKICAgICAgICAgICAgIH0sIFsmXSAoY29uc3QgUmVk aXJlY3RBY3Rpb24mIHJlZGlyZWN0QWN0aW9uKSB7Ci0gICAgICAgICAgICAgICAgaWYgKGluaXRp YXRpbmdEb2N1bWVudExvYWRlci5hbGxvd3NBY3RpdmVDb250ZW50UnVsZUxpc3RBY3Rpb25zRm9y VVJMKHVybCkpCi0gICAgICAgICAgICAgICAgICAgIHJlc3VsdHMuc3VtbWFyeS5yZWRpcmVjdEFj dGlvbnMuYXBwZW5kKHsgcmVkaXJlY3RBY3Rpb24sIG1fY29udGVudEV4dGVuc2lvbnMuZ2V0KGFj dGlvbnNGcm9tQ29udGVudFJ1bGVMaXN0LmNvbnRlbnRSdWxlTGlzdElkZW50aWZpZXIpLT5leHRl bnNpb25CYXNlVVJMKCkgfSk7CisgICAgICAgICAgICAgICAgaWYgKGluaXRpYXRpbmdEb2N1bWVu dExvYWRlci5hbGxvd3NBY3RpdmVDb250ZW50UnVsZUxpc3RBY3Rpb25zRm9yVVJMKGNvbnRlbnRS dWxlTGlzdElkZW50aWZpZXIsIHVybCkpCisgICAgICAgICAgICAgICAgICAgIHJlc3VsdHMuc3Vt bWFyeS5yZWRpcmVjdEFjdGlvbnMuYXBwZW5kKHsgcmVkaXJlY3RBY3Rpb24sIG1fY29udGVudEV4 dGVuc2lvbnMuZ2V0KGNvbnRlbnRSdWxlTGlzdElkZW50aWZpZXIpLT5leHRlbnNpb25CYXNlVVJM KCkgfSk7CiAgICAgICAgICAgICB9KSwgYWN0aW9uLmRhdGEoKSk7CiAgICAgICAgIH0KIApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50TG9hZGVyLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudExvYWRlci5jcHAKaW5kZXggYzNkODQ1MGY3MWMyYzM3 M2QyYWYxY2NjZmIyMTVhZDgxYmY4MGQwYi4uY2Y2Y2NmMmJkMDg5MjUwYzYwM2ZkMDRiNzRjM2Vj OGMwZTQ5YzRmMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50TG9h ZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIuY3BwCkBA IC0xNzQsMTAgKzE3NCw3IEBAIERvY3VtZW50TG9hZGVyOjpEb2N1bWVudExvYWRlcihjb25zdCBS ZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QsIGNvbnN0IFN1YnN0aXR1dGVECiAgICAgLCBtX29yaWdp bmFsU3Vic3RpdHV0ZURhdGFXYXNWYWxpZChzdWJzdGl0dXRlRGF0YS5pc1ZhbGlkKCkpCiAgICAg LCBtX3N1YnN0aXR1dGVSZXNvdXJjZURlbGl2ZXJ5VGltZXIoKnRoaXMsICZEb2N1bWVudExvYWRl cjo6c3Vic3RpdHV0ZVJlc291cmNlRGVsaXZlcnlUaW1lckZpcmVkKQogICAgICwgbV9hcHBsaWNh dGlvbkNhY2hlSG9zdChtYWtlVW5pcXVlPEFwcGxpY2F0aW9uQ2FjaGVIb3N0PigqdGhpcykpCi0g ICAgLCBtX2FjdGl2ZUNvbnRlbnRSdWxlTGlzdEFjdGlvblBhdHRlcm5zKFZlY3RvcjxVc2VyQ29u dGVudFVSTFBhdHRlcm4+KCkpCiB7Ci0gICAgLy8gRklYTUU6IFZlY3RvciBkZWZhdWx0IGNvbnN0 cnVjdG9yIHNob3VsZG4ndCBuZWVkIHRvIGtub3cgdGhlIHNpemUgb2YgdGhlIGVsZW1lbnRzLAot ICAgIC8vIHNvIG1fYWN0aXZlQ29udGVudFJ1bGVMaXN0QWN0aW9uUGF0dGVybnMgb3VnaHQgdG8g YmUgYWJsZSB0byBiZSBpbml0aWFsaXplZCB3aXRoIGFuIGluaXRpYWxpemVyIGxpc3QgaW4gdGhl IGhlYWRlciB3aXRob3V0IGluY2x1ZGluZyBVc2VyQ29udGVudFVSTFBhdHRlcm4uaC4KIH0KIAog RnJhbWVMb2FkZXIqIERvY3VtZW50TG9hZGVyOjpmcmFtZUxvYWRlcigpIGNvbnN0CkBAIC0yNDM3 LDI4ICsyNDM0LDI3IEBAIFJlc291cmNlRXJyb3IgRG9jdW1lbnRMb2FkZXI6OmNvbnRlbnRGaWx0 ZXJEaWRCbG9jayhDb250ZW50RmlsdGVyVW5ibG9ja0hhbmRsZXIKIH0KICNlbmRpZiAvLyBFTkFC TEUoQ09OVEVOVF9GSUxURVJJTkcpCiAKLXZvaWQgRG9jdW1lbnRMb2FkZXI6OnNldEFjdGl2ZUNv bnRlbnRSdWxlTGlzdEFjdGlvblBhdHRlcm5zKGNvbnN0IHN0ZDo6b3B0aW9uYWw8SGFzaFNldDxT dHJpbmc+PiYgcGF0dGVybnMpCit2b2lkIERvY3VtZW50TG9hZGVyOjpzZXRBY3RpdmVDb250ZW50 UnVsZUxpc3RBY3Rpb25QYXR0ZXJucyhjb25zdCBIYXNoTWFwPFN0cmluZywgVmVjdG9yPFN0cmlu Zz4+JiBwYXR0ZXJucykKIHsKLSAgICBpZiAoIXBhdHRlcm5zKSB7Ci0gICAgICAgIG1fYWN0aXZl Q29udGVudFJ1bGVMaXN0QWN0aW9uUGF0dGVybnMgPSBzdGQ6Om51bGxvcHQ7Ci0gICAgICAgIHJl dHVybjsKLSAgICB9Ci0gICAgVmVjdG9yPFdlYkNvcmU6OlVzZXJDb250ZW50VVJMUGF0dGVybj4g cGF0dGVyblZlY3RvcjsKLSAgICBwYXR0ZXJuVmVjdG9yLnJlc2VydmVJbml0aWFsQ2FwYWNpdHko cGF0dGVybnMtPnNpemUoKSk7Ci0gICAgZm9yIChhdXRvJiBwYXR0ZXJuU3RyaW5nIDogKnBhdHRl cm5zKSB7Ci0gICAgICAgIFdlYkNvcmU6OlVzZXJDb250ZW50VVJMUGF0dGVybiBwYXJzZWRQYXR0 ZXJuKHBhdHRlcm5TdHJpbmcpOwotICAgICAgICBpZiAocGFyc2VkUGF0dGVybi5pc1ZhbGlkKCkp Ci0gICAgICAgICAgICBwYXR0ZXJuVmVjdG9yLnVuY2hlY2tlZEFwcGVuZChXVEZNb3ZlKHBhcnNl ZFBhdHRlcm4pKTsKKyAgICBIYXNoTWFwPFN0cmluZywgVmVjdG9yPFVzZXJDb250ZW50VVJMUGF0 dGVybj4+IHBhcnNlZFBhdHRlcm5NYXA7CisKKyAgICBmb3IgKGF1dG8mIHBhaXIgOiBwYXR0ZXJu cykgeworICAgICAgICBWZWN0b3I8VXNlckNvbnRlbnRVUkxQYXR0ZXJuPiBwYXR0ZXJuVmVjdG9y OworICAgICAgICBwYXR0ZXJuVmVjdG9yLnJlc2VydmVJbml0aWFsQ2FwYWNpdHkocGFpci52YWx1 ZS5zaXplKCkpOworICAgICAgICBmb3IgKGF1dG8mIHBhdHRlcm5TdHJpbmcgOiBwYWlyLnZhbHVl KSB7CisgICAgICAgICAgICBVc2VyQ29udGVudFVSTFBhdHRlcm4gcGFyc2VkUGF0dGVybihwYXR0 ZXJuU3RyaW5nKTsKKyAgICAgICAgICAgIGlmIChwYXJzZWRQYXR0ZXJuLmlzVmFsaWQoKSkKKyAg ICAgICAgICAgICAgICBwYXR0ZXJuVmVjdG9yLnVuY2hlY2tlZEFwcGVuZChXVEZNb3ZlKHBhcnNl ZFBhdHRlcm4pKTsKKyAgICAgICAgfQorICAgICAgICBwYXJzZWRQYXR0ZXJuTWFwLnNldChwYWly LmtleSwgV1RGTW92ZShwYXR0ZXJuVmVjdG9yKSk7CiAgICAgfQogCi0gICAgbV9hY3RpdmVDb250 ZW50UnVsZUxpc3RBY3Rpb25QYXR0ZXJucyA9IFdURk1vdmUocGF0dGVyblZlY3Rvcik7CisgICAg bV9hY3RpdmVDb250ZW50UnVsZUxpc3RBY3Rpb25QYXR0ZXJucyA9IFdURk1vdmUocGFyc2VkUGF0 dGVybk1hcCk7CiB9CiAKLWJvb2wgRG9jdW1lbnRMb2FkZXI6OmFsbG93c0FjdGl2ZUNvbnRlbnRS dWxlTGlzdEFjdGlvbnNGb3JVUkwoY29uc3QgVVJMJiB1cmwpIGNvbnN0Citib29sIERvY3VtZW50 TG9hZGVyOjphbGxvd3NBY3RpdmVDb250ZW50UnVsZUxpc3RBY3Rpb25zRm9yVVJMKGNvbnN0IFN0 cmluZyYgY29udGVudFJ1bGVMaXN0SWRlbnRpZmllciwgY29uc3QgVVJMJiB1cmwpIGNvbnN0CiB7 Ci0gICAgaWYgKCFtX2FjdGl2ZUNvbnRlbnRSdWxlTGlzdEFjdGlvblBhdHRlcm5zKQotICAgICAg ICByZXR1cm4gdHJ1ZTsKLSAgICBmb3IgKGNvbnN0IGF1dG8mIHBhdHRlcm4gOiAqbV9hY3RpdmVD b250ZW50UnVsZUxpc3RBY3Rpb25QYXR0ZXJucykgeworICAgIGZvciAoY29uc3QgYXV0byYgcGF0 dGVybiA6IG1fYWN0aXZlQ29udGVudFJ1bGVMaXN0QWN0aW9uUGF0dGVybnMuZ2V0KGNvbnRlbnRS dWxlTGlzdElkZW50aWZpZXIpKSB7CiAgICAgICAgIGlmIChwYXR0ZXJuLm1hdGNoZXModXJsKSkK ICAgICAgICAgICAgIHJldHVybiB0cnVlOwogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2xvYWRlci9Eb2N1bWVudExvYWRlci5oIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3Vt ZW50TG9hZGVyLmgKaW5kZXggZmJmNTQ1YzQ2MGU0ZTQ4OWQ4N2IyNWMwZTg1ZWNjY2E0Y2JmM2M4 Ny4uZjdmM2YzODQ0ZjE4NDQ3YmU4ZGQ3YjgyZDNhNDQzNTAwMjIxNjc2MiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50TG9hZGVyLmgKKysrIGIvU291cmNlL1dlYkNv cmUvbG9hZGVyL0RvY3VtZW50TG9hZGVyLmgKQEAgLTMwMiw4ICszMDIsOCBAQCBwdWJsaWM6CiAg ICAgYm9vbCB1c2VyQ29udGVudEV4dGVuc2lvbnNFbmFibGVkKCkgY29uc3QgeyByZXR1cm4gbV91 c2VyQ29udGVudEV4dGVuc2lvbnNFbmFibGVkOyB9CiAgICAgdm9pZCBzZXRVc2VyQ29udGVudEV4 dGVuc2lvbnNFbmFibGVkKGJvb2wgZW5hYmxlZCkgeyBtX3VzZXJDb250ZW50RXh0ZW5zaW9uc0Vu YWJsZWQgPSBlbmFibGVkOyB9CiAKLSAgICBib29sIGFsbG93c0FjdGl2ZUNvbnRlbnRSdWxlTGlz dEFjdGlvbnNGb3JVUkwoY29uc3QgVVJMJikgY29uc3Q7Ci0gICAgV0VCQ09SRV9FWFBPUlQgdm9p ZCBzZXRBY3RpdmVDb250ZW50UnVsZUxpc3RBY3Rpb25QYXR0ZXJucyhjb25zdCBzdGQ6Om9wdGlv bmFsPEhhc2hTZXQ8U3RyaW5nPj4mKTsKKyAgICBib29sIGFsbG93c0FjdGl2ZUNvbnRlbnRSdWxl TGlzdEFjdGlvbnNGb3JVUkwoY29uc3QgU3RyaW5nJiBjb250ZW50UnVsZUxpc3RJZGVudGlmaWVy LCBjb25zdCBVUkwmKSBjb25zdDsKKyAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIHNldEFjdGl2ZUNv bnRlbnRSdWxlTGlzdEFjdGlvblBhdHRlcm5zKGNvbnN0IEhhc2hNYXA8U3RyaW5nLCBWZWN0b3I8 U3RyaW5nPj4mKTsKIAogI2lmIEVOQUJMRShERVZJQ0VfT1JJRU5UQVRJT04pCiAgICAgRGV2aWNl T3JpZW50YXRpb25Pck1vdGlvblBlcm1pc3Npb25TdGF0ZSBkZXZpY2VPcmllbnRhdGlvbkFuZE1v dGlvbkFjY2Vzc1N0YXRlKCkgY29uc3QgeyByZXR1cm4gbV9kZXZpY2VPcmllbnRhdGlvbkFuZE1v dGlvbkFjY2Vzc1N0YXRlOyB9CkBAIC02NTUsNyArNjU1LDcgQEAgcHJpdmF0ZToKICAgICBib29s IG1faWRlbXBvdGVudE1vZGVBdXRvc2l6aW5nT25seUhvbm9yc1BlcmNlbnRhZ2VzIHsgZmFsc2Ug fTsKICAgICBTdHJpbmcgbV9jdXN0b21OYXZpZ2F0b3JQbGF0Zm9ybTsKICAgICBib29sIG1fdXNl ckNvbnRlbnRFeHRlbnNpb25zRW5hYmxlZCB7IHRydWUgfTsKLSAgICBzdGQ6Om9wdGlvbmFsPFZl Y3RvcjxVc2VyQ29udGVudFVSTFBhdHRlcm4+PiBtX2FjdGl2ZUNvbnRlbnRSdWxlTGlzdEFjdGlv blBhdHRlcm5zOworICAgIEhhc2hNYXA8U3RyaW5nLCBWZWN0b3I8VXNlckNvbnRlbnRVUkxQYXR0 ZXJuPj4gbV9hY3RpdmVDb250ZW50UnVsZUxpc3RBY3Rpb25QYXR0ZXJuczsKICNpZiBFTkFCTEUo REVWSUNFX09SSUVOVEFUSU9OKQogICAgIERldmljZU9yaWVudGF0aW9uT3JNb3Rpb25QZXJtaXNz aW9uU3RhdGUgbV9kZXZpY2VPcmllbnRhdGlvbkFuZE1vdGlvbkFjY2Vzc1N0YXRlIHsgRGV2aWNl T3JpZW50YXRpb25Pck1vdGlvblBlcm1pc3Npb25TdGF0ZTo6UHJvbXB0IH07CiAjZW5kaWYKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYnNpdGVQb2xpY2llc0RhdGEuY3BwIGIv U291cmNlL1dlYktpdC9TaGFyZWQvV2Vic2l0ZVBvbGljaWVzRGF0YS5jcHAKaW5kZXggMmJhNjJj OTgyMGFhYTljNmViYzI0NzA0M2EzNmU0NjI3NmNlZjRkMS4uYmE3ZmVmOTA4YWJjYWFmM2Y1OTQx OWFjOTIxOGUxNzY0YzE1ZDEyNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9TaGFyZWQvV2Vi c2l0ZVBvbGljaWVzRGF0YS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9TaGFyZWQvV2Vic2l0ZVBv bGljaWVzRGF0YS5jcHAKQEAgLTY0LDcgKzY0LDcgQEAgc3RkOjpvcHRpb25hbDxXZWJzaXRlUG9s aWNpZXNEYXRhPiBXZWJzaXRlUG9saWNpZXNEYXRhOjpkZWNvZGUoSVBDOjpEZWNvZGVyJiBkZWMK ICAgICBpZiAoIWNvbnRlbnRCbG9ja2Vyc0VuYWJsZWQpCiAgICAgICAgIHJldHVybiBzdGQ6Om51 bGxvcHQ7CiAKLSAgICBzdGQ6Om9wdGlvbmFsPHN0ZDo6b3B0aW9uYWw8SGFzaFNldDxTdHJpbmc+ Pj4gYWN0aXZlQ29udGVudFJ1bGVMaXN0QWN0aW9uUGF0dGVybnM7CisgICAgc3RkOjpvcHRpb25h bDxIYXNoTWFwPFdURjo6U3RyaW5nLCBWZWN0b3I8V1RGOjpTdHJpbmc+Pj4gYWN0aXZlQ29udGVu dFJ1bGVMaXN0QWN0aW9uUGF0dGVybnM7CiAgICAgZGVjb2RlciA+PiBhY3RpdmVDb250ZW50UnVs ZUxpc3RBY3Rpb25QYXR0ZXJuczsKICAgICBpZiAoIWFjdGl2ZUNvbnRlbnRSdWxlTGlzdEFjdGlv blBhdHRlcm5zKQogICAgICAgICByZXR1cm4gc3RkOjpudWxsb3B0OwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9TaGFyZWQvV2Vic2l0ZVBvbGljaWVzRGF0YS5oIGIvU291cmNlL1dlYktpdC9T aGFyZWQvV2Vic2l0ZVBvbGljaWVzRGF0YS5oCmluZGV4IGMyODE2MmRlNjRmM2U1OWNlYWUwYzky OGJhMjRhNWRjMTdiZTNkMDUuLjhkMmE4NzgyMTE3MGUyYzJlZWFmOGY3NWJkMWIzYjgzMDYwODYw ZGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYnNpdGVQb2xpY2llc0RhdGEu aAorKysgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJzaXRlUG9saWNpZXNEYXRhLmgKQEAgLTUz LDcgKzUzLDcgQEAgc3RydWN0IFdlYnNpdGVQb2xpY2llc0RhdGEgewogICAgIHN0YXRpYyB2b2lk IGFwcGx5VG9Eb2N1bWVudExvYWRlcihXZWJzaXRlUG9saWNpZXNEYXRhJiYsIFdlYkNvcmU6OkRv Y3VtZW50TG9hZGVyJik7CiAKICAgICBib29sIGNvbnRlbnRCbG9ja2Vyc0VuYWJsZWQgeyB0cnVl IH07Ci0gICAgc3RkOjpvcHRpb25hbDxIYXNoU2V0PFN0cmluZz4+IGFjdGl2ZUNvbnRlbnRSdWxl TGlzdEFjdGlvblBhdHRlcm5zIHsgSGFzaFNldDxTdHJpbmc+KCkgfTsKKyAgICBIYXNoTWFwPFdU Rjo6U3RyaW5nLCBWZWN0b3I8V1RGOjpTdHJpbmc+PiBhY3RpdmVDb250ZW50UnVsZUxpc3RBY3Rp b25QYXR0ZXJuczsKICAgICBPcHRpb25TZXQ8V2Vic2l0ZUF1dG9wbGF5UXVpcms+IGFsbG93ZWRB dXRvcGxheVF1aXJrczsKICAgICBXZWJzaXRlQXV0b3BsYXlQb2xpY3kgYXV0b3BsYXlQb2xpY3kg eyBXZWJzaXRlQXV0b3BsYXlQb2xpY3k6OkRlZmF1bHQgfTsKICNpZiBFTkFCTEUoREVWSUNFX09S SUVOVEFUSU9OKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0FQSVdl YnNpdGVQb2xpY2llcy5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0FQSVdlYnNpdGVQ b2xpY2llcy5oCmluZGV4IGI4MzkzZGJjZmY4ZTU4OGE0NzhkZTk4YWNkYjk0ZmRmYTY2OTNiMzcu Ljk5ZDAxNWQ1NTE1NjhmZTU2ZTc1ZDlmODY4M2ViNDExZDliZjhkYzEgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9BUElXZWJzaXRlUG9saWNpZXMuaAorKysgYi9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQVBJV2Vic2l0ZVBvbGljaWVzLmgKQEAgLTYzLDggKzYz LDggQEAgcHVibGljOgogICAgIGJvb2wgY29udGVudEJsb2NrZXJzRW5hYmxlZCgpIGNvbnN0IHsg cmV0dXJuIG1fY29udGVudEJsb2NrZXJzRW5hYmxlZDsgfQogICAgIHZvaWQgc2V0Q29udGVudEJs b2NrZXJzRW5hYmxlZChib29sIGVuYWJsZWQpIHsgbV9jb250ZW50QmxvY2tlcnNFbmFibGVkID0g ZW5hYmxlZDsgfQogICAgIAotICAgIHZvaWQgc2V0QWN0aXZlQ29udGVudFJ1bGVMaXN0QWN0aW9u UGF0dGVybnMoc3RkOjpvcHRpb25hbDxIYXNoU2V0PFdURjo6U3RyaW5nPj4mJiBwYXR0ZXJucykg eyBtX2FjdGl2ZUNvbnRlbnRSdWxlTGlzdEFjdGlvblBhdHRlcm5zID0gV1RGTW92ZShwYXR0ZXJu cyk7IH0KLSAgICBjb25zdCBzdGQ6Om9wdGlvbmFsPEhhc2hTZXQ8V1RGOjpTdHJpbmc+PiYgYWN0 aXZlQ29udGVudFJ1bGVMaXN0QWN0aW9uUGF0dGVybnMoKSBjb25zdCB7IHJldHVybiBtX2FjdGl2 ZUNvbnRlbnRSdWxlTGlzdEFjdGlvblBhdHRlcm5zOyB9CisgICAgdm9pZCBzZXRBY3RpdmVDb250 ZW50UnVsZUxpc3RBY3Rpb25QYXR0ZXJucyhIYXNoTWFwPFdURjo6U3RyaW5nLCBWZWN0b3I8V1RG OjpTdHJpbmc+PiYmIHBhdHRlcm5zKSB7IG1fYWN0aXZlQ29udGVudFJ1bGVMaXN0QWN0aW9uUGF0 dGVybnMgPSBXVEZNb3ZlKHBhdHRlcm5zKTsgfQorICAgIGNvbnN0IEhhc2hNYXA8V1RGOjpTdHJp bmcsIFZlY3RvcjxXVEY6OlN0cmluZz4+JiBhY3RpdmVDb250ZW50UnVsZUxpc3RBY3Rpb25QYXR0 ZXJucygpIGNvbnN0IHsgcmV0dXJuIG1fYWN0aXZlQ29udGVudFJ1bGVMaXN0QWN0aW9uUGF0dGVy bnM7IH0KICAgICAKICAgICBPcHRpb25TZXQ8V2ViS2l0OjpXZWJzaXRlQXV0b3BsYXlRdWlyaz4g YWxsb3dlZEF1dG9wbGF5UXVpcmtzKCkgY29uc3QgeyByZXR1cm4gbV9hbGxvd2VkQXV0b3BsYXlR dWlya3M7IH0KICAgICB2b2lkIHNldEFsbG93ZWRBdXRvcGxheVF1aXJrcyhPcHRpb25TZXQ8V2Vi S2l0OjpXZWJzaXRlQXV0b3BsYXlRdWlyaz4gcXVpcmtzKSB7IG1fYWxsb3dlZEF1dG9wbGF5UXVp cmtzID0gcXVpcmtzOyB9CkBAIC0xNDAsNyArMTQwLDcgQEAgcHVibGljOgogcHJpdmF0ZToKICAg ICAvLyBGSVhNRTogcmVwbGFjZSBtb3N0IG9yIGFsbCBvZiB0aGVzZSBtZW1iZXJzIHdpdGggYSBX ZWJzaXRlUG9saWNpZXNEYXRhLgogICAgIGJvb2wgbV9jb250ZW50QmxvY2tlcnNFbmFibGVkIHsg dHJ1ZSB9OwotICAgIHN0ZDo6b3B0aW9uYWw8SGFzaFNldDxXVEY6OlN0cmluZz4+IG1fYWN0aXZl Q29udGVudFJ1bGVMaXN0QWN0aW9uUGF0dGVybnMgeyBIYXNoU2V0PFdURjo6U3RyaW5nPigpIH07 CisgICAgSGFzaE1hcDxXVEY6OlN0cmluZywgVmVjdG9yPFdURjo6U3RyaW5nPj4gbV9hY3RpdmVD b250ZW50UnVsZUxpc3RBY3Rpb25QYXR0ZXJuczsKICAgICBPcHRpb25TZXQ8V2ViS2l0OjpXZWJz aXRlQXV0b3BsYXlRdWlyaz4gbV9hbGxvd2VkQXV0b3BsYXlRdWlya3M7CiAgICAgV2ViS2l0OjpX ZWJzaXRlQXV0b3BsYXlQb2xpY3kgbV9hdXRvcGxheVBvbGljeSB7IFdlYktpdDo6V2Vic2l0ZUF1 dG9wbGF5UG9saWN5OjpEZWZhdWx0IH07CiAjaWYgRU5BQkxFKERFVklDRV9PUklFTlRBVElPTikK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYnBhZ2VQ cmVmZXJlbmNlcy5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYnBh Z2VQcmVmZXJlbmNlcy5tbQppbmRleCAyZDNhN2RjNDhjNWExNDYzMDI0ZjU4NGMyZjJjMzQ5ODM0 NzRmNGY3Li4xMTUzZmRjYWM5MWM0YjBlODQwYTcxNTVlZTA1NWE2MTgwNjcyNmYzIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJwYWdlUHJlZmVyZW5j ZXMubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2VicGFnZVBy ZWZlcmVuY2VzLm1tCkBAIC0xNDEsMzAgKzE0MSwyOSBAQCBzdGF0aWMgV2ViQ29yZTo6TW91c2VF dmVudFBvbGljeSBjb3JlTW91c2VFdmVudFBvbGljeShfV0tXZWJzaXRlTW91c2VFdmVudFBvbGlj eQogICAgIHJldHVybiBfd2Vic2l0ZVBvbGljaWVzLT5jb250ZW50QmxvY2tlcnNFbmFibGVkKCk7 CiB9CiAKLS0gKHZvaWQpX3NldEFjdGl2ZUNvbnRlbnRSdWxlTGlzdEFjdGlvblBhdHRlcm5zOihO U1NldDxOU1N0cmluZyAqPiAqKXBhdHRlcm5zCi17Ci0gICAgaWYgKCFwYXR0ZXJucykgewotICAg ICAgICBfd2Vic2l0ZVBvbGljaWVzLT5zZXRBY3RpdmVDb250ZW50UnVsZUxpc3RBY3Rpb25QYXR0 ZXJucyhzdGQ6Om51bGxvcHQpOwotICAgICAgICByZXR1cm47CistICh2b2lkKV9zZXRBY3RpdmVD b250ZW50UnVsZUxpc3RBY3Rpb25QYXR0ZXJuczooTlNEaWN0aW9uYXJ5PE5TU3RyaW5nICosIE5T U2V0PE5TU3RyaW5nICo+ICo+ICopcGF0dGVybnMKK3sKKyAgICBfX2Jsb2NrIEhhc2hNYXA8U3Ry aW5nLCBWZWN0b3I8U3RyaW5nPj4gbWFwOworICAgIFtwYXR0ZXJucyBlbnVtZXJhdGVLZXlzQW5k T2JqZWN0c1VzaW5nQmxvY2s6XihOU1N0cmluZyAqa2V5LCBOU1NldDxOU1N0cmluZyAqPiAqdmFs dWUsIEJPT0wgKikgeworICAgICAgICBWZWN0b3I8U3RyaW5nPiB2ZWN0b3I7CisgICAgICAgIHZl Y3Rvci5yZXNlcnZlSW5pdGlhbENhcGFjaXR5KHZhbHVlLmNvdW50KTsKKyAgICAgICAgZm9yIChO U1N0cmluZyAqcGF0dGVybiBpbiB2YWx1ZSkKKyAgICAgICAgICAgIHZlY3Rvci51bmNoZWNrZWRB cHBlbmQocGF0dGVybik7CisgICAgICAgIG1hcC5hZGQoa2V5LCBXVEZNb3ZlKHZlY3RvcikpOwor ICAgIH1dOworICAgIF93ZWJzaXRlUG9saWNpZXMtPnNldEFjdGl2ZUNvbnRlbnRSdWxlTGlzdEFj dGlvblBhdHRlcm5zKFdURk1vdmUobWFwKSk7Cit9CisKKy0gKE5TRGljdGlvbmFyeTxOU1N0cmlu ZyAqLCBOU1NldDxOU1N0cmluZyAqPiAqPiAqKV9hY3RpdmVDb250ZW50UnVsZUxpc3RBY3Rpb25Q YXR0ZXJucworeworICAgIE5TTXV0YWJsZURpY3Rpb25hcnk8TlNTdHJpbmcgKiwgTlNTZXQ8TlNT dHJpbmcgKj4gKj4gKmRpY3Rpb25hcnkgPSBbTlNNdXRhYmxlRGljdGlvbmFyeSBkaWN0aW9uYXJ5 XTsKKyAgICBmb3IgKGNvbnN0IGF1dG8mIHBhaXIgOiBfd2Vic2l0ZVBvbGljaWVzLT5hY3RpdmVD b250ZW50UnVsZUxpc3RBY3Rpb25QYXR0ZXJucygpKSB7CisgICAgICAgIE5TTXV0YWJsZVNldDxO U1N0cmluZyAqPiAqc2V0ID0gW05TTXV0YWJsZVNldCBzZXRdOworICAgICAgICBmb3IgKGNvbnN0 IGF1dG8mIHBhdHRlcm4gOiBwYWlyLnZhbHVlKQorICAgICAgICAgICAgW3NldCBhZGRPYmplY3Q6 cGF0dGVybl07CisgICAgICAgIFtkaWN0aW9uYXJ5IHNldE9iamVjdDpzZXQgZm9yS2V5OnBhaXIu a2V5XTsKICAgICB9Ci0KLSAgICBIYXNoU2V0PFN0cmluZz4gcGF0dGVybkhhc2hTZXQ7Ci0gICAg cGF0dGVybkhhc2hTZXQucmVzZXJ2ZUluaXRpYWxDYXBhY2l0eShwYXR0ZXJucy5jb3VudCk7Ci0g ICAgZm9yIChOU1N0cmluZyAqcGF0dGVybiBpbiBwYXR0ZXJucykKLSAgICAgICAgcGF0dGVybkhh c2hTZXQuYWRkKHBhdHRlcm4pOwotICAgIF93ZWJzaXRlUG9saWNpZXMtPnNldEFjdGl2ZUNvbnRl bnRSdWxlTGlzdEFjdGlvblBhdHRlcm5zKFdURk1vdmUocGF0dGVybkhhc2hTZXQpKTsKLX0KLQot LSAoTlNTZXQ8TlNTdHJpbmcgKj4gKilfYWN0aXZlQ29udGVudFJ1bGVMaXN0QWN0aW9uUGF0dGVy bnMKLXsKLSAgICBjb25zdCBhdXRvJiBwYXR0ZXJucyA9IF93ZWJzaXRlUG9saWNpZXMtPmFjdGl2 ZUNvbnRlbnRSdWxlTGlzdEFjdGlvblBhdHRlcm5zKCk7Ci0gICAgaWYgKCFwYXR0ZXJucykKLSAg ICAgICAgcmV0dXJuIG5pbDsKLQotICAgIE5TTXV0YWJsZVNldDxOU1N0cmluZyAqPiAqc2V0ID0g W05TTXV0YWJsZVNldCBzZXRdOwotICAgIGZvciAoY29uc3QgYXV0byYgcGF0dGVybiA6ICpwYXR0 ZXJucykKLSAgICAgICAgW3NldCBhZGRPYmplY3Q6cGF0dGVybl07Ci0gICAgcmV0dXJuIHNldDsK KyAgICByZXR1cm4gZGljdGlvbmFyeTsKIH0KIAogLSAodm9pZClfc2V0QWxsb3dlZEF1dG9wbGF5 UXVpcmtzOihfV0tXZWJzaXRlQXV0b3BsYXlRdWlyaylhbGxvd2VkUXVpcmtzCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJwYWdlUHJlZmVyZW5jZXNQ cml2YXRlLmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJwYWdlUHJl ZmVyZW5jZXNQcml2YXRlLmgKaW5kZXggNTQ3YTI4NzQ0MjYxMGIzNTI1YWIxZWE1ODc4ZWJmOTc0 ZWE5MjA2Yy4uMTc1ZTk3MzRmZTE3N2ViZTI3ODI2ZjgyZWI2N2FkMTQzODVhYzFiMyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2VicGFnZVByZWZlcmVu Y2VzUHJpdmF0ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dl YnBhZ2VQcmVmZXJlbmNlc1ByaXZhdGUuaApAQCAtNjksNyArNjksNyBAQCB0eXBlZGVmIE5TX09Q VElPTlMoTlNVSW50ZWdlciwgX1dLV2Vic2l0ZU1vdXNlRXZlbnRQb2xpY3kpIHsKIEBpbnRlcmZh Y2UgV0tXZWJwYWdlUHJlZmVyZW5jZXMgKFdLUHJpdmF0ZSkKIAogQHByb3BlcnR5IChub25hdG9t aWMsIHNldHRlcj1fc2V0Q29udGVudEJsb2NrZXJzRW5hYmxlZDopIEJPT0wgX2NvbnRlbnRCbG9j a2Vyc0VuYWJsZWQ7Ci1AcHJvcGVydHkgKG5vbmF0b21pYywgY29weSwgc2V0dGVyPV9zZXRBY3Rp dmVDb250ZW50UnVsZUxpc3RBY3Rpb25QYXR0ZXJuczopIE5TU2V0PE5TU3RyaW5nICo+ICpfYWN0 aXZlQ29udGVudFJ1bGVMaXN0QWN0aW9uUGF0dGVybnM7CitAcHJvcGVydHkgKG5vbmF0b21pYywg Y29weSwgc2V0dGVyPV9zZXRBY3RpdmVDb250ZW50UnVsZUxpc3RBY3Rpb25QYXR0ZXJuczopIE5T RGljdGlvbmFyeTxOU1N0cmluZyAqLCBOU1NldDxOU1N0cmluZyAqPiAqPiAqX2FjdGl2ZUNvbnRl bnRSdWxlTGlzdEFjdGlvblBhdHRlcm5zIFdLX0FQSV9BVkFJTEFCTEUobWFjb3MoV0tfTUFDX1RC QSksIGlvcyhXS19JT1NfVEJBKSk7CiBAcHJvcGVydHkgKG5vbmF0b21pYywgc2V0dGVyPV9zZXRB bGxvd2VkQXV0b3BsYXlRdWlya3M6KSBfV0tXZWJzaXRlQXV0b3BsYXlRdWlyayBfYWxsb3dlZEF1 dG9wbGF5UXVpcmtzOwogQHByb3BlcnR5IChub25hdG9taWMsIHNldHRlcj1fc2V0QXV0b3BsYXlQ b2xpY3k6KSBfV0tXZWJzaXRlQXV0b3BsYXlQb2xpY3kgX2F1dG9wbGF5UG9saWN5OwogQHByb3Bl cnR5IChub25hdG9taWMsIGNvcHksIHNldHRlcj1fc2V0Q3VzdG9tSGVhZGVyRmllbGRzOikgTlNB cnJheTxfV0tDdXN0b21IZWFkZXJGaWVsZHMgKj4gKl9jdXN0b21IZWFkZXJGaWVsZHM7CmRpZmYg LS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZjBkN2M2MTZh NjZjMTFjMzllODIyOTEwOGI5YzRkMmE2ZjQ5NTE2Mi4uZDI3OTZhNGU2NzMzNjAwNzE5ZTIwNDc3 YjE2NWZmMGRkMDIzNGI2YSAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xz L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIxLTEyLTAzICBBbGV4IENocmlzdGVuc2Vu ICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgV0tXZWJwYWdlUHJlZmVyZW5j ZXMuX2FjdGl2ZUNvbnRlbnRSdWxlTGlzdEFjdGlvblBhdHRlcm5zIHNob3VsZCBiZSBhbiBOU0Rp Y3Rpb25hcnkgb2YgaWRlbnRpZmllciB0byBhbGxvd2VkIHBhdHRlcm5zCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzM4NDIKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMv V2ViS2l0Q29jb2EvV0tDb250ZW50RXh0ZW5zaW9uU3RvcmUubW06CisgICAgICAgIChuYXZpZ2F0 aW9uRGVsZWdhdGVBbGxvd2luZ0FjdGl2ZUFjdGlvbnNPblRlc3RIb3N0KToKKyAgICAgICAgKFRF U1RfRik6CisKIDIwMjEtMTItMDMgIEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Vi a2l0Lm9yZz4KIAogICAgICAgICBBZGQgcm9vbSBmb3IgbW9yZSBieXRlY29kZSBpbiBXS0NvbnRl bnRSdWxlTGlzdCBmaWxlIGZvcm1hdApkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9U ZXN0cy9XZWJLaXRDb2NvYS9XS0NvbnRlbnRFeHRlbnNpb25TdG9yZS5tbSBiL1Rvb2xzL1Rlc3RX ZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV0tDb250ZW50RXh0ZW5zaW9uU3RvcmUubW0KaW5k ZXggZmFhMjJkNDZmODNkZWM5OTUwMDIxN2QyYTBiNmUzNDY2YjVjZDk1ZC4uNWUyNWFhZWU3NTBk NDM2YTcwMTcwMTJiYjNjZGQwY2NlNjNmMDgzYiAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktp dEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9XS0NvbnRlbnRFeHRlbnNpb25TdG9yZS5tbQorKysgYi9U b29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1dLQ29udGVudEV4dGVuc2lvblN0 b3JlLm1tCkBAIC00OTksNyArNDk5LDcgQEAgc3RhdGljIFJldGFpblB0cjxUZXN0TmF2aWdhdGlv bkRlbGVnYXRlPiBuYXZpZ2F0aW9uRGVsZWdhdGVBbGxvd2luZ0FjdGl2ZUFjdGlvbnMKIHsKICAg ICBzdGF0aWMgYXV0byBkZWxlZ2F0ZSA9IGFkb3B0TlMoW1Rlc3ROYXZpZ2F0aW9uRGVsZWdhdGUg bmV3XSk7CiAgICAgZGVsZWdhdGUuZ2V0KCkuZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlv bldpdGhQcmVmZXJlbmNlcyA9IF4oV0tOYXZpZ2F0aW9uQWN0aW9uICosIFdLV2VicGFnZVByZWZl cmVuY2VzICpwcmVmZXJlbmNlcywgdm9pZCAoXmRlY2lzaW9uSGFuZGxlcikoV0tOYXZpZ2F0aW9u QWN0aW9uUG9saWN5LCBXS1dlYnBhZ2VQcmVmZXJlbmNlcyAqKSkgewotICAgICAgICBwcmVmZXJl bmNlcy5fYWN0aXZlQ29udGVudFJ1bGVMaXN0QWN0aW9uUGF0dGVybnMgPSBbTlNTZXQgc2V0V2l0 aE9iamVjdDpAIio6Ly90ZXN0aG9zdC8qIl07CisgICAgICAgIHByZWZlcmVuY2VzLl9hY3RpdmVD b250ZW50UnVsZUxpc3RBY3Rpb25QYXR0ZXJucyA9IFtOU0RpY3Rpb25hcnkgZGljdGlvbmFyeVdp dGhPYmplY3Q6W05TU2V0IHNldFdpdGhPYmplY3Q6QCIqOi8vdGVzdGhvc3QvKiJdIGZvcktleTpA InRlc3RpZGVudGlmaWVyIl07CiAgICAgICAgIGRlY2lzaW9uSGFuZGxlcihXS05hdmlnYXRpb25B Y3Rpb25Qb2xpY3lBbGxvdywgcHJlZmVyZW5jZXMpOwogICAgIH07CiAgICAgcmV0dXJuIGRlbGVn YXRlOwpAQCAtNzIyLDEzICs3MjIsMTMgQEAgVEVTVF9GKFdLQ29udGVudFJ1bGVMaXN0U3RvcmVU ZXN0LCBOdWxsUGF0dGVyblNldCkKICAgICAgICAgRVhQRUNUX0VRKHByZWZlcmVuY2VzLl9hY3Rp dmVDb250ZW50UnVsZUxpc3RBY3Rpb25QYXR0ZXJucy5jb3VudCwgMHUpOwogICAgICAgICBzd2l0 Y2ggKGRlbGVnYXRlQWN0aW9uKSB7CiAgICAgICAgIGNhc2UgRGVsZWdhdGVBY3Rpb246OkFsbG93 QWxsOgotICAgICAgICAgICAgcHJlZmVyZW5jZXMuX2FjdGl2ZUNvbnRlbnRSdWxlTGlzdEFjdGlv blBhdHRlcm5zID0gbmlsOworICAgICAgICAgICAgcHJlZmVyZW5jZXMuX2FjdGl2ZUNvbnRlbnRS dWxlTGlzdEFjdGlvblBhdHRlcm5zID0gW05TRGljdGlvbmFyeSBkaWN0aW9uYXJ5V2l0aE9iamVj dDpbTlNTZXQgc2V0V2l0aE9iamVjdDpAIio6Ly8qLyoiXSBmb3JLZXk6QCJ0ZXN0aWRlbnRpZmll ciJdOwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIGNhc2UgRGVsZWdhdGVBY3Rpb246OkFs bG93Tm9uZToKLSAgICAgICAgICAgIHByZWZlcmVuY2VzLl9hY3RpdmVDb250ZW50UnVsZUxpc3RB Y3Rpb25QYXR0ZXJucyA9IFtOU1NldCBzZXRdOworICAgICAgICAgICAgcHJlZmVyZW5jZXMuX2Fj dGl2ZUNvbnRlbnRSdWxlTGlzdEFjdGlvblBhdHRlcm5zID0gW05TRGljdGlvbmFyeSBkaWN0aW9u YXJ5XTsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICBjYXNlIERlbGVnYXRlQWN0aW9uOjpB bGxvd1Rlc3RIb3N0OgotICAgICAgICAgICAgcHJlZmVyZW5jZXMuX2FjdGl2ZUNvbnRlbnRSdWxl TGlzdEFjdGlvblBhdHRlcm5zID0gW05TU2V0IHNldFdpdGhPYmplY3Q6QCIqOi8vdGVzdGhvc3Qv KiJdOworICAgICAgICAgICAgcHJlZmVyZW5jZXMuX2FjdGl2ZUNvbnRlbnRSdWxlTGlzdEFjdGlv blBhdHRlcm5zID0gW05TRGljdGlvbmFyeSBkaWN0aW9uYXJ5V2l0aE9iamVjdDpbTlNTZXQgc2V0 V2l0aE9iamVjdDpAIio6Ly90ZXN0aG9zdC8qIl0gZm9yS2V5OkAidGVzdGlkZW50aWZpZXIiXTsK ICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9CiAgICAgICAgIGRlY2lzaW9uSGFuZGxlcihX S05hdmlnYXRpb25BY3Rpb25Qb2xpY3lBbGxvdywgcHJlZmVyZW5jZXMpOwpAQCAtNzczLDcgKzc3 Myw3IEBAIFRFU1RfRihXS0NvbnRlbnRSdWxlTGlzdFN0b3JlVGVzdCwgRXh0ZW5zaW9uUGF0aCkK IAogICAgIGF1dG8gZGVsZWdhdGUgPSBhZG9wdE5TKFtUZXN0TmF2aWdhdGlvbkRlbGVnYXRlIG5l d10pOwogICAgIGRlbGVnYXRlLmdldCgpLmRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb25X aXRoUHJlZmVyZW5jZXMgPSBeKFdLTmF2aWdhdGlvbkFjdGlvbiAqLCBXS1dlYnBhZ2VQcmVmZXJl bmNlcyAqcHJlZmVyZW5jZXMsIHZvaWQgKF5kZWNpc2lvbkhhbmRsZXIpKFdLTmF2aWdhdGlvbkFj dGlvblBvbGljeSwgV0tXZWJwYWdlUHJlZmVyZW5jZXMgKikpIHsKLSAgICAgICAgcHJlZmVyZW5j ZXMuX2FjdGl2ZUNvbnRlbnRSdWxlTGlzdEFjdGlvblBhdHRlcm5zID0gbmlsOworICAgICAgICBw cmVmZXJlbmNlcy5fYWN0aXZlQ29udGVudFJ1bGVMaXN0QWN0aW9uUGF0dGVybnMgPSBbTlNEaWN0 aW9uYXJ5IGRpY3Rpb25hcnlXaXRoT2JqZWN0OltOU1NldCBzZXRXaXRoT2JqZWN0OkAiKjovL3Rl c3Rob3N0LyoiXSBmb3JLZXk6QCJ0ZXN0aWRlbnRpZmllciJdOwogICAgICAgICBkZWNpc2lvbkhh bmRsZXIoV0tOYXZpZ2F0aW9uQWN0aW9uUG9saWN5QWxsb3csIHByZWZlcmVuY2VzKTsKICAgICB9 OwogCg==