236988 2022-02-21 12:01:39 -0800 AX: AccessibilityObject::ariaTreeRows can crash in a deep hierarchy due to recursive descent 2022-02-25 09:30:23 -0800 1 1 1 Unclassified WebKit Accessibility WebKit Nightly Build Unspecified Unspecified NEW InRadar P2 Normal --- 1 tyler_w tyler_w aakash_jain aboxhall andresg_22 apinheiro cfleizach dmazzoni ews-watchlist jcraig jdiggs samuel_white webkit-bug-importer oldest_to_newest 1844308 0 tyler_w 2022-02-21 12:01:39 -0800 AccessibilityObject::ariaTreeRows calls itself recursively on its child objects all the way down to the leaves. Although WebKit tree depth is limited to 512 levels (https://github.com/WebKit/WebKit/blob/2077b50205f4d8f943b88e233302b52c8b4699af/Source/WebCore/page/SettingsBase.h#L72#L73), this can still sometimes cause a stack overflow. ITM is especially vulnerable to this, as currently we call ariaTreeRows on every single isolated object we create. 1844309 1 webkit-bug-importer 2022-02-21 12:01:55 -0800 <rdar://problem/89249539> 1844315 2 452753 tyler_w 2022-02-21 12:13:16 -0800 Created attachment 452753 Patch 1844322 3 452756 tyler_w 2022-02-21 12:27:31 -0800 Created attachment 452756 Patch 1844330 4 andresg_22 2022-02-21 12:44:02 -0800 (In reply to Tyler Wilcock from comment #3) > Created attachment 452756 [details] > Patch --- a/Source/WebCore/accessibility/AccessibilityObject.cpp +++ a/Source/WebCore/accessibility/AccessibilityObject.cpp + // This method descends recursively, so avoid stack overflow by bailing early if we're >450 levels away from where we started. + if (ancestors.size() > 450) Can we add the comment here about the arbitrary choice of 450 and a FIXME for making this non-recursive? Does the test fail/crash without this change? 1846002 5 aakash_jain 2022-02-25 06:39:53 -0800 I cancelled https://ews-build.webkit.org/#/builders/68/builds/9128 to speed up ios-wk2 queue. It finished running layout-tests and indicated accessibility/deep-aria-tree-rows-crash.html failure 1846041 6 452756 cfleizach 2022-02-25 09:08:20 -0800 Comment on attachment 452756 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=452756&action=review > Source/WebCore/accessibility/AccessibilityObject.cpp:1905 > The code for going through aria owns and descendants looks identical. Can we merge those blocks? 450 seems arbitrarily large. Can we cap this to 10 and still be sufficient? 1846052 7 andresg_22 2022-02-25 09:30:23 -0800 (In reply to chris fleizach from comment #6) > Comment on attachment 452756 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=452756&action=review > > > Source/WebCore/accessibility/AccessibilityObject.cpp:1905 > > > > The code for going through aria owns and descendants looks identical. Can we > merge those blocks? > 450 seems arbitrarily large. Can we cap this to 10 and still be sufficient? I think we agreed that this change is not needed, so this can be closed. 452753 2022-02-21 12:13:16 -0800 2022-02-21 12:27:28 -0800 Patch bug-236988-20220221141315.patch text/plain 10845 tyler_w U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwMTMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzE2MGQwOTNkYzMxNzc0 ZjUzMzEzYzE2NDVkNWJiOThhODdjNGE0MC4uZDFlMDFjZjZiODkxYTM1ZTAwMTA2YWFlOWM2N2Y0 ZGExMjgxYmY0MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDIyLTAyLTIxICBUeWxl ciBXaWxjb2NrICA8dHlsZXJfd0BhcHBsZS5jb20+CisKKyAgICAgICAgQVg6IEFjY2Vzc2liaWxp dHlPYmplY3Q6OmFyaWFUcmVlUm93cyBjYW4gY3Jhc2ggaW4gYSBkZWVwIGhpZXJhcmNoeSBkdWUg dG8gcmVjdXJzaXZlIGRlc2NlbnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIzNjk4OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIEFjY2Vzc2liaWxpdHlPYmplY3Q6OmFyaWFUcmVlUm93cyBjYWxscyBpdHNl bGYgcmVjdXJzaXZlbHkgb24gaXRzIGNoaWxkIG9iamVjdHMgYWxsIHRoZSB3YXkgZG93biB0byB0 aGUgbGVhdmVzLgorICAgICAgICBBbHRob3VnaCBXZWJLaXQgdHJlZSBkZXB0aCBpcyBsaW1pdGVk IHRvIDUxMiBsZXZlbHMgKGh0dHBzOi8vZ2l0aHViLmNvbS9XZWJLaXQvV2ViS2l0L2Jsb2IvMjA3 N2I1MDIwNWY0ZDhmOTQzYjg4ZTIzMzMwMmI1MmM4YjQ2OTlhZi9Tb3VyY2UvV2ViQ29yZS9wYWdl L1NldHRpbmdzQmFzZS5oI0w3MiNMNzMpLAorICAgICAgICB0aGlzIGNhbiBzdGlsbCBzb21ldGlt ZXMgY2F1c2UgYSBzdGFjayBvdmVyZmxvdy4KKworICAgICAgICBJVE0gaXMgZXNwZWNpYWxseSBz dXNjZXB0aWJsZSB0byB0aGlzLCBhcyBjdXJyZW50bHkgd2UgY2FsbCBhcmlhVHJlZVJvd3Mgb24g ZXZlcnkgc2luZ2xlIGlzb2xhdGVkIG9iamVjdCB3ZSBjcmVhdGUuCisKKyAgICAgICAgVGhpcyBw YXRjaCBmaXhlcyB0aGlzIGluIHR3byB3YXlzOgorICAgICAgICAgIC0gT25seSBjb21wdXRpbmcg QVhQcm9wZXJ0eU5hbWU6OkFSSUFUcmVlUm93cyBmb3IgaXNUcmVlKCkgb2JqZWN0cywgcmVkdWNp bmcgdGhlIGNoYW5jZSB3ZSBjYWxsIGFyaWFUcmVlUm93cyBvbiBhIGRlZXAgdHJlZS4KKyAgICAg ICAgICAtIEFyYml0cmFyaWx5IGxpbWl0aW5nIGFyaWFUcmVlUm93cyB0byA0NTAgbGV2ZWxzIG9m IGRlc2NlbnQuCisKKyAgICAgICAgV2hlbiB3ZSByZS13cml0ZSBhcmlhVHJlZVJvd3MgdG8gaW1w bGVtZW50IHByb3BlciBhcmlhLW93bnMgc3VwcG9ydCBmb3IgYWxsIGVsZW1lbnRzLCBpdCBzaG91 bGQgbm90IGJlIHJlY3Vyc2l2ZQorICAgICAgICBzbyB0aGF0IHdlIGNhbiBwcmV2ZW50IHRoaXMg cHJvYmxlbSB3aXRob3V0IGFyYml0cmFyeSBkZXNjZW50IGxpbWl0cy4KKworICAgICAgICBUaGlz IHBhdGNoIGFsc28gaW5jbHVkZXMgYSBkcml2ZS1ieSBmaXhpbmcgb2Ygc2V0dGluZyBBWFByb3Bl cnR5TmFtZTo6SXNUcmVlSXRlbS4gUHJpb3IgdG8gdGhpcyBwYXRjaCwKKyAgICAgICAgd2UgbmV2 ZXIgc2V0IHRoaXMgcHJvcGVydHkuIEFsc28sIHdlIG5vdyBvbmx5IHN0b3JlIEFYUHJvcGVydHlO YW1lOjpBUklBVHJlZUl0ZW1Db250ZW50IGZvciBpc1RyZWVJdGVtKCkgb2JqZWN0cy4KKworICAg ICAgICBUZXN0OiBhY2Nlc3NpYmlsaXR5L2RlZXAtYXJpYS10cmVlLXJvd3MtY3Jhc2guaHRtbAor CisgICAgICAgICogYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0LmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlPYmplY3Q6OmFyaWFUcmVlUm93cyk6CisgICAgICAg ICogYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZE9iamVjdC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpBWElzb2xhdGVkT2JqZWN0Ojppbml0aWFsaXplQXR0cmlidXRlRGF0YSk6 CisKIDIwMjItMDItMTggIFBlbmcgTGl1ICA8cGVuZy5saXU2QGFwcGxlLmNvbT4KIAogICAgICAg ICBbaU9TXVtNb2Rlcm4gTWVkaWEgQ29udHJvbHNdIEFkZCBhbiBhbHRlcm5hdGl2ZSBvdmVyZmxv dyBpY29uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2li aWxpdHlPYmplY3QuY3BwIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmls aXR5T2JqZWN0LmNwcAppbmRleCA4Mjc3MGE3ZjJkNjZmNzgxYjhjNzM2M2NlOTcwYWFiNTQ4ZTg5 YTNiLi4zOTBhNDEzOTQ4Yzg0MDQ1OTk3NjU1Yjg5NzNiNmI1NDg5MWQ5NjVhIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdC5jcHAK QEAgLTE4OTgsNiArMTg5OCwxMCBAQCB2b2lkIEFjY2Vzc2liaWxpdHlPYmplY3Q6OmFyaWFUcmVl Um93cyhBY2Nlc3NpYmlsaXR5Q2hpbGRyZW5WZWN0b3ImIHJvd3MsIEFjY2VzcwogewogICAgIEFj Y2Vzc2liaWxpdHlDaGlsZHJlblZlY3RvciBhcmlhT3duczsKICAgICBhcmlhT3duc0VsZW1lbnRz KGFyaWFPd25zKTsKKworICAgIC8vIFRoaXMgbWV0aG9kIGRlc2NlbmRzIHJlY3Vyc2l2ZWx5LCBz byBhdm9pZCBzdGFjayBvdmVyZmxvdyBieSBiYWlsaW5nIGVhcmx5IGlmIHdlJ3JlID40NTAgbGV2 ZWxzIGF3YXkgZnJvbSB3aGVyZSB3ZSBzdGFydGVkLgorICAgIGlmIChhbmNlc3RvcnMuc2l6ZSgp ID4gNDUwKQorICAgICAgICByZXR1cm47CiAgICAgCiAgICAgYW5jZXN0b3JzLmFwcGVuZCh0aGlz KTsKIApAQCAtMTk1MSw3ICsxOTU1LDcgQEAgdm9pZCBBY2Nlc3NpYmlsaXR5T2JqZWN0Ojphcmlh VHJlZVJvd3MoQWNjZXNzaWJpbGl0eUNoaWxkcmVuVmVjdG9yJiByb3dzLCBBY2Nlc3MKICAgICBh bmNlc3RvcnMucmVtb3ZlTGFzdCgpOwogfQogCi12b2lkIEFjY2Vzc2liaWxpdHlPYmplY3Q6OmFy aWFUcmVlUm93cyhBY2Nlc3NpYmlsaXR5Q2hpbGRyZW5WZWN0b3ImIHJvd3MgICAgKQordm9pZCBB Y2Nlc3NpYmlsaXR5T2JqZWN0OjphcmlhVHJlZVJvd3MoQWNjZXNzaWJpbGl0eUNoaWxkcmVuVmVj dG9yJiByb3dzKQogewogICAgIEFjY2Vzc2liaWxpdHlDaGlsZHJlblZlY3RvciBhbmNlc3RvcnM7 CiAgICAgYXJpYVRyZWVSb3dzKHJvd3MsIGFuY2VzdG9ycyk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkT2JqZWN0LmNwcCBi L1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmpl Y3QuY3BwCmluZGV4IGJkZjgyNWQyZDFjMGM0YWQ5NmYwODVmY2M2YWUwZjMxMDIzOTAwZDEuLjY5 M2U5ZmU5ZmVjMjEyMjE0MDFiY2YxNzc1ODg3MGZjNGE4YWQyY2EgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3QuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0 ZWRPYmplY3QuY3BwCkBAIC0xMzEsNyArMTMxLDYgQEAgdm9pZCBBWElzb2xhdGVkT2JqZWN0Ojpp bml0aWFsaXplQXR0cmlidXRlRGF0YShBWENvcmVPYmplY3QmIGNvcmVPYmplY3QsIGJvb2wgaXMK ICAgICBzZXRQcm9wZXJ0eShBWFByb3BlcnR5TmFtZTo6SXNTbGlkZXIsIG9iamVjdC5pc1NsaWRl cigpKTsKICAgICBzZXRQcm9wZXJ0eShBWFByb3BlcnR5TmFtZTo6SXNTdHlsZUZvcm1hdEdyb3Vw LCBvYmplY3QuaXNTdHlsZUZvcm1hdEdyb3VwKCkpOwogICAgIHNldFByb3BlcnR5KEFYUHJvcGVy dHlOYW1lOjpJc1RleHRDb250cm9sLCBvYmplY3QuaXNUZXh0Q29udHJvbCgpKTsKLSAgICBzZXRQ cm9wZXJ0eShBWFByb3BlcnR5TmFtZTo6SXNUcmVlLCBvYmplY3QuaXNUcmVlKCkpOwogICAgIHNl dFByb3BlcnR5KEFYUHJvcGVydHlOYW1lOjpJc1Vub3JkZXJlZExpc3QsIG9iamVjdC5pc1Vub3Jk ZXJlZExpc3QoKSk7CiAgICAgc2V0UHJvcGVydHkoQVhQcm9wZXJ0eU5hbWU6OklzVW52aXNpdGVk LCBvYmplY3QuaXNVbnZpc2l0ZWQoKSk7CiAgICAgc2V0UHJvcGVydHkoQVhQcm9wZXJ0eU5hbWU6 OklzVmFsdWVBdXRvZmlsbEF2YWlsYWJsZSwgb2JqZWN0LmlzVmFsdWVBdXRvZmlsbEF2YWlsYWJs ZSgpKTsKQEAgLTI4Miw4ICsyODEsMjMgQEAgdm9pZCBBWElzb2xhdGVkT2JqZWN0Ojppbml0aWFs aXplQXR0cmlidXRlRGF0YShBWENvcmVPYmplY3QmIGNvcmVPYmplY3QsIGJvb2wgaXMKICAgICAg ICAgc2V0T2JqZWN0UHJvcGVydHkoQVhQcm9wZXJ0eU5hbWU6OkRpc2Nsb3NlZEJ5Um93LCBvYmpl Y3QuZGlzY2xvc2VkQnlSb3coKSk7CiAgICAgfQogCi0gICAgaWYgKG9iamVjdC5pc1RyZWVJdGVt KCkpCisgICAgaWYgKG9iamVjdC5pc1RyZWVJdGVtKCkpIHsKKyAgICAgICAgc2V0UHJvcGVydHko QVhQcm9wZXJ0eU5hbWU6OklzVHJlZUl0ZW0sIHRydWUpOworCisgICAgICAgIEFjY2Vzc2liaWxp dHlDaGlsZHJlblZlY3RvciBhcmlhVHJlZUl0ZW1Db250ZW50OworICAgICAgICBvYmplY3QuYXJp YVRyZWVJdGVtQ29udGVudChhcmlhVHJlZUl0ZW1Db250ZW50KTsKKyAgICAgICAgc2V0T2JqZWN0 VmVjdG9yUHJvcGVydHkoQVhQcm9wZXJ0eU5hbWU6OkFSSUFUcmVlSXRlbUNvbnRlbnQsIGFyaWFU cmVlSXRlbUNvbnRlbnQpOworCiAgICAgICAgIHNldE9iamVjdFZlY3RvclByb3BlcnR5KEFYUHJv cGVydHlOYW1lOjpEaXNjbG9zZWRSb3dzLCBvYmplY3QuZGlzY2xvc2VkUm93cygpKTsKKyAgICB9 CisKKyAgICBpZiAob2JqZWN0LmlzVHJlZSgpKSB7CisgICAgICAgIHNldFByb3BlcnR5KEFYUHJv cGVydHlOYW1lOjpJc1RyZWUsIHRydWUpOworCisgICAgICAgIEFjY2Vzc2liaWxpdHlDaGlsZHJl blZlY3RvciBhcmlhVHJlZVJvd3M7CisgICAgICAgIG9iamVjdC5hcmlhVHJlZVJvd3MoYXJpYVRy ZWVSb3dzKTsKKyAgICAgICAgc2V0T2JqZWN0VmVjdG9yUHJvcGVydHkoQVhQcm9wZXJ0eU5hbWU6 OkFSSUFUcmVlUm93cywgYXJpYVRyZWVSb3dzKTsKKyAgICB9CiAKICAgICBpZiAob2JqZWN0Lmlz VGV4dENvbnRyb2woKSkKICAgICAgICAgc2V0UHJvcGVydHkoQVhQcm9wZXJ0eU5hbWU6OlRleHRM ZW5ndGgsIG9iamVjdC50ZXh0TGVuZ3RoKCkpOwpAQCAtMzEyLDE0ICszMjYsNiBAQCB2b2lkIEFY SXNvbGF0ZWRPYmplY3Q6OmluaXRpYWxpemVBdHRyaWJ1dGVEYXRhKEFYQ29yZU9iamVjdCYgY29y ZU9iamVjdCwgYm9vbCBpcwogICAgIG9iamVjdC50YWJDaGlsZHJlbih0YWJDaGlsZHJlbik7CiAg ICAgc2V0T2JqZWN0VmVjdG9yUHJvcGVydHkoQVhQcm9wZXJ0eU5hbWU6OlRhYkNoaWxkcmVuLCB0 YWJDaGlsZHJlbik7CiAKLSAgICBBY2Nlc3NpYmlsaXR5Q2hpbGRyZW5WZWN0b3IgYXJpYVRyZWVS b3dzOwotICAgIG9iamVjdC5hcmlhVHJlZVJvd3MoYXJpYVRyZWVSb3dzKTsKLSAgICBzZXRPYmpl Y3RWZWN0b3JQcm9wZXJ0eShBWFByb3BlcnR5TmFtZTo6QVJJQVRyZWVSb3dzLCBhcmlhVHJlZVJv d3MpOwotCi0gICAgQWNjZXNzaWJpbGl0eUNoaWxkcmVuVmVjdG9yIGFyaWFUcmVlSXRlbUNvbnRl bnQ7Ci0gICAgb2JqZWN0LmFyaWFUcmVlSXRlbUNvbnRlbnQoYXJpYVRyZWVJdGVtQ29udGVudCk7 Ci0gICAgc2V0T2JqZWN0VmVjdG9yUHJvcGVydHkoQVhQcm9wZXJ0eU5hbWU6OkFSSUFUcmVlSXRl bUNvbnRlbnQsIGFyaWFUcmVlSXRlbUNvbnRlbnQpOwotCiAgICAgQWNjZXNzaWJpbGl0eUNoaWxk cmVuVmVjdG9yIGxpbmtlZFVJRWxlbWVudHM7CiAgICAgb2JqZWN0LmxpbmtlZFVJRWxlbWVudHMo bGlua2VkVUlFbGVtZW50cyk7CiAgICAgc2V0T2JqZWN0VmVjdG9yUHJvcGVydHkoQVhQcm9wZXJ0 eU5hbWU6OkxpbmtlZFVJRWxlbWVudHMsIGxpbmtlZFVJRWxlbWVudHMpOwpkaWZmIC0tZ2l0IGEv TGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDY1NzA3 ZGExNmI2ZWZjOTU5YWQyODVmNzNmYjM1YjQwZjBkMDNjZDcuLmQ1ZWQ1Y2RkZGJjZTVkZTg2NzM1 OGQwNzkxNTkzYmRiMzk1NGQ0YmQgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZwor KysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAyMi0wMi0yMSAg VHlsZXIgV2lsY29jayAgPHR5bGVyX3dAYXBwbGUuY29tPgorCisgICAgICAgIEFYOiBBY2Nlc3Np YmlsaXR5T2JqZWN0OjphcmlhVHJlZVJvd3MgY2FuIGNyYXNoIGluIGEgZGVlcCBoaWVyYXJjaHkg ZHVlIHRvIHJlY3Vyc2l2ZSBkZXNjZW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yMzY5ODgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICAqIGFjY2Vzc2liaWxpdHkvZGVlcC1hcmlhLXRyZWUtcm93cy1jcmFz aC1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvZGVlcC1hcmlh LXRyZWUtcm93cy1jcmFzaC5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9pb3MvVGVz dEV4cGVjdGF0aW9uczogRW5hYmxlIG5ldyB0ZXN0LgorCiAyMDIyLTAyLTE4ICBBbnRvaW5lIFF1 aW50ICA8Z3Jhb3V0c0B3ZWJraXQub3JnPgogCiAgICAgICAgIFtmcmFtZS1yYXRlXSBbY3VzdG9t LWVmZmVjdF0gYWxsb3cgc2V0dGluZyBmcmFtZVJhdGUgYXMgYW4gb3B0aW9uIHBhc3NlZCB0byBk b2N1bWVudC50aW1lbGluZS5hbmltYXRlKCkKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2FjY2Vz c2liaWxpdHkvZGVlcC1hcmlhLXRyZWUtcm93cy1jcmFzaC1leHBlY3RlZC50eHQgYi9MYXlvdXRU ZXN0cy9hY2Nlc3NpYmlsaXR5L2RlZXAtYXJpYS10cmVlLXJvd3MtY3Jhc2gtZXhwZWN0ZWQudHh0 Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAuLmQzYWY5ZTllMjg5NzE2ODk3ZjBhMDIxODY0MDdhMmIxNmUyODk4YWUKLS0t IC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L2RlZXAtYXJpYS10cmVl LXJvd3MtY3Jhc2gtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsOSBAQAorVGhpcyB0ZXN0IGVuc3Vy ZXMgdGhhdCBnZXR0aW5nIHRoZSByb3dzIG9mIHRyZWUgd2l0aCBhIGRlZXAgY2hpbGRyZW4gaGll cmFyY2h5IGRvZXNuJ3QgY3Jhc2guCitQQVNTOiBEaWRuJ3QgY3Jhc2guCitQQVNTIHN1Y2Nlc3Nm dWxseVBhcnNlZCBpcyB0cnVlCisKK1RFU1QgQ09NUExFVEUKK0NhdHMKK0xpb24KK0phZ3Vhcgor UHVtYQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9kZWVwLWFyaWEtdHJl ZS1yb3dzLWNyYXNoLmh0bWwgYi9MYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L2RlZXAtYXJpYS10 cmVlLXJvd3MtY3Jhc2guaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5hMWRiYTk5MDYxNmFjZDc1NzM1MGVkZDNk MTVlYzE1NDYxZjY1OTI0Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvYWNjZXNzaWJp bGl0eS9kZWVwLWFyaWEtdHJlZS1yb3dzLWNyYXNoLmh0bWwKQEAgLTAsMCArMSw2OSBAQAorPCFE T0NUWVBFIEhUTUwgUFVCTElDICItLy9JRVRGLy9EVEQgSFRNTC8vRU4iPgorPGh0bWw+Cis8aGVh ZD4KKzxzY3JpcHQgc3JjPSIuLi9yZXNvdXJjZXMvanMtdGVzdC5qcyI+PC9zY3JpcHQ+Cis8c2Ny aXB0IHNyYz0iLi4vcmVzb3VyY2VzL2FjY2Vzc2liaWxpdHktaGVscGVyLmpzIj48L3NjcmlwdD4K KzwvaGVhZD4KKzxib2R5PgorCis8ZGl2IGlkPSJ0cmVlIiByb2xlPSJ0cmVlIj4KKyAgICA8ZGl2 IHJvbGU9InRyZWVpdGVtIiBhcmlhLWxldmVsPSIxIiBhcmlhLWV4cGFuZGVkPSJ0cnVlIiBhcmlh LXNldHNpemU9IjEiIGFyaWEtcG9zaW5zZXQ9IjEiIGFyaWEtY3VycmVudD0icGFnZSI+Q2F0cwor ICAgICAgICA8ZGl2IHJvbGU9InRyZWVpdGVtIiBhcmlhLWxldmVsPSIyIiBhcmlhLXNldHNpemU9 IjMiIGFyaWEtcG9zaW5zZXQ9IjEiIGFyaWEtY3VycmVudD0icGFnZSI+TGlvbjwvZGl2PgorICAg ICAgICA8ZGl2IHJvbGU9InRyZWVpdGVtIiBhcmlhLWxldmVsPSIyIiBhcmlhLXNldHNpemU9IjMi IGFyaWEtcG9zaW5zZXQ9IjIiIGFyaWEtY3VycmVudD0icGFnZSI+SmFndWFyPC9kaXY+CisgICAg ICAgIDxkaXYgaWQ9InRoaXJkLXRyZWUtaXRlbSIgcm9sZT0idHJlZWl0ZW0iIGFyaWEtbGV2ZWw9 IjIiPgorICAgICAgICA8L2Rpdj4KKyAgICA8L2Rpdj4KKzwvZGl2PgorCis8c2NyaXB0PgorICAg IGxldCB0ZXN0T3V0cHV0ID0gIlRoaXMgdGVzdCBlbnN1cmVzIHRoYXQgZ2V0dGluZyB0aGUgcm93 cyBvZiB0cmVlIHdpdGggYSBkZWVwIGNoaWxkcmVuIGhpZXJhcmNoeSBkb2Vzbid0IGNyYXNoLiI7 CisKKyAgICBmdW5jdGlvbiBjcmVhdGUocm9sZSkgeworICAgICAgICBsZXQgZGl2ID0gZG9jdW1l bnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7CisgICAgICAgIGRpdi5zZXRBdHRyaWJ1dGUoInJvbGUi LCByb2xlKTsKKyAgICAgICAgcmV0dXJuIGRpdjsKKyAgICB9CisKKyAgICBpZiAod2luZG93LmFj Y2Vzc2liaWxpdHlDb250cm9sbGVyKSB7CisgICAgICAgIHdpbmRvdy5qc1Rlc3RJc0FzeW5jID0g dHJ1ZTsKKworICAgICAgICAvLyBCYXRjaCBhcHBlbmRzIGluIGEgZnJhZ21lbnQuCisgICAgICAg IGxldCBkb2N1bWVudEZyYWdtZW50ID0gZG9jdW1lbnQuY3JlYXRlRG9jdW1lbnRGcmFnbWVudCgp OworICAgICAgICBsZXQgbGFzdEdyb3VwRGl2ID0gY3JlYXRlKCJncm91cCIpOworICAgICAgICBk b2N1bWVudEZyYWdtZW50LmFwcGVuZChsYXN0R3JvdXBEaXYpOworCisgICAgICAgIC8vIFRoZSBt YXggZGVwdGggQWNjZXNzaWJpbGl0eU9iamVjdDo6YXJpYVRyZWVSb3dzIHdpbGwgZGVzY2VuZCB0 byBmaW5kIHRyZWVpdGVtcyBpcworICAgICAgICAvLyBjdXJyZW50bHkgNDUwIGxldmVscywgc28g aW5zZXJ0IG91ciAiUHVtYSIgdHJlZWl0ZW0gd2l0aGluIHRoYXQgcmFuZ2UuCisgICAgICAgIGZv ciAobGV0IGkgPSAwOyBpIDwgNDQ3OyBpKyspIHsKKyAgICAgICAgICAgIGxldCBjdXJyZW50RWxl bWVudCA9IGNyZWF0ZSgiZ3JvdXAiKTsKKyAgICAgICAgICAgIGxhc3RHcm91cERpdi5hcHBlbmRD aGlsZChjdXJyZW50RWxlbWVudCk7CisgICAgICAgICAgICBsYXN0R3JvdXBEaXYgPSBjdXJyZW50 RWxlbWVudDsKKyAgICAgICAgfQorICAgICAgICBsZXQgdHJlZUl0ZW0gPSBjcmVhdGUoInRyZWVp dGVtIik7CisgICAgICAgIHRyZWVJdGVtLnRleHRDb250ZW50ICs9ICJQdW1hIjsKKyAgICAgICAg bGFzdEdyb3VwRGl2LmFwcGVuZCh0cmVlSXRlbSk7CisKKyAgICAgICAgZG9jdW1lbnQuZ2V0RWxl bWVudEJ5SWQoInRoaXJkLXRyZWUtaXRlbSIpLmFwcGVuZChkb2N1bWVudEZyYWdtZW50KTsKKwor ICAgICAgICBzZXRUaW1lb3V0KGFzeW5jIGZ1bmN0aW9uKCkgeworICAgICAgICAgICAgbGV0IHRy ZWUgPSBhY2Nlc3NpYmlsaXR5Q29udHJvbGxlci5hY2Nlc3NpYmxlRWxlbWVudEJ5SWQoInRyZWUi KTsKKyAgICAgICAgICAgIGF3YWl0IHdhaXRGb3IoKCkgPT4geworICAgICAgICAgICAgICAgIGxl dCByb3dzID0gdHJlZS51aUVsZW1lbnRBcnJheUF0dHJpYnV0ZVZhbHVlKCJBWFJvd3MiKTsKKyAg ICAgICAgICAgICAgICBmb3IgKGxldCByb3cgb2Ygcm93cykgeworICAgICAgICAgICAgICAgICAg ICBpZiAocm93LmRlc2NyaXB0aW9uLmluY2x1ZGVzKCJQdW1hIikpCisgICAgICAgICAgICAgICAg ICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAg cmV0dXJuIGZhbHNlOworICAgICAgICAgICAgfSk7CisgICAgICAgICAgICAvLyBUaGlzIHNob3Vs ZCBhbHNvIG5vdCBjYXVzZSBhIGNyYXNoLgorICAgICAgICAgICAgdHJlZS5hbGxBdHRyaWJ1dGVz KCk7CisKKyAgICAgICAgICAgIHRlc3RPdXRwdXQgKz0gIlxuUEFTUzogRGlkbid0IGNyYXNoLiI7 CisgICAgICAgICAgICBkZWJ1Zyh0ZXN0T3V0cHV0KTsKKyAgICAgICAgICAgIGZpbmlzaEpTVGVz dCgpOworICAgICAgICB9LCAwKTsKKyAgICB9Cis8L3NjcmlwdD4KKzwvYm9keT4KKzwvaHRtbD4K KwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vaW9zL1Rlc3RFeHBlY3RhdGlvbnMg Yi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9pb3MvVGVzdEV4cGVjdGF0aW9ucwppbmRleCBkZjE1N2M5 NTA1MmQ5NDI1NTEzMmIxYTc4YjljMjhkZGYwNmEwODg5Li5iZjgzMzhlYTcwNjJiMjg4ZmZiZGNl ODA4YTU0MTdlZTBmOTUxMTFkIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9pb3Mv VGVzdEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9pb3MvVGVzdEV4cGVj dGF0aW9ucwpAQCAtMjEwMiw2ICsyMTAyLDggQEAgYWNjZXNzaWJpbGl0eS90YWJsZS1zZWFyY2gt dHJhdmVyc2FsLmh0bWwgWyBQYXNzIF0KIGFjY2Vzc2liaWxpdHkvc2VsZWN0ZWQtc3RhdGUtY2hh bmdlZC1ub3RpZmljYXRpb25zLmh0bWwgWyBQYXNzIF0KIGFjY2Vzc2liaWxpdHkvZWxlbWVudC1s aW5lLXJlY3RzLWFuZC10ZXh0Lmh0bWwgWyBQYXNzIF0KIAorYWNjZXNzaWJpbGl0eS9kZWVwLWFy aWEtdHJlZS1yb3dzLWNyYXNoLmh0bWwgWyBQYXNzIF0KKwogIyBFbmFibGUgImF0dGFjaG1lbnQg ZWxlbWVudCIgdGVzdCBmb3IgaU9TCiBhY2Nlc3NpYmlsaXR5L2F0dGFjaG1lbnQtZWxlbWVudC5o dG1sIFsgUGFzcyBdCiAK 452756 2022-02-21 12:27:31 -0800 2022-02-21 13:18:14 -0800 Patch bug-236988-20220221142730.patch text/plain 10966 tyler_w U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwMTMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzE2MGQwOTNkYzMxNzc0 ZjUzMzEzYzE2NDVkNWJiOThhODdjNGE0MC4uZDFlMDFjZjZiODkxYTM1ZTAwMTA2YWFlOWM2N2Y0 ZGExMjgxYmY0MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDIyLTAyLTIxICBUeWxl ciBXaWxjb2NrICA8dHlsZXJfd0BhcHBsZS5jb20+CisKKyAgICAgICAgQVg6IEFjY2Vzc2liaWxp dHlPYmplY3Q6OmFyaWFUcmVlUm93cyBjYW4gY3Jhc2ggaW4gYSBkZWVwIGhpZXJhcmNoeSBkdWUg dG8gcmVjdXJzaXZlIGRlc2NlbnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIzNjk4OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIEFjY2Vzc2liaWxpdHlPYmplY3Q6OmFyaWFUcmVlUm93cyBjYWxscyBpdHNl bGYgcmVjdXJzaXZlbHkgb24gaXRzIGNoaWxkIG9iamVjdHMgYWxsIHRoZSB3YXkgZG93biB0byB0 aGUgbGVhdmVzLgorICAgICAgICBBbHRob3VnaCBXZWJLaXQgdHJlZSBkZXB0aCBpcyBsaW1pdGVk IHRvIDUxMiBsZXZlbHMgKGh0dHBzOi8vZ2l0aHViLmNvbS9XZWJLaXQvV2ViS2l0L2Jsb2IvMjA3 N2I1MDIwNWY0ZDhmOTQzYjg4ZTIzMzMwMmI1MmM4YjQ2OTlhZi9Tb3VyY2UvV2ViQ29yZS9wYWdl L1NldHRpbmdzQmFzZS5oI0w3MiNMNzMpLAorICAgICAgICB0aGlzIGNhbiBzdGlsbCBzb21ldGlt ZXMgY2F1c2UgYSBzdGFjayBvdmVyZmxvdy4KKworICAgICAgICBJVE0gaXMgZXNwZWNpYWxseSBz dXNjZXB0aWJsZSB0byB0aGlzLCBhcyBjdXJyZW50bHkgd2UgY2FsbCBhcmlhVHJlZVJvd3Mgb24g ZXZlcnkgc2luZ2xlIGlzb2xhdGVkIG9iamVjdCB3ZSBjcmVhdGUuCisKKyAgICAgICAgVGhpcyBw YXRjaCBmaXhlcyB0aGlzIGluIHR3byB3YXlzOgorICAgICAgICAgIC0gT25seSBjb21wdXRpbmcg QVhQcm9wZXJ0eU5hbWU6OkFSSUFUcmVlUm93cyBmb3IgaXNUcmVlKCkgb2JqZWN0cywgcmVkdWNp bmcgdGhlIGNoYW5jZSB3ZSBjYWxsIGFyaWFUcmVlUm93cyBvbiBhIGRlZXAgdHJlZS4KKyAgICAg ICAgICAtIEFyYml0cmFyaWx5IGxpbWl0aW5nIGFyaWFUcmVlUm93cyB0byA0NTAgbGV2ZWxzIG9m IGRlc2NlbnQuCisKKyAgICAgICAgV2hlbiB3ZSByZS13cml0ZSBhcmlhVHJlZVJvd3MgdG8gaW1w bGVtZW50IHByb3BlciBhcmlhLW93bnMgc3VwcG9ydCBmb3IgYWxsIGVsZW1lbnRzLCBpdCBzaG91 bGQgbm90IGJlIHJlY3Vyc2l2ZQorICAgICAgICBzbyB0aGF0IHdlIGNhbiBwcmV2ZW50IHRoaXMg cHJvYmxlbSB3aXRob3V0IGFyYml0cmFyeSBkZXNjZW50IGxpbWl0cy4KKworICAgICAgICBUaGlz IHBhdGNoIGFsc28gaW5jbHVkZXMgYSBkcml2ZS1ieSBmaXhpbmcgb2Ygc2V0dGluZyBBWFByb3Bl cnR5TmFtZTo6SXNUcmVlSXRlbS4gUHJpb3IgdG8gdGhpcyBwYXRjaCwKKyAgICAgICAgd2UgbmV2 ZXIgc2V0IHRoaXMgcHJvcGVydHkuIEFsc28sIHdlIG5vdyBvbmx5IHN0b3JlIEFYUHJvcGVydHlO YW1lOjpBUklBVHJlZUl0ZW1Db250ZW50IGZvciBpc1RyZWVJdGVtKCkgb2JqZWN0cy4KKworICAg ICAgICBUZXN0OiBhY2Nlc3NpYmlsaXR5L2RlZXAtYXJpYS10cmVlLXJvd3MtY3Jhc2guaHRtbAor CisgICAgICAgICogYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0LmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlPYmplY3Q6OmFyaWFUcmVlUm93cyk6CisgICAgICAg ICogYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZE9iamVjdC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpBWElzb2xhdGVkT2JqZWN0Ojppbml0aWFsaXplQXR0cmlidXRlRGF0YSk6 CisKIDIwMjItMDItMTggIFBlbmcgTGl1ICA8cGVuZy5saXU2QGFwcGxlLmNvbT4KIAogICAgICAg ICBbaU9TXVtNb2Rlcm4gTWVkaWEgQ29udHJvbHNdIEFkZCBhbiBhbHRlcm5hdGl2ZSBvdmVyZmxv dyBpY29uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2li aWxpdHlPYmplY3QuY3BwIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmls aXR5T2JqZWN0LmNwcAppbmRleCA4Mjc3MGE3ZjJkNjZmNzgxYjhjNzM2M2NlOTcwYWFiNTQ4ZTg5 YTNiLi4zOTBhNDEzOTQ4Yzg0MDQ1OTk3NjU1Yjg5NzNiNmI1NDg5MWQ5NjVhIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdC5jcHAK QEAgLTE4OTgsNiArMTg5OCwxMCBAQCB2b2lkIEFjY2Vzc2liaWxpdHlPYmplY3Q6OmFyaWFUcmVl Um93cyhBY2Nlc3NpYmlsaXR5Q2hpbGRyZW5WZWN0b3ImIHJvd3MsIEFjY2VzcwogewogICAgIEFj Y2Vzc2liaWxpdHlDaGlsZHJlblZlY3RvciBhcmlhT3duczsKICAgICBhcmlhT3duc0VsZW1lbnRz KGFyaWFPd25zKTsKKworICAgIC8vIFRoaXMgbWV0aG9kIGRlc2NlbmRzIHJlY3Vyc2l2ZWx5LCBz byBhdm9pZCBzdGFjayBvdmVyZmxvdyBieSBiYWlsaW5nIGVhcmx5IGlmIHdlJ3JlID40NTAgbGV2 ZWxzIGF3YXkgZnJvbSB3aGVyZSB3ZSBzdGFydGVkLgorICAgIGlmIChhbmNlc3RvcnMuc2l6ZSgp ID4gNDUwKQorICAgICAgICByZXR1cm47CiAgICAgCiAgICAgYW5jZXN0b3JzLmFwcGVuZCh0aGlz KTsKIApAQCAtMTk1MSw3ICsxOTU1LDcgQEAgdm9pZCBBY2Nlc3NpYmlsaXR5T2JqZWN0Ojphcmlh VHJlZVJvd3MoQWNjZXNzaWJpbGl0eUNoaWxkcmVuVmVjdG9yJiByb3dzLCBBY2Nlc3MKICAgICBh bmNlc3RvcnMucmVtb3ZlTGFzdCgpOwogfQogCi12b2lkIEFjY2Vzc2liaWxpdHlPYmplY3Q6OmFy aWFUcmVlUm93cyhBY2Nlc3NpYmlsaXR5Q2hpbGRyZW5WZWN0b3ImIHJvd3MgICAgKQordm9pZCBB Y2Nlc3NpYmlsaXR5T2JqZWN0OjphcmlhVHJlZVJvd3MoQWNjZXNzaWJpbGl0eUNoaWxkcmVuVmVj dG9yJiByb3dzKQogewogICAgIEFjY2Vzc2liaWxpdHlDaGlsZHJlblZlY3RvciBhbmNlc3RvcnM7 CiAgICAgYXJpYVRyZWVSb3dzKHJvd3MsIGFuY2VzdG9ycyk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkT2JqZWN0LmNwcCBi L1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmpl Y3QuY3BwCmluZGV4IGJkZjgyNWQyZDFjMGM0YWQ5NmYwODVmY2M2YWUwZjMxMDIzOTAwZDEuLjY5 M2U5ZmU5ZmVjMjEyMjE0MDFiY2YxNzc1ODg3MGZjNGE4YWQyY2EgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3QuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0 ZWRPYmplY3QuY3BwCkBAIC0xMzEsNyArMTMxLDYgQEAgdm9pZCBBWElzb2xhdGVkT2JqZWN0Ojpp bml0aWFsaXplQXR0cmlidXRlRGF0YShBWENvcmVPYmplY3QmIGNvcmVPYmplY3QsIGJvb2wgaXMK ICAgICBzZXRQcm9wZXJ0eShBWFByb3BlcnR5TmFtZTo6SXNTbGlkZXIsIG9iamVjdC5pc1NsaWRl cigpKTsKICAgICBzZXRQcm9wZXJ0eShBWFByb3BlcnR5TmFtZTo6SXNTdHlsZUZvcm1hdEdyb3Vw LCBvYmplY3QuaXNTdHlsZUZvcm1hdEdyb3VwKCkpOwogICAgIHNldFByb3BlcnR5KEFYUHJvcGVy dHlOYW1lOjpJc1RleHRDb250cm9sLCBvYmplY3QuaXNUZXh0Q29udHJvbCgpKTsKLSAgICBzZXRQ cm9wZXJ0eShBWFByb3BlcnR5TmFtZTo6SXNUcmVlLCBvYmplY3QuaXNUcmVlKCkpOwogICAgIHNl dFByb3BlcnR5KEFYUHJvcGVydHlOYW1lOjpJc1Vub3JkZXJlZExpc3QsIG9iamVjdC5pc1Vub3Jk ZXJlZExpc3QoKSk7CiAgICAgc2V0UHJvcGVydHkoQVhQcm9wZXJ0eU5hbWU6OklzVW52aXNpdGVk LCBvYmplY3QuaXNVbnZpc2l0ZWQoKSk7CiAgICAgc2V0UHJvcGVydHkoQVhQcm9wZXJ0eU5hbWU6 OklzVmFsdWVBdXRvZmlsbEF2YWlsYWJsZSwgb2JqZWN0LmlzVmFsdWVBdXRvZmlsbEF2YWlsYWJs ZSgpKTsKQEAgLTI4Miw4ICsyODEsMjMgQEAgdm9pZCBBWElzb2xhdGVkT2JqZWN0Ojppbml0aWFs aXplQXR0cmlidXRlRGF0YShBWENvcmVPYmplY3QmIGNvcmVPYmplY3QsIGJvb2wgaXMKICAgICAg ICAgc2V0T2JqZWN0UHJvcGVydHkoQVhQcm9wZXJ0eU5hbWU6OkRpc2Nsb3NlZEJ5Um93LCBvYmpl Y3QuZGlzY2xvc2VkQnlSb3coKSk7CiAgICAgfQogCi0gICAgaWYgKG9iamVjdC5pc1RyZWVJdGVt KCkpCisgICAgaWYgKG9iamVjdC5pc1RyZWVJdGVtKCkpIHsKKyAgICAgICAgc2V0UHJvcGVydHko QVhQcm9wZXJ0eU5hbWU6OklzVHJlZUl0ZW0sIHRydWUpOworCisgICAgICAgIEFjY2Vzc2liaWxp dHlDaGlsZHJlblZlY3RvciBhcmlhVHJlZUl0ZW1Db250ZW50OworICAgICAgICBvYmplY3QuYXJp YVRyZWVJdGVtQ29udGVudChhcmlhVHJlZUl0ZW1Db250ZW50KTsKKyAgICAgICAgc2V0T2JqZWN0 VmVjdG9yUHJvcGVydHkoQVhQcm9wZXJ0eU5hbWU6OkFSSUFUcmVlSXRlbUNvbnRlbnQsIGFyaWFU cmVlSXRlbUNvbnRlbnQpOworCiAgICAgICAgIHNldE9iamVjdFZlY3RvclByb3BlcnR5KEFYUHJv cGVydHlOYW1lOjpEaXNjbG9zZWRSb3dzLCBvYmplY3QuZGlzY2xvc2VkUm93cygpKTsKKyAgICB9 CisKKyAgICBpZiAob2JqZWN0LmlzVHJlZSgpKSB7CisgICAgICAgIHNldFByb3BlcnR5KEFYUHJv cGVydHlOYW1lOjpJc1RyZWUsIHRydWUpOworCisgICAgICAgIEFjY2Vzc2liaWxpdHlDaGlsZHJl blZlY3RvciBhcmlhVHJlZVJvd3M7CisgICAgICAgIG9iamVjdC5hcmlhVHJlZVJvd3MoYXJpYVRy ZWVSb3dzKTsKKyAgICAgICAgc2V0T2JqZWN0VmVjdG9yUHJvcGVydHkoQVhQcm9wZXJ0eU5hbWU6 OkFSSUFUcmVlUm93cywgYXJpYVRyZWVSb3dzKTsKKyAgICB9CiAKICAgICBpZiAob2JqZWN0Lmlz VGV4dENvbnRyb2woKSkKICAgICAgICAgc2V0UHJvcGVydHkoQVhQcm9wZXJ0eU5hbWU6OlRleHRM ZW5ndGgsIG9iamVjdC50ZXh0TGVuZ3RoKCkpOwpAQCAtMzEyLDE0ICszMjYsNiBAQCB2b2lkIEFY SXNvbGF0ZWRPYmplY3Q6OmluaXRpYWxpemVBdHRyaWJ1dGVEYXRhKEFYQ29yZU9iamVjdCYgY29y ZU9iamVjdCwgYm9vbCBpcwogICAgIG9iamVjdC50YWJDaGlsZHJlbih0YWJDaGlsZHJlbik7CiAg ICAgc2V0T2JqZWN0VmVjdG9yUHJvcGVydHkoQVhQcm9wZXJ0eU5hbWU6OlRhYkNoaWxkcmVuLCB0 YWJDaGlsZHJlbik7CiAKLSAgICBBY2Nlc3NpYmlsaXR5Q2hpbGRyZW5WZWN0b3IgYXJpYVRyZWVS b3dzOwotICAgIG9iamVjdC5hcmlhVHJlZVJvd3MoYXJpYVRyZWVSb3dzKTsKLSAgICBzZXRPYmpl Y3RWZWN0b3JQcm9wZXJ0eShBWFByb3BlcnR5TmFtZTo6QVJJQVRyZWVSb3dzLCBhcmlhVHJlZVJv d3MpOwotCi0gICAgQWNjZXNzaWJpbGl0eUNoaWxkcmVuVmVjdG9yIGFyaWFUcmVlSXRlbUNvbnRl bnQ7Ci0gICAgb2JqZWN0LmFyaWFUcmVlSXRlbUNvbnRlbnQoYXJpYVRyZWVJdGVtQ29udGVudCk7 Ci0gICAgc2V0T2JqZWN0VmVjdG9yUHJvcGVydHkoQVhQcm9wZXJ0eU5hbWU6OkFSSUFUcmVlSXRl bUNvbnRlbnQsIGFyaWFUcmVlSXRlbUNvbnRlbnQpOwotCiAgICAgQWNjZXNzaWJpbGl0eUNoaWxk cmVuVmVjdG9yIGxpbmtlZFVJRWxlbWVudHM7CiAgICAgb2JqZWN0LmxpbmtlZFVJRWxlbWVudHMo bGlua2VkVUlFbGVtZW50cyk7CiAgICAgc2V0T2JqZWN0VmVjdG9yUHJvcGVydHkoQVhQcm9wZXJ0 eU5hbWU6OkxpbmtlZFVJRWxlbWVudHMsIGxpbmtlZFVJRWxlbWVudHMpOwpkaWZmIC0tZ2l0IGEv TGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDY1NzA3 ZGExNmI2ZWZjOTU5YWQyODVmNzNmYjM1YjQwZjBkMDNjZDcuLmQ1ZWQ1Y2RkZGJjZTVkZTg2NzM1 OGQwNzkxNTkzYmRiMzk1NGQ0YmQgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZwor KysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAyMi0wMi0yMSAg VHlsZXIgV2lsY29jayAgPHR5bGVyX3dAYXBwbGUuY29tPgorCisgICAgICAgIEFYOiBBY2Nlc3Np YmlsaXR5T2JqZWN0OjphcmlhVHJlZVJvd3MgY2FuIGNyYXNoIGluIGEgZGVlcCBoaWVyYXJjaHkg ZHVlIHRvIHJlY3Vyc2l2ZSBkZXNjZW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yMzY5ODgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICAqIGFjY2Vzc2liaWxpdHkvZGVlcC1hcmlhLXRyZWUtcm93cy1jcmFz aC1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvZGVlcC1hcmlh LXRyZWUtcm93cy1jcmFzaC5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9pb3MvVGVz dEV4cGVjdGF0aW9uczogRW5hYmxlIG5ldyB0ZXN0LgorCiAyMDIyLTAyLTE4ICBBbnRvaW5lIFF1 aW50ICA8Z3Jhb3V0c0B3ZWJraXQub3JnPgogCiAgICAgICAgIFtmcmFtZS1yYXRlXSBbY3VzdG9t LWVmZmVjdF0gYWxsb3cgc2V0dGluZyBmcmFtZVJhdGUgYXMgYW4gb3B0aW9uIHBhc3NlZCB0byBk b2N1bWVudC50aW1lbGluZS5hbmltYXRlKCkKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2FjY2Vz c2liaWxpdHkvZGVlcC1hcmlhLXRyZWUtcm93cy1jcmFzaC1leHBlY3RlZC50eHQgYi9MYXlvdXRU ZXN0cy9hY2Nlc3NpYmlsaXR5L2RlZXAtYXJpYS10cmVlLXJvd3MtY3Jhc2gtZXhwZWN0ZWQudHh0 Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAuLjA4MDM4MjM1OGIzZjVjNDFkZWZlNDU5N2EzYWRhNDZkNjYyOWY0ZGYKLS0t IC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L2RlZXAtYXJpYS10cmVl LXJvd3MtY3Jhc2gtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsMTAgQEAKK1RoaXMgdGVzdCBlbnN1 cmVzIHRoYXQgZ2V0dGluZyB0aGUgcm93cyBvZiB0cmVlIHdpdGggYSBkZWVwIGNoaWxkcmVuIGhp ZXJhcmNoeSBkb2Vzbid0IGNyYXNoLgorUEFTUzogRGlkbid0IGNyYXNoLgorUEFTUyBzdWNjZXNz ZnVsbHlQYXJzZWQgaXMgdHJ1ZQorCitURVNUIENPTVBMRVRFCitDYXRzCitMaW9uCitKYWd1YXIK K1B1bWEKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9kZWVwLWFyaWEt dHJlZS1yb3dzLWNyYXNoLmh0bWwgYi9MYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L2RlZXAtYXJp YS10cmVlLXJvd3MtY3Jhc2guaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4xNTRmNGNlOWQ2ZjExYjExZGRhZmZm NmQ1OGVmZDZkYWU3YTk5MWNhCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvYWNjZXNz aWJpbGl0eS9kZWVwLWFyaWEtdHJlZS1yb3dzLWNyYXNoLmh0bWwKQEAgLTAsMCArMSw3MSBAQAor PCFET0NUWVBFIEhUTUwgUFVCTElDICItLy9JRVRGLy9EVEQgSFRNTC8vRU4iPgorPGh0bWw+Cis8 aGVhZD4KKzxzY3JpcHQgc3JjPSIuLi9yZXNvdXJjZXMvanMtdGVzdC5qcyI+PC9zY3JpcHQ+Cis8 c2NyaXB0IHNyYz0iLi4vcmVzb3VyY2VzL2FjY2Vzc2liaWxpdHktaGVscGVyLmpzIj48L3Njcmlw dD4KKzwvaGVhZD4KKzxib2R5PgorCis8ZGl2IGlkPSJ0cmVlIiByb2xlPSJ0cmVlIj4KKyAgICA8 ZGl2IHJvbGU9InRyZWVpdGVtIiBhcmlhLWxldmVsPSIxIiBhcmlhLWV4cGFuZGVkPSJ0cnVlIiBh cmlhLXNldHNpemU9IjEiIGFyaWEtcG9zaW5zZXQ9IjEiIGFyaWEtY3VycmVudD0icGFnZSI+Q2F0 cworICAgICAgICA8ZGl2IHJvbGU9InRyZWVpdGVtIiBhcmlhLWxldmVsPSIyIiBhcmlhLXNldHNp emU9IjMiIGFyaWEtcG9zaW5zZXQ9IjEiIGFyaWEtY3VycmVudD0icGFnZSI+TGlvbjwvZGl2Pgor ICAgICAgICA8ZGl2IHJvbGU9InRyZWVpdGVtIiBhcmlhLWxldmVsPSIyIiBhcmlhLXNldHNpemU9 IjMiIGFyaWEtcG9zaW5zZXQ9IjIiIGFyaWEtY3VycmVudD0icGFnZSI+SmFndWFyPC9kaXY+Cisg ICAgICAgIDxkaXYgaWQ9InRoaXJkLXRyZWUtaXRlbSIgcm9sZT0idHJlZWl0ZW0iIGFyaWEtbGV2 ZWw9IjIiPgorICAgICAgICA8L2Rpdj4KKyAgICA8L2Rpdj4KKzwvZGl2PgorCis8c2NyaXB0Pgor ICAgIGxldCB0ZXN0T3V0cHV0ID0gIlRoaXMgdGVzdCBlbnN1cmVzIHRoYXQgZ2V0dGluZyB0aGUg cm93cyBvZiB0cmVlIHdpdGggYSBkZWVwIGNoaWxkcmVuIGhpZXJhcmNoeSBkb2Vzbid0IGNyYXNo LiI7CisKKyAgICBmdW5jdGlvbiBjcmVhdGUocm9sZSkgeworICAgICAgICBsZXQgZGl2ID0gZG9j dW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7CisgICAgICAgIGRpdi5zZXRBdHRyaWJ1dGUoInJv bGUiLCByb2xlKTsKKyAgICAgICAgcmV0dXJuIGRpdjsKKyAgICB9CisKKyAgICBpZiAod2luZG93 LmFjY2Vzc2liaWxpdHlDb250cm9sbGVyKSB7CisgICAgICAgIHdpbmRvdy5qc1Rlc3RJc0FzeW5j ID0gdHJ1ZTsKKworICAgICAgICAvLyBCYXRjaCBhcHBlbmRzIGluIGEgZnJhZ21lbnQuCisgICAg ICAgIGxldCBkb2N1bWVudEZyYWdtZW50ID0gZG9jdW1lbnQuY3JlYXRlRG9jdW1lbnRGcmFnbWVu dCgpOworICAgICAgICBsZXQgbGFzdEdyb3VwRGl2ID0gY3JlYXRlKCJncm91cCIpOworICAgICAg ICBkb2N1bWVudEZyYWdtZW50LmFwcGVuZChsYXN0R3JvdXBEaXYpOworCisgICAgICAgIGxldCBw dW1hVHJlZUl0ZW0gPSBjcmVhdGUoInRyZWVpdGVtIik7CisgICAgICAgIHB1bWFUcmVlSXRlbS50 ZXh0Q29udGVudCArPSAiUHVtYSI7CisgICAgICAgIGZvciAobGV0IGkgPSAwOyBpIDwgMTAwMDsg aSsrKSB7CisgICAgICAgICAgICBsZXQgY3VycmVudEVsZW1lbnQgPSBjcmVhdGUoImdyb3VwIik7 CisgICAgICAgICAgICBsYXN0R3JvdXBEaXYuYXBwZW5kQ2hpbGQoY3VycmVudEVsZW1lbnQpOwor ICAgICAgICAgICAgbGFzdEdyb3VwRGl2ID0gY3VycmVudEVsZW1lbnQ7CisgICAgICAgICAgICAv LyBUaGUgbWF4IGRlcHRoIEFjY2Vzc2liaWxpdHlPYmplY3Q6OmFyaWFUcmVlUm93cyB3aWxsIGRl c2NlbmQgdG8gZmluZCB0cmVlaXRlbXMgaXMKKyAgICAgICAgICAgIC8vIGN1cnJlbnRseSA0NTAg bGV2ZWxzLCBzbyBpbnNlcnQgb3VyICJQdW1hIiB0cmVlaXRlbSB3aXRoaW4gdGhhdCByYW5nZS4K KyAgICAgICAgICAgIGlmIChpID09PSA0NDYpIHsKKyAgICAgICAgICAgICAgICBsYXN0R3JvdXBE aXYuYXBwZW5kKHB1bWFUcmVlSXRlbSk7CisgICAgICAgICAgICAgICAgbGFzdEdyb3VwRGl2ID0g cHVtYVRyZWVJdGVtOworICAgICAgICAgICAgfQorICAgICAgICB9CisgICAgICAgIGRvY3VtZW50 LmdldEVsZW1lbnRCeUlkKCJ0aGlyZC10cmVlLWl0ZW0iKS5hcHBlbmQoZG9jdW1lbnRGcmFnbWVu dCk7CisKKyAgICAgICAgc2V0VGltZW91dChhc3luYyBmdW5jdGlvbigpIHsKKyAgICAgICAgICAg IGxldCB0cmVlID0gYWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIuYWNjZXNzaWJsZUVsZW1lbnRCeUlk KCJ0cmVlIik7CisgICAgICAgICAgICBhd2FpdCB3YWl0Rm9yKCgpID0+IHsKKyAgICAgICAgICAg ICAgICBsZXQgcm93cyA9IHRyZWUudWlFbGVtZW50QXJyYXlBdHRyaWJ1dGVWYWx1ZSgiQVhSb3dz Iik7CisgICAgICAgICAgICAgICAgZm9yIChsZXQgcm93IG9mIHJvd3MpIHsKKyAgICAgICAgICAg ICAgICAgICAgaWYgKHJvdy5kZXNjcmlwdGlvbi5pbmNsdWRlcygiUHVtYSIpKQorICAgICAgICAg ICAgICAgICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgICAgICAgICAgfQorICAgICAgICAg ICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgICAgIH0pOworICAgICAgICAgICAgLy8gVGhp cyBzaG91bGQgYWxzbyBub3QgY2F1c2UgYSBjcmFzaC4KKyAgICAgICAgICAgIHRyZWUuYWxsQXR0 cmlidXRlcygpOworCisgICAgICAgICAgICB0ZXN0T3V0cHV0ICs9ICJcblBBU1M6IERpZG4ndCBj cmFzaC4iOworICAgICAgICAgICAgZGVidWcodGVzdE91dHB1dCk7CisgICAgICAgICAgICBmaW5p c2hKU1Rlc3QoKTsKKyAgICAgICAgfSwgMCk7CisgICAgfQorPC9zY3JpcHQ+Cis8L2JvZHk+Cis8 L2h0bWw+CisKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL2lvcy9UZXN0RXhwZWN0 YXRpb25zIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vaW9zL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXgg ZGYxNTdjOTUwNTJkOTQyNTUxMzJiMWE3OGI5YzI4ZGRmMDZhMDg4OS4uYmY4MzM4ZWE3MDYyYjI4 OGZmYmRjZTgwOGE1NDE3ZWUwZjk1MTExZCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZv cm0vaW9zL1Rlc3RFeHBlY3RhdGlvbnMKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vaW9zL1Rl c3RFeHBlY3RhdGlvbnMKQEAgLTIxMDIsNiArMjEwMiw4IEBAIGFjY2Vzc2liaWxpdHkvdGFibGUt c2VhcmNoLXRyYXZlcnNhbC5odG1sIFsgUGFzcyBdCiBhY2Nlc3NpYmlsaXR5L3NlbGVjdGVkLXN0 YXRlLWNoYW5nZWQtbm90aWZpY2F0aW9ucy5odG1sIFsgUGFzcyBdCiBhY2Nlc3NpYmlsaXR5L2Vs ZW1lbnQtbGluZS1yZWN0cy1hbmQtdGV4dC5odG1sIFsgUGFzcyBdCiAKK2FjY2Vzc2liaWxpdHkv ZGVlcC1hcmlhLXRyZWUtcm93cy1jcmFzaC5odG1sIFsgUGFzcyBdCisKICMgRW5hYmxlICJhdHRh Y2htZW50IGVsZW1lbnQiIHRlc3QgZm9yIGlPUwogYWNjZXNzaWJpbGl0eS9hdHRhY2htZW50LWVs ZW1lbnQuaHRtbCBbIFBhc3MgXQogCg==