210981 2020-04-24 11:51:19 -0700 Add WKNavigationDelegate API shouldAllowDeprecatedTLS 2020-04-29 14:18:39 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen ggaren webkit-bug-importer oldest_to_newest 1645303 0 achristensen 2020-04-24 11:51:19 -0700 Add WKNavigationDelegate API shouldAllowDeprecatedTLS 1645304 1 397478 achristensen 2020-04-24 11:53:12 -0700 Created attachment 397478 Patch 1645305 2 achristensen 2020-04-24 11:53:15 -0700 <rdar://problem/61742976> 1645318 3 397478 ggaren 2020-04-24 12:13:36 -0700 Comment on attachment 397478 Patch EWS is red. 1645352 4 397493 achristensen 2020-04-24 13:18:36 -0700 Created attachment 397493 Patch 1645353 5 397494 achristensen 2020-04-24 13:21:28 -0700 Created attachment 397494 Patch 1646037 6 achristensen 2020-04-27 09:13:19 -0700 ping review 1647152 7 397494 ggaren 2020-04-29 14:08:10 -0700 Comment on attachment 397494 Patch r=me 1647154 8 ews-feeder 2020-04-29 14:18:38 -0700 Committed r260914: <https://trac.webkit.org/changeset/260914> All reviewed patches have been landed. Closing bug and clearing flags on attachment 397494. 397478 2020-04-24 11:53:12 -0700 2020-04-24 13:18:35 -0700 Patch bug-210981-20200424115312.patch text/plain 12200 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNjA2MDQpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDIwLTA0LTI0ICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgQWRkIFdLTmF2aWdh dGlvbkRlbGVnYXRlIEFQSSBzaG91bGRBbGxvd0RlcHJlY2F0ZWRUTFMKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMDk4MQorICAgICAgICA8cmRhcjov L3Byb2JsZW0vNjE3NDI5NzY+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLTmF2aWdhdGlvbkRlbGVnYXRlLmg6 CisgICAgICAgICogVUlQcm9jZXNzL0NvY29hL05hdmlnYXRpb25TdGF0ZS5oOgorICAgICAgICAq IFVJUHJvY2Vzcy9Db2NvYS9OYXZpZ2F0aW9uU3RhdGUubW06CisgICAgICAgIChXZWJLaXQ6Ok5h dmlnYXRpb25TdGF0ZTo6c2V0TmF2aWdhdGlvbkRlbGVnYXRlKToKKyAgICAgICAgKFdlYktpdDo6 TmF2aWdhdGlvblN0YXRlOjpOYXZpZ2F0aW9uQ2xpZW50OjpzaG91bGRBbGxvd0xlZ2FjeVRMUyk6 CisKIDIwMjAtMDQtMjMgIEJyZW50IEZ1bGdoYW0gIDxiZnVsZ2hhbUBhcHBsZS5jb20+CiAKICAg ICAgICAgQWxsb3cgImtlcm4ub3N2ZXJzaW9uIiBzeXNjdGwgcmVhZApJbmRleDogU291cmNlL1dl YktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLTmF2aWdhdGlvbkRlbGVnYXRlLmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLTmF2aWdhdGlvbkRlbGVn YXRlLmgJKHJldmlzaW9uIDI2MDU0MikKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9D b2NvYS9XS05hdmlnYXRpb25EZWxlZ2F0ZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0xNTcsNiArMTU3 LDEzIEBAIHR5cGVkZWYgTlNfRU5VTShOU0ludGVnZXIsIFdLTmF2aWdhdGlvblIKICAqLwogLSAo dm9pZCl3ZWJWaWV3V2ViQ29udGVudFByb2Nlc3NEaWRUZXJtaW5hdGU6KFdLV2ViVmlldyAqKXdl YlZpZXcgV0tfQVBJX0FWQUlMQUJMRShtYWNvcygxMC4xMSksIGlvcyg5LjApKTsKIAorLyohIEBh YnN0cmFjdCBJbnZva2VkIHdoZW4gdGhlIHdlYiB2aWV3IGlzIGVzdGFibGlzaGluZyBhIG5ldHdv cmsgY29ubmVjdGlvbiB1c2luZyBhIGRlcHJlY2F0ZWQgdmVyc2lvbiBvZiBUTFMuCisgQHBhcmFt IHdlYlZpZXcgVGhlIHdlYiB2aWV3IHdob3NlIHVuZGVybHlpbmcgd2ViIGNvbnRlbnQgcHJvY2Vz cyB3YXMgdGVybWluYXRlZC4KKyBAcGFyYW0gY2hhbGxlbmdlIFRoZSBhdXRoZW50aWNhdGlvbiBj aGFsbGVuZ2UuCisgQHBhcmFtIGRlY2lzaW9uSGFuZGxlciBUaGUgZGVjaXNpb24gaGFuZGxlciB5 b3UgbXVzdCBpbnZva2UgdG8gcmVzcG9uZCB0byBpbmRpY2F0ZSB3aGV0aGVyIG9yIG5vdCB0byBj b250aW51ZSB3aXRoIHRoZSBjb25uZWN0aW9uIGVzdGFibGlzaG1lbnQuCisgKi8KKy0gKHZvaWQp d2ViVmlldzooV0tXZWJWaWV3ICopd2ViVmlldyBhdXRoZW50aWNhdGlvbkNoYWxsZW5nZTooTlNV UkxBdXRoZW50aWNhdGlvbkNoYWxsZW5nZSAqKWNoYWxsZW5nZSBzaG91bGRBbGxvd0RlcHJlY2F0 ZWRUTFM6KHZvaWQgKF4pKEJPT0wpKWRlY2lzaW9uSGFuZGxlciBXS19BUElfQVZBSUxBQkxFKG1h Y29zKFdLX01BQ19UQkEpLCBpb3MoV0tfSU9TX1RCQSkpOworCiBAZW5kCiAKIE5TX0FTU1VNRV9O T05OVUxMX0VORApJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvTmF2aWdhdGlv blN0YXRlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvTmF2 aWdhdGlvblN0YXRlLmgJKHJldmlzaW9uIDI2MDU0MikKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL0NvY29hL05hdmlnYXRpb25TdGF0ZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0yMjksNiArMjI5 LDcgQEAgcHJpdmF0ZToKICAgICAgICAgYm9vbCB3ZWJWaWV3UmVuZGVyaW5nUHJvZ3Jlc3NEaWRD aGFuZ2UgOiAxOwogICAgICAgICBib29sIHdlYlZpZXdEaWRSZWNlaXZlQXV0aGVudGljYXRpb25D aGFsbGVuZ2VDb21wbGV0aW9uSGFuZGxlciA6IDE7CiAgICAgICAgIGJvb2wgd2ViVmlld0F1dGhl bnRpY2F0aW9uQ2hhbGxlbmdlU2hvdWxkQWxsb3dMZWdhY3lUTFMgOiAxOworICAgICAgICBib29s IHdlYlZpZXdBdXRoZW50aWNhdGlvbkNoYWxsZW5nZVNob3VsZEFsbG93RGVwcmVjYXRlZFRMUyA6 IDE7CiAgICAgICAgIGJvb2wgd2ViVmlld1dlYkNvbnRlbnRQcm9jZXNzRGlkVGVybWluYXRlIDog MTsKICAgICAgICAgYm9vbCB3ZWJWaWV3V2ViQ29udGVudFByb2Nlc3NEaWRUZXJtaW5hdGVXaXRo UmVhc29uIDogMTsKICAgICAgICAgYm9vbCB3ZWJWaWV3V2ViUHJvY2Vzc0RpZENyYXNoIDogMTsK SW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL05hdmlnYXRpb25TdGF0ZS5tbQo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9OYXZpZ2F0aW9uU3Rh dGUubW0JKHJldmlzaW9uIDI2MDU0MikKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29h L05hdmlnYXRpb25TdGF0ZS5tbQkod29ya2luZyBjb3B5KQpAQCAtMTc4LDYgKzE3OCw3IEBAIHZv aWQgTmF2aWdhdGlvblN0YXRlOjpzZXROYXZpZ2F0aW9uRGVsZWcKICAgICBtX25hdmlnYXRpb25E ZWxlZ2F0ZU1ldGhvZHMud2ViVmlld1JlbmRlcmluZ1Byb2dyZXNzRGlkQ2hhbmdlID0gW2RlbGVn YXRlIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3IoX3dlYlZpZXc6cmVuZGVyaW5nUHJvZ3Jl c3NEaWRDaGFuZ2U6KV07CiAgICAgbV9uYXZpZ2F0aW9uRGVsZWdhdGVNZXRob2RzLndlYlZpZXdE aWRSZWNlaXZlQXV0aGVudGljYXRpb25DaGFsbGVuZ2VDb21wbGV0aW9uSGFuZGxlciA9IFtkZWxl Z2F0ZSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKHdlYlZpZXc6ZGlkUmVjZWl2ZUF1dGhl bnRpY2F0aW9uQ2hhbGxlbmdlOmNvbXBsZXRpb25IYW5kbGVyOildOwogICAgIG1fbmF2aWdhdGlv bkRlbGVnYXRlTWV0aG9kcy53ZWJWaWV3QXV0aGVudGljYXRpb25DaGFsbGVuZ2VTaG91bGRBbGxv d0xlZ2FjeVRMUyA9IFtkZWxlZ2F0ZSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKF93ZWJW aWV3OmF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlOnNob3VsZEFsbG93TGVnYWN5VExTOildOworICAg IG1fbmF2aWdhdGlvbkRlbGVnYXRlTWV0aG9kcy53ZWJWaWV3QXV0aGVudGljYXRpb25DaGFsbGVu Z2VTaG91bGRBbGxvd0RlcHJlY2F0ZWRUTFMgPSBbZGVsZWdhdGUgcmVzcG9uZHNUb1NlbGVjdG9y OkBzZWxlY3Rvcih3ZWJWaWV3OmF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlOnNob3VsZEFsbG93RGVw cmVjYXRlZFRMUzopXTsKICAgICBtX25hdmlnYXRpb25EZWxlZ2F0ZU1ldGhvZHMud2ViVmlld1dl YkNvbnRlbnRQcm9jZXNzRGlkVGVybWluYXRlID0gW2RlbGVnYXRlIHJlc3BvbmRzVG9TZWxlY3Rv cjpAc2VsZWN0b3Iod2ViVmlld1dlYkNvbnRlbnRQcm9jZXNzRGlkVGVybWluYXRlOildOwogICAg IG1fbmF2aWdhdGlvbkRlbGVnYXRlTWV0aG9kcy53ZWJWaWV3V2ViQ29udGVudFByb2Nlc3NEaWRU ZXJtaW5hdGVXaXRoUmVhc29uID0gW2RlbGVnYXRlIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0 b3IoX3dlYlZpZXc6d2ViQ29udGVudFByb2Nlc3NEaWRUZXJtaW5hdGVXaXRoUmVhc29uOildOwog ICAgIG1fbmF2aWdhdGlvbkRlbGVnYXRlTWV0aG9kcy53ZWJWaWV3V2ViUHJvY2Vzc0RpZENyYXNo ID0gW2RlbGVnYXRlIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3IoX3dlYlZpZXdXZWJQcm9j ZXNzRGlkQ3Jhc2g6KV07CkBAIC0xMDMwLDEzICsxMDMxLDI0IEBAIHN0YXRpYyBib29sIHN5c3Rl bUFsbG93c0xlZ2FjeVRMU0ZvcihXZWIKIAogdm9pZCBOYXZpZ2F0aW9uU3RhdGU6Ok5hdmlnYXRp b25DbGllbnQ6OnNob3VsZEFsbG93TGVnYWN5VExTKFdlYlBhZ2VQcm94eSYgcGFnZSwgQXV0aGVu dGljYXRpb25DaGFsbGVuZ2VQcm94eSYgYXV0aGVudGljYXRpb25DaGFsbGVuZ2UsIENvbXBsZXRp b25IYW5kbGVyPHZvaWQoYm9vbCk+JiYgY29tcGxldGlvbkhhbmRsZXIpCiB7Ci0gICAgaWYgKCFt X25hdmlnYXRpb25TdGF0ZS5tX25hdmlnYXRpb25EZWxlZ2F0ZU1ldGhvZHMud2ViVmlld0F1dGhl bnRpY2F0aW9uQ2hhbGxlbmdlU2hvdWxkQWxsb3dMZWdhY3lUTFMpCisgICAgaWYgKCFtX25hdmln YXRpb25TdGF0ZS5tX25hdmlnYXRpb25EZWxlZ2F0ZU1ldGhvZHMud2ViVmlld0F1dGhlbnRpY2F0 aW9uQ2hhbGxlbmdlU2hvdWxkQWxsb3dMZWdhY3lUTFMKKyAgICAgICAgJiYgIW1fbmF2aWdhdGlv blN0YXRlLm1fbmF2aWdhdGlvbkRlbGVnYXRlTWV0aG9kcy53ZWJWaWV3QXV0aGVudGljYXRpb25D aGFsbGVuZ2VTaG91bGRBbGxvd0RlcHJlY2F0ZWRUTFMpCiAgICAgICAgIHJldHVybiBjb21wbGV0 aW9uSGFuZGxlcihzeXN0ZW1BbGxvd3NMZWdhY3lUTFNGb3IocGFnZSkpOwogCiAgICAgYXV0byBu YXZpZ2F0aW9uRGVsZWdhdGUgPSBtX25hdmlnYXRpb25TdGF0ZS5tX25hdmlnYXRpb25EZWxlZ2F0 ZS5nZXQoKTsKICAgICBpZiAoIW5hdmlnYXRpb25EZWxlZ2F0ZSkKICAgICAgICAgcmV0dXJuIGNv bXBsZXRpb25IYW5kbGVyKHN5c3RlbUFsbG93c0xlZ2FjeVRMU0ZvcihwYWdlKSk7CiAKKyAgICBp ZiAobV9uYXZpZ2F0aW9uU3RhdGUubV9uYXZpZ2F0aW9uRGVsZWdhdGVNZXRob2RzLndlYlZpZXdB dXRoZW50aWNhdGlvbkNoYWxsZW5nZVNob3VsZEFsbG93RGVwcmVjYXRlZFRMUykgeworICAgICAg ICBhdXRvIGNoZWNrZXIgPSBDb21wbGV0aW9uSGFuZGxlckNhbGxDaGVja2VyOjpjcmVhdGUobmF2 aWdhdGlvbkRlbGVnYXRlLmdldCgpLCBAc2VsZWN0b3Iod2ViVmlldzphdXRoZW50aWNhdGlvbkNo YWxsZW5nZTpzaG91bGRBbGxvd0RlcHJlY2F0ZWRUTFM6KSk7CisgICAgICAgIFtuYXZpZ2F0aW9u RGVsZWdhdGUuZ2V0KCkgd2ViVmlldzptX25hdmlnYXRpb25TdGF0ZS5tX3dlYlZpZXcgYXV0aGVu dGljYXRpb25DaGFsbGVuZ2U6d3JhcHBlcihhdXRoZW50aWNhdGlvbkNoYWxsZW5nZSkgc2hvdWxk QWxsb3dEZXByZWNhdGVkVExTOm1ha2VCbG9ja1B0cihbY2hlY2tlciA9IFdURk1vdmUoY2hlY2tl ciksIGNvbXBsZXRpb25IYW5kbGVyID0gV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcildKEJPT0wg c2hvdWxkQWxsb3cpIG11dGFibGUgeworICAgICAgICAgICAgaWYgKGNoZWNrZXItPmNvbXBsZXRp b25IYW5kbGVySGFzQmVlbkNhbGxlZCgpKQorICAgICAgICAgICAgICAgIHJldHVybjsKKyAgICAg ICAgICAgIGNoZWNrZXItPmRpZENhbGxDb21wbGV0aW9uSGFuZGxlcigpOworICAgICAgICAgICAg Y29tcGxldGlvbkhhbmRsZXIoc2hvdWxkQWxsb3cpOworICAgICAgICB9KS5nZXQoKV07CisgICAg ICAgIHJldHVybjsKKyAgICB9CiAgICAgYXV0byBjaGVja2VyID0gQ29tcGxldGlvbkhhbmRsZXJD YWxsQ2hlY2tlcjo6Y3JlYXRlKG5hdmlnYXRpb25EZWxlZ2F0ZS5nZXQoKSwgQHNlbGVjdG9yKF93 ZWJWaWV3OmF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlOnNob3VsZEFsbG93TGVnYWN5VExTOikpOwog ICAgIFtzdGF0aWNfY2FzdDxpZCA8V0tOYXZpZ2F0aW9uRGVsZWdhdGVQcml2YXRlPj4obmF2aWdh dGlvbkRlbGVnYXRlLmdldCgpKSBfd2ViVmlldzptX25hdmlnYXRpb25TdGF0ZS5tX3dlYlZpZXcg YXV0aGVudGljYXRpb25DaGFsbGVuZ2U6d3JhcHBlcihhdXRoZW50aWNhdGlvbkNoYWxsZW5nZSkg c2hvdWxkQWxsb3dMZWdhY3lUTFM6bWFrZUJsb2NrUHRyKFtjaGVja2VyID0gV1RGTW92ZShjaGVj a2VyKSwgY29tcGxldGlvbkhhbmRsZXIgPSBXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKV0oQk9P TCBzaG91bGRBbGxvdykgbXV0YWJsZSB7CiAgICAgICAgIGlmIChjaGVja2VyLT5jb21wbGV0aW9u SGFuZGxlckhhc0JlZW5DYWxsZWQoKSkKSW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJldmlzaW9uIDI2MDY1OSkKKysrIFRvb2xzL0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDIwLTA0LTI0ICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgQWRkIFdLTmF2aWdh dGlvbkRlbGVnYXRlIEFQSSBzaG91bGRBbGxvd0RlcHJlY2F0ZWRUTFMKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMDk4MQorICAgICAgICA8cmRhcjov L3Byb2JsZW0vNjE3NDI5NzY+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1RMU0RlcHJlY2F0 aW9uLm1tOgorICAgICAgICAoLVtUTFNOYXZpZ2F0aW9uRGVsZWdhdGUgcmVjZWl2ZWRTaG91bGRB bGxvd0RlcHJlY2F0ZWRUTFNdKToKKyAgICAgICAgKC1bVExTTmF2aWdhdGlvbkRlbGVnYXRlIHdl YlZpZXc6YXV0aGVudGljYXRpb25DaGFsbGVuZ2U6c2hvdWxkQWxsb3dEZXByZWNhdGVkVExTOl0p OgorICAgICAgICAoVGVzdFdlYktpdEFQSTo6VEVTVCk6CisgICAgICAgICgtW1RMU05hdmlnYXRp b25EZWxlZ2F0ZSByZWNlaXZlZFNob3VsZEFsbG93TGVnYWN5VExTXSk6IERlbGV0ZWQuCisgICAg ICAgICgtW1RMU05hdmlnYXRpb25EZWxlZ2F0ZSBfd2ViVmlldzphdXRoZW50aWNhdGlvbkNoYWxs ZW5nZTpzaG91bGRBbGxvd0xlZ2FjeVRMUzpdKTogRGVsZXRlZC4KKyAgICAgICAgKiBUZXN0V2Vi S2l0QVBJL2NvbmZpZy5oOgorCiAyMDIwLTA0LTI0ICBEYXZpZCBLaWx6ZXIgIDxkZGtpbHplckBh cHBsZS5jb20+CiAKICAgICAgICAgY2hlY2std2Via2l0LXN0eWxlIHNob3VsZCByZWNvZ25pemUg KkludGVybmFsLmggYW5kICpQcml2YXRlLmggYXMgcHJpbWFyeSBoZWFkZXJzCkluZGV4OiBUb29s cy9UZXN0V2ViS2l0QVBJL2NvbmZpZy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1Rlc3RXZWJLaXRB UEkvY29uZmlnLmgJKHJldmlzaW9uIDI2MDU0MikKKysrIFRvb2xzL1Rlc3RXZWJLaXRBUEkvY29u ZmlnLmgJKHdvcmtpbmcgY29weSkKQEAgLTEyNiwzICsxMjYsNyBAQAogI2lmIFBMQVRGT1JNKENP Q09BKSAmJiAhKFBMQVRGT1JNKE1BQykgJiYgX19NQUNfT1NfWF9WRVJTSU9OX01JTl9SRVFVSVJF RCA8IDEwMTUwMCkKICNkZWZpbmUgSEFWRV9UTFNfUFJPVE9DT0xfVkVSU0lPTl9UIDEKICNlbmRp ZgorCisjaWYgKFBMQVRGT1JNKE1BQykgJiYgX19NQUNfT1NfWF9WRVJTSU9OX01JTl9SRVFVSVJF RCA+PSAxMDE2MDApIHx8IChQTEFURk9STShJT1NfRkFNSUxZKSAmJiBfX0lQSE9ORV9PU19WRVJT SU9OX01JTl9SRVFVSVJFRCA+PSAxNDAwMDApCisjZGVmaW5lIEhBVkVfVExTX1ZFUlNJT05fRFVS SU5HX0NIQUxMRU5HRSAxCisjZW5kaWYKSW5kZXg6IFRvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMv V2ViS2l0Q29jb2EvVExTRGVwcmVjYXRpb24ubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvVGVzdFdl YktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9UTFNEZXByZWNhdGlvbi5tbQkocmV2aXNpb24gMjYw NTQyKQorKysgVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9UTFNEZXByZWNh dGlvbi5tbQkod29ya2luZyBjb3B5KQpAQCAtNzMsMTQgKzczLDE0IEBAIC0gKHZvaWQpd2FpdFVu dGlsTmVnb3RpYXRlZExlZ2FjeVRMU0NoYW4KIEBpbnRlcmZhY2UgVExTTmF2aWdhdGlvbkRlbGVn YXRlIDogTlNPYmplY3QgPFdLTmF2aWdhdGlvbkRlbGVnYXRlPgogLSAodm9pZCl3YWl0Rm9yRGlk RmluaXNoTmF2aWdhdGlvbjsKIC0gKHZvaWQpd2FpdEZvckRpZEZhaWxQcm92aXNpb25hbE5hdmln YXRpb247Ci0tIChib29sKXJlY2VpdmVkU2hvdWxkQWxsb3dMZWdhY3lUTFM7Ci1AcHJvcGVydHkg KG5vbmF0b21pYykgYm9vbCBzaG91bGRBbGxvd0xlZ2FjeVRMUzsKKy0gKGJvb2wpcmVjZWl2ZWRT aG91bGRBbGxvd0RlcHJlY2F0ZWRUTFM7CitAcHJvcGVydHkgKG5vbmF0b21pYykgYm9vbCBzaG91 bGRBbGxvd0RlcHJlY2F0ZWRUTFM7CiBAZW5kCiAKIEBpbXBsZW1lbnRhdGlvbiBUTFNOYXZpZ2F0 aW9uRGVsZWdhdGUgewogICAgIGJvb2wgX25hdmlnYXRpb25GaW5pc2hlZDsKICAgICBib29sIF9u YXZpZ2F0aW9uRmFpbGVkOwotICAgIGJvb2wgX3JlY2VpdmVkU2hvdWxkQWxsb3dMZWdhY3lUTFM7 CisgICAgYm9vbCBfcmVjZWl2ZWRTaG91bGRBbGxvd0RlcHJlY2F0ZWRUTFM7CiB9CiAKIC0gKHZv aWQpd2FpdEZvckRpZEZpbmlzaE5hdmlnYXRpb24KQEAgLTk1LDkgKzk1LDkgQEAgLSAodm9pZCl3 YWl0Rm9yRGlkRmFpbFByb3Zpc2lvbmFsTmF2aWdhdAogICAgICAgICBUZXN0V2ViS2l0QVBJOjpV dGlsOjpzcGluUnVuTG9vcCgpOwogfQogCi0tIChib29sKXJlY2VpdmVkU2hvdWxkQWxsb3dMZWdh Y3lUTFMKKy0gKGJvb2wpcmVjZWl2ZWRTaG91bGRBbGxvd0RlcHJlY2F0ZWRUTFMKIHsKLSAgICBy ZXR1cm4gX3JlY2VpdmVkU2hvdWxkQWxsb3dMZWdhY3lUTFM7CisgICAgcmV0dXJuIF9yZWNlaXZl ZFNob3VsZEFsbG93RGVwcmVjYXRlZFRMUzsKIH0KIAogLSAodm9pZCl3ZWJWaWV3OihXS1dlYlZp ZXcgKil3ZWJWaWV3IGRpZFJlY2VpdmVBdXRoZW50aWNhdGlvbkNoYWxsZW5nZTooTlNVUkxBdXRo ZW50aWNhdGlvbkNoYWxsZW5nZSAqKWNoYWxsZW5nZSBjb21wbGV0aW9uSGFuZGxlcjoodm9pZCAo XikoTlNVUkxTZXNzaW9uQXV0aENoYWxsZW5nZURpc3Bvc2l0aW9uIGRpc3Bvc2l0aW9uLCBOU1VS TENyZWRlbnRpYWwgKiBjcmVkZW50aWFsKSljb21wbGV0aW9uSGFuZGxlcgpAQCAtMTE2LDEwICsx MTYsMTAgQEAgLSAodm9pZCl3ZWJWaWV3OihXS1dlYlZpZXcgKil3ZWJWaWV3IGRpZAogICAgIF9u YXZpZ2F0aW9uRmFpbGVkID0gdHJ1ZTsKIH0KIAotLSAodm9pZClfd2ViVmlldzooV0tXZWJWaWV3 ICopd2ViVmlldyBhdXRoZW50aWNhdGlvbkNoYWxsZW5nZTooTlNVUkxBdXRoZW50aWNhdGlvbkNo YWxsZW5nZSAqKWNoYWxsZW5nZSBzaG91bGRBbGxvd0xlZ2FjeVRMUzoodm9pZCAoXikoQk9PTCkp Y29tcGxldGlvbkhhbmRsZXIKKy0gKHZvaWQpd2ViVmlldzooV0tXZWJWaWV3ICopd2ViVmlldyBh dXRoZW50aWNhdGlvbkNoYWxsZW5nZTooTlNVUkxBdXRoZW50aWNhdGlvbkNoYWxsZW5nZSAqKWNo YWxsZW5nZSBzaG91bGRBbGxvd0RlcHJlY2F0ZWRUTFM6KHZvaWQgKF4pKEJPT0wpKWNvbXBsZXRp b25IYW5kbGVyCiB7Ci0gICAgX3JlY2VpdmVkU2hvdWxkQWxsb3dMZWdhY3lUTFMgPSB0cnVlOwot ICAgIGNvbXBsZXRpb25IYW5kbGVyKFtzZWxmIHNob3VsZEFsbG93TGVnYWN5VExTXSk7CisgICAg X3JlY2VpdmVkU2hvdWxkQWxsb3dEZXByZWNhdGVkVExTID0gdHJ1ZTsKKyAgICBjb21wbGV0aW9u SGFuZGxlcihbc2VsZiBzaG91bGRBbGxvd0RlcHJlY2F0ZWRUTFNdKTsKIH0KIAogQGVuZApAQCAt MTQ0LDggKzE0NCw5IEBAIFRFU1QoVExTVmVyc2lvbiwgRGVmYXVsdEJlaGF2aW9yKQogICAgIFtk ZWxlZ2F0ZSB3YWl0Rm9yRGlkRmluaXNoTmF2aWdhdGlvbl07CiB9CiAKLS8vIEZJWE1FOiBUaGlz IHRlc3Qgc2hvdWxkIHJlbWFpbiBkaXNhYmxlZCB1bnRpbCByZGFyOi8vcHJvYmxlbS81NjUyMjYw MSBpcyBmaXhlZC4KLVRFU1QoVExTVmVyc2lvbiwgRElTQUJMRURfTmV0d29ya1Nlc3Npb24pCisj aWYgSEFWRShUTFNfVkVSU0lPTl9EVVJJTkdfQ0hBTExFTkdFKQorCitURVNUKFRMU1ZlcnNpb24s IE5ldHdvcmtTZXNzaW9uKQogewogICAgIHN0YXRpYyBhdXRvIGRlbGVnYXRlID0gYWRvcHROUyhb VGVzdE5hdmlnYXRpb25EZWxlZ2F0ZSBuZXddKTsKICAgICBhdXRvIG1ha2VXZWJWaWV3V2l0aCA9 IFsmXSAoV0tXZWJzaXRlRGF0YVN0b3JlICpzdG9yZSkgewpAQCAtMjAyLDggKzIwMyw3IEBAIFRF U1QoVExTVmVyc2lvbiwgRElTQUJMRURfTmV0d29ya1Nlc3Npb24KICAgICBbW05TVXNlckRlZmF1 bHRzIHN0YW5kYXJkVXNlckRlZmF1bHRzXSByZW1vdmVPYmplY3RGb3JLZXk6ZGVmYXVsdHNLZXld OwogfQogCi0vLyBGSVhNRTogVGhpcyB0ZXN0IHNob3VsZCByZW1haW4gZGlzYWJsZWQgdW50aWwg cmRhcjovL3Byb2JsZW0vNTY1MjI2MDEgaXMgZml4ZWQuCi1URVNUKFRMU1ZlcnNpb24sIERJU0FC TEVEX05hdmlnYXRpb25EZWxlZ2F0ZVNQSSkKK1RFU1QoVExTVmVyc2lvbiwgTmF2aWdhdGlvbkRl bGVnYXRlU1BJKQogewogICAgIHsKICAgICAgICAgYXV0byBkZWxlZ2F0ZSA9IGFkb3B0TlMoW1RM U05hdmlnYXRpb25EZWxlZ2F0ZSBuZXddKTsKQEAgLTIxNSwyMCArMjE1LDIyIEBAIFRFU1QoVExT VmVyc2lvbiwgRElTQUJMRURfTmF2aWdhdGlvbkRlbGUKICAgICAgICAgW3dlYlZpZXcgc2V0TmF2 aWdhdGlvbkRlbGVnYXRlOmRlbGVnYXRlLmdldCgpXTsKICAgICAgICAgW3dlYlZpZXcgbG9hZFJl cXVlc3Q6W05TVVJMUmVxdWVzdCByZXF1ZXN0V2l0aFVSTDpbTlNVUkwgVVJMV2l0aFN0cmluZzpb TlNTdHJpbmcgc3RyaW5nV2l0aEZvcm1hdDpAImh0dHBzOi8vMTI3LjAuMC4xOiVkLyIsIHNlcnZl ci5wb3J0KCldXV1dOwogICAgICAgICBbZGVsZWdhdGUgd2FpdEZvckRpZEZhaWxQcm92aXNpb25h bE5hdmlnYXRpb25dOwotICAgICAgICBFWFBFQ1RfVFJVRShbZGVsZWdhdGUgcmVjZWl2ZWRTaG91 bGRBbGxvd0xlZ2FjeVRMU10pOworICAgICAgICBFWFBFQ1RfVFJVRShbZGVsZWdhdGUgcmVjZWl2 ZWRTaG91bGRBbGxvd0RlcHJlY2F0ZWRUTFNdKTsKICAgICB9CiAgICAgewogICAgICAgICBhdXRv IGRlbGVnYXRlID0gYWRvcHROUyhbVExTTmF2aWdhdGlvbkRlbGVnYXRlIG5ld10pOwotICAgICAg ICBkZWxlZ2F0ZS5nZXQoKS5zaG91bGRBbGxvd0xlZ2FjeVRMUyA9IFlFUzsKKyAgICAgICAgZGVs ZWdhdGUuZ2V0KCkuc2hvdWxkQWxsb3dEZXByZWNhdGVkVExTID0gWUVTOwogICAgICAgICBUQ1BT ZXJ2ZXIgc2VydmVyKFRDUFNlcnZlcjo6UHJvdG9jb2w6OkhUVFBTLCBUQ1BTZXJ2ZXI6OnJlc3Bv bmRXaXRoT0ssIHRsczFfMSk7CiAgICAgICAgIGF1dG8gd2ViVmlldyA9IGFkb3B0TlMoW1dLV2Vi VmlldyBuZXddKTsKICAgICAgICAgW3dlYlZpZXcgc2V0TmF2aWdhdGlvbkRlbGVnYXRlOmRlbGVn YXRlLmdldCgpXTsKICAgICAgICAgW3dlYlZpZXcgbG9hZFJlcXVlc3Q6W05TVVJMUmVxdWVzdCBy ZXF1ZXN0V2l0aFVSTDpbTlNVUkwgVVJMV2l0aFN0cmluZzpbTlNTdHJpbmcgc3RyaW5nV2l0aEZv cm1hdDpAImh0dHBzOi8vMTI3LjAuMC4xOiVkLyIsIHNlcnZlci5wb3J0KCldXV1dOwogICAgICAg ICBbZGVsZWdhdGUgd2FpdEZvckRpZEZpbmlzaE5hdmlnYXRpb25dOwotICAgICAgICBFWFBFQ1Rf VFJVRShbZGVsZWdhdGUgcmVjZWl2ZWRTaG91bGRBbGxvd0xlZ2FjeVRMU10pOworICAgICAgICBF WFBFQ1RfVFJVRShbZGVsZWdhdGUgcmVjZWl2ZWRTaG91bGRBbGxvd0RlcHJlY2F0ZWRUTFNdKTsK ICAgICB9CiB9CiAKKyNlbmRpZiAvLyBIQVZFKFRMU19WRVJTSU9OX0RVUklOR19DSEFMTEVOR0Up CisKICNpZiBIQVZFKE5FVFdPUktfRlJBTUVXT1JLKSAmJiBIQVZFKFRMU19QUk9UT0NPTF9WRVJT SU9OX1QpCiAKIHN0YXRpYyBzdGQ6OnBhaXI8UmV0YWluUHRyPFdLV2ViVmlldz4sIFJldGFpblB0 cjxUZXN0TmF2aWdhdGlvbkRlbGVnYXRlPj4gd2ViVmlld1dpdGhOYXZpZ2F0aW9uRGVsZWdhdGUo KQo= 397493 2020-04-24 13:18:36 -0700 2020-04-24 13:21:27 -0700 Patch bug-210981-20200424131836.patch text/plain 12588 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNjA2NTkpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDIwLTA0LTI0ICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgQWRkIFdLTmF2aWdh dGlvbkRlbGVnYXRlIEFQSSBzaG91bGRBbGxvd0RlcHJlY2F0ZWRUTFMKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMDk4MQorICAgICAgICA8cmRhcjov L3Byb2JsZW0vNjE3NDI5NzY+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLTmF2aWdhdGlvbkRlbGVnYXRlLmg6 CisgICAgICAgICogVUlQcm9jZXNzL0NvY29hL05hdmlnYXRpb25TdGF0ZS5oOgorICAgICAgICAq IFVJUHJvY2Vzcy9Db2NvYS9OYXZpZ2F0aW9uU3RhdGUubW06CisgICAgICAgIChXZWJLaXQ6Ok5h dmlnYXRpb25TdGF0ZTo6c2V0TmF2aWdhdGlvbkRlbGVnYXRlKToKKyAgICAgICAgKFdlYktpdDo6 TmF2aWdhdGlvblN0YXRlOjpOYXZpZ2F0aW9uQ2xpZW50OjpzaG91bGRBbGxvd0xlZ2FjeVRMUyk6 CisKIDIwMjAtMDQtMjQgIEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9y Zz4KIAogICAgICAgICBTUEkgY2xpZW50cyB1c2luZyBmYXN0U2VydmVyVHJ1c3RFdmFsdWF0aW9u RW5hYmxlZCBuZWVkIFNQSSB0byBpbmZvcm0gdGhlbSBvZiBtb2Rlcm4gVExTIG5lZ290aWF0aW9u CkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tOYXZpZ2F0aW9uRGVs ZWdhdGUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2Ev V0tOYXZpZ2F0aW9uRGVsZWdhdGUuaAkocmV2aXNpb24gMjYwNjU5KQorKysgU291cmNlL1dlYktp dC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLTmF2aWdhdGlvbkRlbGVnYXRlLmgJKHdvcmtpbmcgY29w eSkKQEAgLTE1Nyw2ICsxNTcsMTMgQEAgdHlwZWRlZiBOU19FTlVNKE5TSW50ZWdlciwgV0tOYXZp Z2F0aW9uUgogICovCiAtICh2b2lkKXdlYlZpZXdXZWJDb250ZW50UHJvY2Vzc0RpZFRlcm1pbmF0 ZTooV0tXZWJWaWV3ICopd2ViVmlldyBXS19BUElfQVZBSUxBQkxFKG1hY29zKDEwLjExKSwgaW9z KDkuMCkpOwogCisvKiEgQGFic3RyYWN0IEludm9rZWQgd2hlbiB0aGUgd2ViIHZpZXcgaXMgZXN0 YWJsaXNoaW5nIGEgbmV0d29yayBjb25uZWN0aW9uIHVzaW5nIGEgZGVwcmVjYXRlZCB2ZXJzaW9u IG9mIFRMUy4KKyBAcGFyYW0gd2ViVmlldyBUaGUgd2ViIHZpZXcgd2hvc2UgdW5kZXJseWluZyB3 ZWIgY29udGVudCBwcm9jZXNzIHdhcyB0ZXJtaW5hdGVkLgorIEBwYXJhbSBjaGFsbGVuZ2UgVGhl IGF1dGhlbnRpY2F0aW9uIGNoYWxsZW5nZS4KKyBAcGFyYW0gZGVjaXNpb25IYW5kbGVyIFRoZSBk ZWNpc2lvbiBoYW5kbGVyIHlvdSBtdXN0IGludm9rZSB0byByZXNwb25kIHRvIGluZGljYXRlIHdo ZXRoZXIgb3Igbm90IHRvIGNvbnRpbnVlIHdpdGggdGhlIGNvbm5lY3Rpb24gZXN0YWJsaXNobWVu dC4KKyAqLworLSAodm9pZCl3ZWJWaWV3OihXS1dlYlZpZXcgKil3ZWJWaWV3IGF1dGhlbnRpY2F0 aW9uQ2hhbGxlbmdlOihOU1VSTEF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlICopY2hhbGxlbmdlIHNo b3VsZEFsbG93RGVwcmVjYXRlZFRMUzoodm9pZCAoXikoQk9PTCkpZGVjaXNpb25IYW5kbGVyIFdL X0FQSV9BVkFJTEFCTEUobWFjb3MoV0tfTUFDX1RCQSksIGlvcyhXS19JT1NfVEJBKSk7CisKIEBl bmQKIAogTlNfQVNTVU1FX05PTk5VTExfRU5ECkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9Db2NvYS9OYXZpZ2F0aW9uU3RhdGUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9Db2NvYS9OYXZpZ2F0aW9uU3RhdGUuaAkocmV2aXNpb24gMjYwNjU5KQorKysgU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvTmF2aWdhdGlvblN0YXRlLmgJKHdvcmtpbmcgY29w eSkKQEAgLTIzMCw2ICsyMzAsNyBAQCBwcml2YXRlOgogICAgICAgICBib29sIHdlYlZpZXdSZW5k ZXJpbmdQcm9ncmVzc0RpZENoYW5nZSA6IDE7CiAgICAgICAgIGJvb2wgd2ViVmlld0RpZFJlY2Vp dmVBdXRoZW50aWNhdGlvbkNoYWxsZW5nZUNvbXBsZXRpb25IYW5kbGVyIDogMTsKICAgICAgICAg Ym9vbCB3ZWJWaWV3QXV0aGVudGljYXRpb25DaGFsbGVuZ2VTaG91bGRBbGxvd0xlZ2FjeVRMUyA6 IDE7CisgICAgICAgIGJvb2wgd2ViVmlld0F1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlU2hvdWxkQWxs b3dEZXByZWNhdGVkVExTIDogMTsKICAgICAgICAgYm9vbCB3ZWJWaWV3RGlkTmVnb3RpYXRlTW9k ZXJuVExTIDogMTsKICAgICAgICAgYm9vbCB3ZWJWaWV3V2ViQ29udGVudFByb2Nlc3NEaWRUZXJt aW5hdGUgOiAxOwogICAgICAgICBib29sIHdlYlZpZXdXZWJDb250ZW50UHJvY2Vzc0RpZFRlcm1p bmF0ZVdpdGhSZWFzb24gOiAxOwpJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2Ev TmF2aWdhdGlvblN0YXRlLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L0NvY29hL05hdmlnYXRpb25TdGF0ZS5tbQkocmV2aXNpb24gMjYwNjU5KQorKysgU291cmNlL1dl YktpdC9VSVByb2Nlc3MvQ29jb2EvTmF2aWdhdGlvblN0YXRlLm1tCSh3b3JraW5nIGNvcHkpCkBA IC0xNzksNiArMTc5LDcgQEAgdm9pZCBOYXZpZ2F0aW9uU3RhdGU6OnNldE5hdmlnYXRpb25EZWxl ZwogICAgIG1fbmF2aWdhdGlvbkRlbGVnYXRlTWV0aG9kcy53ZWJWaWV3UmVuZGVyaW5nUHJvZ3Jl c3NEaWRDaGFuZ2UgPSBbZGVsZWdhdGUgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3Rvcihfd2Vi VmlldzpyZW5kZXJpbmdQcm9ncmVzc0RpZENoYW5nZTopXTsKICAgICBtX25hdmlnYXRpb25EZWxl Z2F0ZU1ldGhvZHMud2ViVmlld0RpZFJlY2VpdmVBdXRoZW50aWNhdGlvbkNoYWxsZW5nZUNvbXBs ZXRpb25IYW5kbGVyID0gW2RlbGVnYXRlIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3Iod2Vi VmlldzpkaWRSZWNlaXZlQXV0aGVudGljYXRpb25DaGFsbGVuZ2U6Y29tcGxldGlvbkhhbmRsZXI6 KV07CiAgICAgbV9uYXZpZ2F0aW9uRGVsZWdhdGVNZXRob2RzLndlYlZpZXdBdXRoZW50aWNhdGlv bkNoYWxsZW5nZVNob3VsZEFsbG93TGVnYWN5VExTID0gW2RlbGVnYXRlIHJlc3BvbmRzVG9TZWxl Y3RvcjpAc2VsZWN0b3IoX3dlYlZpZXc6YXV0aGVudGljYXRpb25DaGFsbGVuZ2U6c2hvdWxkQWxs b3dMZWdhY3lUTFM6KV07CisgICAgbV9uYXZpZ2F0aW9uRGVsZWdhdGVNZXRob2RzLndlYlZpZXdB dXRoZW50aWNhdGlvbkNoYWxsZW5nZVNob3VsZEFsbG93RGVwcmVjYXRlZFRMUyA9IFtkZWxlZ2F0 ZSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKHdlYlZpZXc6YXV0aGVudGljYXRpb25DaGFs bGVuZ2U6c2hvdWxkQWxsb3dEZXByZWNhdGVkVExTOildOwogICAgIG1fbmF2aWdhdGlvbkRlbGVn YXRlTWV0aG9kcy53ZWJWaWV3RGlkTmVnb3RpYXRlTW9kZXJuVExTID0gW2RlbGVnYXRlIHJlc3Bv bmRzVG9TZWxlY3RvcjpAc2VsZWN0b3IoX3dlYlZpZXc6ZGlkTmVnb3RpYXRlTW9kZXJuVExTOild OwogICAgIG1fbmF2aWdhdGlvbkRlbGVnYXRlTWV0aG9kcy53ZWJWaWV3V2ViQ29udGVudFByb2Nl c3NEaWRUZXJtaW5hdGUgPSBbZGVsZWdhdGUgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3Rvcih3 ZWJWaWV3V2ViQ29udGVudFByb2Nlc3NEaWRUZXJtaW5hdGU6KV07CiAgICAgbV9uYXZpZ2F0aW9u RGVsZWdhdGVNZXRob2RzLndlYlZpZXdXZWJDb250ZW50UHJvY2Vzc0RpZFRlcm1pbmF0ZVdpdGhS ZWFzb24gPSBbZGVsZWdhdGUgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3Rvcihfd2ViVmlldzp3 ZWJDb250ZW50UHJvY2Vzc0RpZFRlcm1pbmF0ZVdpdGhSZWFzb246KV07CkBAIC0xMDMyLDEzICsx MDMzLDI0IEBAIHN0YXRpYyBib29sIHN5c3RlbUFsbG93c0xlZ2FjeVRMU0ZvcihXZWIKIAogdm9p ZCBOYXZpZ2F0aW9uU3RhdGU6Ok5hdmlnYXRpb25DbGllbnQ6OnNob3VsZEFsbG93TGVnYWN5VExT KFdlYlBhZ2VQcm94eSYgcGFnZSwgQXV0aGVudGljYXRpb25DaGFsbGVuZ2VQcm94eSYgYXV0aGVu dGljYXRpb25DaGFsbGVuZ2UsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoYm9vbCk+JiYgY29tcGxl dGlvbkhhbmRsZXIpCiB7Ci0gICAgaWYgKCFtX25hdmlnYXRpb25TdGF0ZS5tX25hdmlnYXRpb25E ZWxlZ2F0ZU1ldGhvZHMud2ViVmlld0F1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlU2hvdWxkQWxsb3dM ZWdhY3lUTFMpCisgICAgaWYgKCFtX25hdmlnYXRpb25TdGF0ZS5tX25hdmlnYXRpb25EZWxlZ2F0 ZU1ldGhvZHMud2ViVmlld0F1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlU2hvdWxkQWxsb3dMZWdhY3lU TFMKKyAgICAgICAgJiYgIW1fbmF2aWdhdGlvblN0YXRlLm1fbmF2aWdhdGlvbkRlbGVnYXRlTWV0 aG9kcy53ZWJWaWV3QXV0aGVudGljYXRpb25DaGFsbGVuZ2VTaG91bGRBbGxvd0RlcHJlY2F0ZWRU TFMpCiAgICAgICAgIHJldHVybiBjb21wbGV0aW9uSGFuZGxlcihzeXN0ZW1BbGxvd3NMZWdhY3lU TFNGb3IocGFnZSkpOwogCiAgICAgYXV0byBuYXZpZ2F0aW9uRGVsZWdhdGUgPSBtX25hdmlnYXRp b25TdGF0ZS5tX25hdmlnYXRpb25EZWxlZ2F0ZS5nZXQoKTsKICAgICBpZiAoIW5hdmlnYXRpb25E ZWxlZ2F0ZSkKICAgICAgICAgcmV0dXJuIGNvbXBsZXRpb25IYW5kbGVyKHN5c3RlbUFsbG93c0xl Z2FjeVRMU0ZvcihwYWdlKSk7CiAKKyAgICBpZiAobV9uYXZpZ2F0aW9uU3RhdGUubV9uYXZpZ2F0 aW9uRGVsZWdhdGVNZXRob2RzLndlYlZpZXdBdXRoZW50aWNhdGlvbkNoYWxsZW5nZVNob3VsZEFs bG93RGVwcmVjYXRlZFRMUykgeworICAgICAgICBhdXRvIGNoZWNrZXIgPSBDb21wbGV0aW9uSGFu ZGxlckNhbGxDaGVja2VyOjpjcmVhdGUobmF2aWdhdGlvbkRlbGVnYXRlLmdldCgpLCBAc2VsZWN0 b3Iod2ViVmlldzphdXRoZW50aWNhdGlvbkNoYWxsZW5nZTpzaG91bGRBbGxvd0RlcHJlY2F0ZWRU TFM6KSk7CisgICAgICAgIFtuYXZpZ2F0aW9uRGVsZWdhdGUuZ2V0KCkgd2ViVmlldzptX25hdmln YXRpb25TdGF0ZS5tX3dlYlZpZXcgYXV0aGVudGljYXRpb25DaGFsbGVuZ2U6d3JhcHBlcihhdXRo ZW50aWNhdGlvbkNoYWxsZW5nZSkgc2hvdWxkQWxsb3dEZXByZWNhdGVkVExTOm1ha2VCbG9ja1B0 cihbY2hlY2tlciA9IFdURk1vdmUoY2hlY2tlciksIGNvbXBsZXRpb25IYW5kbGVyID0gV1RGTW92 ZShjb21wbGV0aW9uSGFuZGxlcildKEJPT0wgc2hvdWxkQWxsb3cpIG11dGFibGUgeworICAgICAg ICAgICAgaWYgKGNoZWNrZXItPmNvbXBsZXRpb25IYW5kbGVySGFzQmVlbkNhbGxlZCgpKQorICAg ICAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgICAgIGNoZWNrZXItPmRpZENhbGxDb21wbGV0 aW9uSGFuZGxlcigpOworICAgICAgICAgICAgY29tcGxldGlvbkhhbmRsZXIoc2hvdWxkQWxsb3cp OworICAgICAgICB9KS5nZXQoKV07CisgICAgICAgIHJldHVybjsKKyAgICB9CiAgICAgYXV0byBj aGVja2VyID0gQ29tcGxldGlvbkhhbmRsZXJDYWxsQ2hlY2tlcjo6Y3JlYXRlKG5hdmlnYXRpb25E ZWxlZ2F0ZS5nZXQoKSwgQHNlbGVjdG9yKF93ZWJWaWV3OmF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdl OnNob3VsZEFsbG93TGVnYWN5VExTOikpOwogICAgIFtzdGF0aWNfY2FzdDxpZCA8V0tOYXZpZ2F0 aW9uRGVsZWdhdGVQcml2YXRlPj4obmF2aWdhdGlvbkRlbGVnYXRlLmdldCgpKSBfd2ViVmlldzpt X25hdmlnYXRpb25TdGF0ZS5tX3dlYlZpZXcgYXV0aGVudGljYXRpb25DaGFsbGVuZ2U6d3JhcHBl cihhdXRoZW50aWNhdGlvbkNoYWxsZW5nZSkgc2hvdWxkQWxsb3dMZWdhY3lUTFM6bWFrZUJsb2Nr UHRyKFtjaGVja2VyID0gV1RGTW92ZShjaGVja2VyKSwgY29tcGxldGlvbkhhbmRsZXIgPSBXVEZN b3ZlKGNvbXBsZXRpb25IYW5kbGVyKV0oQk9PTCBzaG91bGRBbGxvdykgbXV0YWJsZSB7CiAgICAg ICAgIGlmIChjaGVja2VyLT5jb21wbGV0aW9uSGFuZGxlckhhc0JlZW5DYWxsZWQoKSkKSW5kZXg6 IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJldmlzaW9u IDI2MDY1OSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5 IEBACisyMDIwLTA0LTI0ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5v cmc+CisKKyAgICAgICAgQWRkIFdLTmF2aWdhdGlvbkRlbGVnYXRlIEFQSSBzaG91bGRBbGxvd0Rl cHJlY2F0ZWRUTFMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTIxMDk4MQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjE3NDI5NzY+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rl c3RzL1dlYktpdENvY29hL1RMU0RlcHJlY2F0aW9uLm1tOgorICAgICAgICAoLVtUTFNOYXZpZ2F0 aW9uRGVsZWdhdGUgcmVjZWl2ZWRTaG91bGRBbGxvd0RlcHJlY2F0ZWRUTFNdKToKKyAgICAgICAg KC1bVExTTmF2aWdhdGlvbkRlbGVnYXRlIHdlYlZpZXc6YXV0aGVudGljYXRpb25DaGFsbGVuZ2U6 c2hvdWxkQWxsb3dEZXByZWNhdGVkVExTOl0pOgorICAgICAgICAoVGVzdFdlYktpdEFQSTo6VEVT VCk6CisgICAgICAgICgtW1RMU05hdmlnYXRpb25EZWxlZ2F0ZSByZWNlaXZlZFNob3VsZEFsbG93 TGVnYWN5VExTXSk6IERlbGV0ZWQuCisgICAgICAgICgtW1RMU05hdmlnYXRpb25EZWxlZ2F0ZSBf d2ViVmlldzphdXRoZW50aWNhdGlvbkNoYWxsZW5nZTpzaG91bGRBbGxvd0xlZ2FjeVRMUzpdKTog RGVsZXRlZC4KKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL2NvbmZpZy5oOgorCiAyMDIwLTA0LTI0 ICBEYXZpZCBLaWx6ZXIgIDxkZGtpbHplckBhcHBsZS5jb20+CiAKICAgICAgICAgY2hlY2std2Vi a2l0LXN0eWxlIHNob3VsZCByZWNvZ25pemUgKkludGVybmFsLmggYW5kICpQcml2YXRlLmggYXMg cHJpbWFyeSBoZWFkZXJzCkluZGV4OiBUb29scy9UZXN0V2ViS2l0QVBJL2NvbmZpZy5oCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFRvb2xzL1Rlc3RXZWJLaXRBUEkvY29uZmlnLmgJKHJldmlzaW9uIDI2MDY1OSkK KysrIFRvb2xzL1Rlc3RXZWJLaXRBUEkvY29uZmlnLmgJKHdvcmtpbmcgY29weSkKQEAgLTEyNiwz ICsxMjYsNyBAQAogI2lmIFBMQVRGT1JNKENPQ09BKSAmJiAhKFBMQVRGT1JNKE1BQykgJiYgX19N QUNfT1NfWF9WRVJTSU9OX01JTl9SRVFVSVJFRCA8IDEwMTUwMCkKICNkZWZpbmUgSEFWRV9UTFNf UFJPVE9DT0xfVkVSU0lPTl9UIDEKICNlbmRpZgorCisjaWYgKFBMQVRGT1JNKE1BQykgJiYgX19N QUNfT1NfWF9WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSAxMDE2MDApIHx8IChQTEFURk9STShJT1Nf RkFNSUxZKSAmJiBfX0lQSE9ORV9PU19WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSAxNDAwMDApCisj ZGVmaW5lIEhBVkVfVExTX1ZFUlNJT05fRFVSSU5HX0NIQUxMRU5HRSAxCisjZW5kaWYKSW5kZXg6 IFRvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvVExTRGVwcmVjYXRpb24ubW0K PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9UTFNE ZXByZWNhdGlvbi5tbQkocmV2aXNpb24gMjYwNjU5KQorKysgVG9vbHMvVGVzdFdlYktpdEFQSS9U ZXN0cy9XZWJLaXRDb2NvYS9UTFNEZXByZWNhdGlvbi5tbQkod29ya2luZyBjb3B5KQpAQCAtNzQs MTQgKzc0LDE0IEBAIEBpbnRlcmZhY2UgVExTTmF2aWdhdGlvbkRlbGVnYXRlIDogTlNPYmoKIC0g KHZvaWQpd2FpdEZvckRpZEZpbmlzaE5hdmlnYXRpb247CiAtICh2b2lkKXdhaXRGb3JEaWRGYWls UHJvdmlzaW9uYWxOYXZpZ2F0aW9uOwogLSAoTlNVUkxBdXRoZW50aWNhdGlvbkNoYWxsZW5nZSAq KXdhaXRGb3JEaWROZWdvdGlhdGVNb2Rlcm5UTFM7Ci0tIChib29sKXJlY2VpdmVkU2hvdWxkQWxs b3dMZWdhY3lUTFM7Ci1AcHJvcGVydHkgKG5vbmF0b21pYykgYm9vbCBzaG91bGRBbGxvd0xlZ2Fj eVRMUzsKKy0gKGJvb2wpcmVjZWl2ZWRTaG91bGRBbGxvd0RlcHJlY2F0ZWRUTFM7CitAcHJvcGVy dHkgKG5vbmF0b21pYykgYm9vbCBzaG91bGRBbGxvd0RlcHJlY2F0ZWRUTFM7CiBAZW5kCiAKIEBp bXBsZW1lbnRhdGlvbiBUTFNOYXZpZ2F0aW9uRGVsZWdhdGUgewogICAgIGJvb2wgX25hdmlnYXRp b25GaW5pc2hlZDsKICAgICBib29sIF9uYXZpZ2F0aW9uRmFpbGVkOwotICAgIGJvb2wgX3JlY2Vp dmVkU2hvdWxkQWxsb3dMZWdhY3lUTFM7CisgICAgYm9vbCBfcmVjZWl2ZWRTaG91bGRBbGxvd0Rl cHJlY2F0ZWRUTFM7CiAgICAgUmV0YWluUHRyPE5TVVJMQXV0aGVudGljYXRpb25DaGFsbGVuZ2U+ IF9uZWdvdGlhdGVkTW9kZXJuVExTOwogfQogCkBAIC0xMDQsOSArMTA0LDkgQEAgLSAoTlNVUkxB dXRoZW50aWNhdGlvbkNoYWxsZW5nZSAqKXdhaXRGbwogICAgIHJldHVybiBfbmVnb3RpYXRlZE1v ZGVyblRMUy5hdXRvcmVsZWFzZSgpOwogfQogCi0tIChib29sKXJlY2VpdmVkU2hvdWxkQWxsb3dM ZWdhY3lUTFMKKy0gKGJvb2wpcmVjZWl2ZWRTaG91bGRBbGxvd0RlcHJlY2F0ZWRUTFMKIHsKLSAg ICByZXR1cm4gX3JlY2VpdmVkU2hvdWxkQWxsb3dMZWdhY3lUTFM7CisgICAgcmV0dXJuIF9yZWNl aXZlZFNob3VsZEFsbG93RGVwcmVjYXRlZFRMUzsKIH0KIAogLSAodm9pZCl3ZWJWaWV3OihXS1dl YlZpZXcgKil3ZWJWaWV3IGRpZFJlY2VpdmVBdXRoZW50aWNhdGlvbkNoYWxsZW5nZTooTlNVUkxB dXRoZW50aWNhdGlvbkNoYWxsZW5nZSAqKWNoYWxsZW5nZSBjb21wbGV0aW9uSGFuZGxlcjoodm9p ZCAoXikoTlNVUkxTZXNzaW9uQXV0aENoYWxsZW5nZURpc3Bvc2l0aW9uIGRpc3Bvc2l0aW9uLCBO U1VSTENyZWRlbnRpYWwgKiBjcmVkZW50aWFsKSljb21wbGV0aW9uSGFuZGxlcgpAQCAtMTI1LDEw ICsxMjUsMTAgQEAgLSAodm9pZCl3ZWJWaWV3OihXS1dlYlZpZXcgKil3ZWJWaWV3IGRpZAogICAg IF9uYXZpZ2F0aW9uRmFpbGVkID0gdHJ1ZTsKIH0KIAotLSAodm9pZClfd2ViVmlldzooV0tXZWJW aWV3ICopd2ViVmlldyBhdXRoZW50aWNhdGlvbkNoYWxsZW5nZTooTlNVUkxBdXRoZW50aWNhdGlv bkNoYWxsZW5nZSAqKWNoYWxsZW5nZSBzaG91bGRBbGxvd0xlZ2FjeVRMUzoodm9pZCAoXikoQk9P TCkpY29tcGxldGlvbkhhbmRsZXIKKy0gKHZvaWQpd2ViVmlldzooV0tXZWJWaWV3ICopd2ViVmll dyBhdXRoZW50aWNhdGlvbkNoYWxsZW5nZTooTlNVUkxBdXRoZW50aWNhdGlvbkNoYWxsZW5nZSAq KWNoYWxsZW5nZSBzaG91bGRBbGxvd0RlcHJlY2F0ZWRUTFM6KHZvaWQgKF4pKEJPT0wpKWNvbXBs ZXRpb25IYW5kbGVyCiB7Ci0gICAgX3JlY2VpdmVkU2hvdWxkQWxsb3dMZWdhY3lUTFMgPSB0cnVl OwotICAgIGNvbXBsZXRpb25IYW5kbGVyKFtzZWxmIHNob3VsZEFsbG93TGVnYWN5VExTXSk7Cisg ICAgX3JlY2VpdmVkU2hvdWxkQWxsb3dEZXByZWNhdGVkVExTID0gdHJ1ZTsKKyAgICBjb21wbGV0 aW9uSGFuZGxlcihbc2VsZiBzaG91bGRBbGxvd0RlcHJlY2F0ZWRUTFNdKTsKIH0KIAogLSAodm9p ZClfd2ViVmlldzooV0tXZWJWaWV3ICopd2ViVmlldyBkaWROZWdvdGlhdGVNb2Rlcm5UTFM6KE5T VVJMQXV0aGVudGljYXRpb25DaGFsbGVuZ2UgKiljaGFsbGVuZ2UKQEAgLTE1OCw4ICsxNTgsOSBA QCBURVNUKFRMU1ZlcnNpb24sIERlZmF1bHRCZWhhdmlvcikKICAgICBbZGVsZWdhdGUgd2FpdEZv ckRpZEZpbmlzaE5hdmlnYXRpb25dOwogfQogCi0vLyBGSVhNRTogVGhpcyB0ZXN0IHNob3VsZCBy ZW1haW4gZGlzYWJsZWQgdW50aWwgcmRhcjovL3Byb2JsZW0vNTY1MjI2MDEgaXMgZml4ZWQuCi1U RVNUKFRMU1ZlcnNpb24sIERJU0FCTEVEX05ldHdvcmtTZXNzaW9uKQorI2lmIEhBVkUoVExTX1ZF UlNJT05fRFVSSU5HX0NIQUxMRU5HRSkKKworVEVTVChUTFNWZXJzaW9uLCBOZXR3b3JrU2Vzc2lv bikKIHsKICAgICBzdGF0aWMgYXV0byBkZWxlZ2F0ZSA9IGFkb3B0TlMoW1Rlc3ROYXZpZ2F0aW9u RGVsZWdhdGUgbmV3XSk7CiAgICAgYXV0byBtYWtlV2ViVmlld1dpdGggPSBbJl0gKFdLV2Vic2l0 ZURhdGFTdG9yZSAqc3RvcmUpIHsKQEAgLTIxNiwzMyArMjE3LDMzIEBAIFRFU1QoVExTVmVyc2lv biwgRElTQUJMRURfTmV0d29ya1Nlc3Npb24KICAgICBbW05TVXNlckRlZmF1bHRzIHN0YW5kYXJk VXNlckRlZmF1bHRzXSByZW1vdmVPYmplY3RGb3JLZXk6ZGVmYXVsdHNLZXldOwogfQogCi0vLyBG SVhNRTogVGhpcyB0ZXN0IHNob3VsZCByZW1haW4gZGlzYWJsZWQgdW50aWwgcmRhcjovL3Byb2Js ZW0vNTY1MjI2MDEgaXMgZml4ZWQuCi1URVNUKFRMU1ZlcnNpb24sIERJU0FCTEVEX05hdmlnYXRp b25EZWxlZ2F0ZVNQSSkKK1RFU1QoVExTVmVyc2lvbiwgU2hvdWxkQWxsb3dEZXByZWNhdGVkVExT KQogewogICAgIHsKICAgICAgICAgYXV0byBkZWxlZ2F0ZSA9IGFkb3B0TlMoW1RMU05hdmlnYXRp b25EZWxlZ2F0ZSBuZXddKTsKICAgICAgICAgVENQU2VydmVyIHNlcnZlcihUQ1BTZXJ2ZXI6OlBy b3RvY29sOjpIVFRQUywgW10oU1NMICpzc2wpIHsKLSAgICAgICAgICAgIC8vIEZJWE1FOiBUaGlz IGlzIG9ubHkgaWYgd2UgaGF2ZSB0aGUgbmV3IFNQSS4KICAgICAgICAgICAgIEVYUEVDVF9GQUxT RShzc2wpOwogICAgICAgICB9LCB0bHMxXzEpOwogICAgICAgICBhdXRvIHdlYlZpZXcgPSBhZG9w dE5TKFtXS1dlYlZpZXcgbmV3XSk7CiAgICAgICAgIFt3ZWJWaWV3IHNldE5hdmlnYXRpb25EZWxl Z2F0ZTpkZWxlZ2F0ZS5nZXQoKV07CiAgICAgICAgIFt3ZWJWaWV3IGxvYWRSZXF1ZXN0OltOU1VS TFJlcXVlc3QgcmVxdWVzdFdpdGhVUkw6W05TVVJMIFVSTFdpdGhTdHJpbmc6W05TU3RyaW5nIHN0 cmluZ1dpdGhGb3JtYXQ6QCJodHRwczovLzEyNy4wLjAuMTolZC8iLCBzZXJ2ZXIucG9ydCgpXV1d XTsKICAgICAgICAgW2RlbGVnYXRlIHdhaXRGb3JEaWRGYWlsUHJvdmlzaW9uYWxOYXZpZ2F0aW9u XTsKLSAgICAgICAgRVhQRUNUX1RSVUUoW2RlbGVnYXRlIHJlY2VpdmVkU2hvdWxkQWxsb3dMZWdh Y3lUTFNdKTsKKyAgICAgICAgRVhQRUNUX1RSVUUoW2RlbGVnYXRlIHJlY2VpdmVkU2hvdWxkQWxs b3dEZXByZWNhdGVkVExTXSk7CiAgICAgfQogICAgIHsKICAgICAgICAgYXV0byBkZWxlZ2F0ZSA9 IGFkb3B0TlMoW1RMU05hdmlnYXRpb25EZWxlZ2F0ZSBuZXddKTsKLSAgICAgICAgZGVsZWdhdGUu Z2V0KCkuc2hvdWxkQWxsb3dMZWdhY3lUTFMgPSBZRVM7CisgICAgICAgIGRlbGVnYXRlLmdldCgp LnNob3VsZEFsbG93RGVwcmVjYXRlZFRMUyA9IFlFUzsKICAgICAgICAgVENQU2VydmVyIHNlcnZl cihUQ1BTZXJ2ZXI6OlByb3RvY29sOjpIVFRQUywgVENQU2VydmVyOjpyZXNwb25kV2l0aE9LLCB0 bHMxXzEpOwogICAgICAgICBhdXRvIHdlYlZpZXcgPSBhZG9wdE5TKFtXS1dlYlZpZXcgbmV3XSk7 CiAgICAgICAgIFt3ZWJWaWV3IHNldE5hdmlnYXRpb25EZWxlZ2F0ZTpkZWxlZ2F0ZS5nZXQoKV07 CiAgICAgICAgIFt3ZWJWaWV3IGxvYWRSZXF1ZXN0OltOU1VSTFJlcXVlc3QgcmVxdWVzdFdpdGhV Ukw6W05TVVJMIFVSTFdpdGhTdHJpbmc6W05TU3RyaW5nIHN0cmluZ1dpdGhGb3JtYXQ6QCJodHRw czovLzEyNy4wLjAuMTolZC8iLCBzZXJ2ZXIucG9ydCgpXV1dXTsKICAgICAgICAgW2RlbGVnYXRl IHdhaXRGb3JEaWRGaW5pc2hOYXZpZ2F0aW9uXTsKLSAgICAgICAgRVhQRUNUX1RSVUUoW2RlbGVn YXRlIHJlY2VpdmVkU2hvdWxkQWxsb3dMZWdhY3lUTFNdKTsKKyAgICAgICAgRVhQRUNUX1RSVUUo W2RlbGVnYXRlIHJlY2VpdmVkU2hvdWxkQWxsb3dEZXByZWNhdGVkVExTXSk7CiAgICAgfQogfQog CisjZW5kaWYgLy8gSEFWRShUTFNfVkVSU0lPTl9EVVJJTkdfQ0hBTExFTkdFKQorCiAjaWYgSEFW RShORVRXT1JLX0ZSQU1FV09SSykgJiYgSEFWRShUTFNfUFJPVE9DT0xfVkVSU0lPTl9UKQogCiBz dGF0aWMgc3RkOjpwYWlyPFJldGFpblB0cjxXS1dlYlZpZXc+LCBSZXRhaW5QdHI8VGVzdE5hdmln YXRpb25EZWxlZ2F0ZT4+IHdlYlZpZXdXaXRoTmF2aWdhdGlvbkRlbGVnYXRlKCkK 397494 2020-04-24 13:21:28 -0700 2020-04-29 14:18:39 -0700 Patch bug-210981-20200424132128.patch text/plain 12562 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNjA2NTkpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDIwLTA0LTI0ICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgQWRkIFdLTmF2aWdh dGlvbkRlbGVnYXRlIEFQSSBzaG91bGRBbGxvd0RlcHJlY2F0ZWRUTFMKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMDk4MQorICAgICAgICA8cmRhcjov L3Byb2JsZW0vNjE3NDI5NzY+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLTmF2aWdhdGlvbkRlbGVnYXRlLmg6 CisgICAgICAgICogVUlQcm9jZXNzL0NvY29hL05hdmlnYXRpb25TdGF0ZS5oOgorICAgICAgICAq IFVJUHJvY2Vzcy9Db2NvYS9OYXZpZ2F0aW9uU3RhdGUubW06CisgICAgICAgIChXZWJLaXQ6Ok5h dmlnYXRpb25TdGF0ZTo6c2V0TmF2aWdhdGlvbkRlbGVnYXRlKToKKyAgICAgICAgKFdlYktpdDo6 TmF2aWdhdGlvblN0YXRlOjpOYXZpZ2F0aW9uQ2xpZW50OjpzaG91bGRBbGxvd0xlZ2FjeVRMUyk6 CisKIDIwMjAtMDQtMjQgIEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9y Zz4KIAogICAgICAgICBTUEkgY2xpZW50cyB1c2luZyBmYXN0U2VydmVyVHJ1c3RFdmFsdWF0aW9u RW5hYmxlZCBuZWVkIFNQSSB0byBpbmZvcm0gdGhlbSBvZiBtb2Rlcm4gVExTIG5lZ290aWF0aW9u CkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tOYXZpZ2F0aW9uRGVs ZWdhdGUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2Ev V0tOYXZpZ2F0aW9uRGVsZWdhdGUuaAkocmV2aXNpb24gMjYwNjU5KQorKysgU291cmNlL1dlYktp dC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLTmF2aWdhdGlvbkRlbGVnYXRlLmgJKHdvcmtpbmcgY29w eSkKQEAgLTE1Nyw2ICsxNTcsMTMgQEAgdHlwZWRlZiBOU19FTlVNKE5TSW50ZWdlciwgV0tOYXZp Z2F0aW9uUgogICovCiAtICh2b2lkKXdlYlZpZXdXZWJDb250ZW50UHJvY2Vzc0RpZFRlcm1pbmF0 ZTooV0tXZWJWaWV3ICopd2ViVmlldyBXS19BUElfQVZBSUxBQkxFKG1hY29zKDEwLjExKSwgaW9z KDkuMCkpOwogCisvKiEgQGFic3RyYWN0IEludm9rZWQgd2hlbiB0aGUgd2ViIHZpZXcgaXMgZXN0 YWJsaXNoaW5nIGEgbmV0d29yayBjb25uZWN0aW9uIHVzaW5nIGEgZGVwcmVjYXRlZCB2ZXJzaW9u IG9mIFRMUy4KKyBAcGFyYW0gd2ViVmlldyBUaGUgd2ViIHZpZXcgaW5pdGlhdGluZyB0aGUgY29u bmVjdGlvbi4KKyBAcGFyYW0gY2hhbGxlbmdlIFRoZSBhdXRoZW50aWNhdGlvbiBjaGFsbGVuZ2Uu CisgQHBhcmFtIGRlY2lzaW9uSGFuZGxlciBUaGUgZGVjaXNpb24gaGFuZGxlciB5b3UgbXVzdCBp bnZva2UgdG8gcmVzcG9uZCB0byBpbmRpY2F0ZSB3aGV0aGVyIG9yIG5vdCB0byBjb250aW51ZSB3 aXRoIHRoZSBjb25uZWN0aW9uIGVzdGFibGlzaG1lbnQuCisgKi8KKy0gKHZvaWQpd2ViVmlldzoo V0tXZWJWaWV3ICopd2ViVmlldyBhdXRoZW50aWNhdGlvbkNoYWxsZW5nZTooTlNVUkxBdXRoZW50 aWNhdGlvbkNoYWxsZW5nZSAqKWNoYWxsZW5nZSBzaG91bGRBbGxvd0RlcHJlY2F0ZWRUTFM6KHZv aWQgKF4pKEJPT0wpKWRlY2lzaW9uSGFuZGxlciBXS19BUElfQVZBSUxBQkxFKG1hY29zKFdLX01B Q19UQkEpLCBpb3MoV0tfSU9TX1RCQSkpOworCiBAZW5kCiAKIE5TX0FTU1VNRV9OT05OVUxMX0VO RApJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvTmF2aWdhdGlvblN0YXRlLmgK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvTmF2aWdhdGlvblN0 YXRlLmgJKHJldmlzaW9uIDI2MDY1OSkKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29h L05hdmlnYXRpb25TdGF0ZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0yMzAsNiArMjMwLDcgQEAgcHJp dmF0ZToKICAgICAgICAgYm9vbCB3ZWJWaWV3UmVuZGVyaW5nUHJvZ3Jlc3NEaWRDaGFuZ2UgOiAx OwogICAgICAgICBib29sIHdlYlZpZXdEaWRSZWNlaXZlQXV0aGVudGljYXRpb25DaGFsbGVuZ2VD b21wbGV0aW9uSGFuZGxlciA6IDE7CiAgICAgICAgIGJvb2wgd2ViVmlld0F1dGhlbnRpY2F0aW9u Q2hhbGxlbmdlU2hvdWxkQWxsb3dMZWdhY3lUTFMgOiAxOworICAgICAgICBib29sIHdlYlZpZXdB dXRoZW50aWNhdGlvbkNoYWxsZW5nZVNob3VsZEFsbG93RGVwcmVjYXRlZFRMUyA6IDE7CiAgICAg ICAgIGJvb2wgd2ViVmlld0RpZE5lZ290aWF0ZU1vZGVyblRMUyA6IDE7CiAgICAgICAgIGJvb2wg d2ViVmlld1dlYkNvbnRlbnRQcm9jZXNzRGlkVGVybWluYXRlIDogMTsKICAgICAgICAgYm9vbCB3 ZWJWaWV3V2ViQ29udGVudFByb2Nlc3NEaWRUZXJtaW5hdGVXaXRoUmVhc29uIDogMTsKSW5kZXg6 IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL05hdmlnYXRpb25TdGF0ZS5tbQo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9OYXZpZ2F0aW9uU3RhdGUubW0J KHJldmlzaW9uIDI2MDY1OSkKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL05hdmln YXRpb25TdGF0ZS5tbQkod29ya2luZyBjb3B5KQpAQCAtMTc5LDYgKzE3OSw3IEBAIHZvaWQgTmF2 aWdhdGlvblN0YXRlOjpzZXROYXZpZ2F0aW9uRGVsZWcKICAgICBtX25hdmlnYXRpb25EZWxlZ2F0 ZU1ldGhvZHMud2ViVmlld1JlbmRlcmluZ1Byb2dyZXNzRGlkQ2hhbmdlID0gW2RlbGVnYXRlIHJl c3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3IoX3dlYlZpZXc6cmVuZGVyaW5nUHJvZ3Jlc3NEaWRD aGFuZ2U6KV07CiAgICAgbV9uYXZpZ2F0aW9uRGVsZWdhdGVNZXRob2RzLndlYlZpZXdEaWRSZWNl aXZlQXV0aGVudGljYXRpb25DaGFsbGVuZ2VDb21wbGV0aW9uSGFuZGxlciA9IFtkZWxlZ2F0ZSBy ZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKHdlYlZpZXc6ZGlkUmVjZWl2ZUF1dGhlbnRpY2F0 aW9uQ2hhbGxlbmdlOmNvbXBsZXRpb25IYW5kbGVyOildOwogICAgIG1fbmF2aWdhdGlvbkRlbGVn YXRlTWV0aG9kcy53ZWJWaWV3QXV0aGVudGljYXRpb25DaGFsbGVuZ2VTaG91bGRBbGxvd0xlZ2Fj eVRMUyA9IFtkZWxlZ2F0ZSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKF93ZWJWaWV3OmF1 dGhlbnRpY2F0aW9uQ2hhbGxlbmdlOnNob3VsZEFsbG93TGVnYWN5VExTOildOworICAgIG1fbmF2 aWdhdGlvbkRlbGVnYXRlTWV0aG9kcy53ZWJWaWV3QXV0aGVudGljYXRpb25DaGFsbGVuZ2VTaG91 bGRBbGxvd0RlcHJlY2F0ZWRUTFMgPSBbZGVsZWdhdGUgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxl Y3Rvcih3ZWJWaWV3OmF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlOnNob3VsZEFsbG93RGVwcmVjYXRl ZFRMUzopXTsKICAgICBtX25hdmlnYXRpb25EZWxlZ2F0ZU1ldGhvZHMud2ViVmlld0RpZE5lZ290 aWF0ZU1vZGVyblRMUyA9IFtkZWxlZ2F0ZSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKF93 ZWJWaWV3OmRpZE5lZ290aWF0ZU1vZGVyblRMUzopXTsKICAgICBtX25hdmlnYXRpb25EZWxlZ2F0 ZU1ldGhvZHMud2ViVmlld1dlYkNvbnRlbnRQcm9jZXNzRGlkVGVybWluYXRlID0gW2RlbGVnYXRl IHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3Iod2ViVmlld1dlYkNvbnRlbnRQcm9jZXNzRGlk VGVybWluYXRlOildOwogICAgIG1fbmF2aWdhdGlvbkRlbGVnYXRlTWV0aG9kcy53ZWJWaWV3V2Vi Q29udGVudFByb2Nlc3NEaWRUZXJtaW5hdGVXaXRoUmVhc29uID0gW2RlbGVnYXRlIHJlc3BvbmRz VG9TZWxlY3RvcjpAc2VsZWN0b3IoX3dlYlZpZXc6d2ViQ29udGVudFByb2Nlc3NEaWRUZXJtaW5h dGVXaXRoUmVhc29uOildOwpAQCAtMTAzMiwxMyArMTAzMywyNCBAQCBzdGF0aWMgYm9vbCBzeXN0 ZW1BbGxvd3NMZWdhY3lUTFNGb3IoV2ViCiAKIHZvaWQgTmF2aWdhdGlvblN0YXRlOjpOYXZpZ2F0 aW9uQ2xpZW50OjpzaG91bGRBbGxvd0xlZ2FjeVRMUyhXZWJQYWdlUHJveHkmIHBhZ2UsIEF1dGhl bnRpY2F0aW9uQ2hhbGxlbmdlUHJveHkmIGF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlLCBDb21wbGV0 aW9uSGFuZGxlcjx2b2lkKGJvb2wpPiYmIGNvbXBsZXRpb25IYW5kbGVyKQogewotICAgIGlmICgh bV9uYXZpZ2F0aW9uU3RhdGUubV9uYXZpZ2F0aW9uRGVsZWdhdGVNZXRob2RzLndlYlZpZXdBdXRo ZW50aWNhdGlvbkNoYWxsZW5nZVNob3VsZEFsbG93TGVnYWN5VExTKQorICAgIGlmICghbV9uYXZp Z2F0aW9uU3RhdGUubV9uYXZpZ2F0aW9uRGVsZWdhdGVNZXRob2RzLndlYlZpZXdBdXRoZW50aWNh dGlvbkNoYWxsZW5nZVNob3VsZEFsbG93TGVnYWN5VExTCisgICAgICAgICYmICFtX25hdmlnYXRp b25TdGF0ZS5tX25hdmlnYXRpb25EZWxlZ2F0ZU1ldGhvZHMud2ViVmlld0F1dGhlbnRpY2F0aW9u Q2hhbGxlbmdlU2hvdWxkQWxsb3dEZXByZWNhdGVkVExTKQogICAgICAgICByZXR1cm4gY29tcGxl dGlvbkhhbmRsZXIoc3lzdGVtQWxsb3dzTGVnYWN5VExTRm9yKHBhZ2UpKTsKIAogICAgIGF1dG8g bmF2aWdhdGlvbkRlbGVnYXRlID0gbV9uYXZpZ2F0aW9uU3RhdGUubV9uYXZpZ2F0aW9uRGVsZWdh dGUuZ2V0KCk7CiAgICAgaWYgKCFuYXZpZ2F0aW9uRGVsZWdhdGUpCiAgICAgICAgIHJldHVybiBj b21wbGV0aW9uSGFuZGxlcihzeXN0ZW1BbGxvd3NMZWdhY3lUTFNGb3IocGFnZSkpOwogCisgICAg aWYgKG1fbmF2aWdhdGlvblN0YXRlLm1fbmF2aWdhdGlvbkRlbGVnYXRlTWV0aG9kcy53ZWJWaWV3 QXV0aGVudGljYXRpb25DaGFsbGVuZ2VTaG91bGRBbGxvd0RlcHJlY2F0ZWRUTFMpIHsKKyAgICAg ICAgYXV0byBjaGVja2VyID0gQ29tcGxldGlvbkhhbmRsZXJDYWxsQ2hlY2tlcjo6Y3JlYXRlKG5h dmlnYXRpb25EZWxlZ2F0ZS5nZXQoKSwgQHNlbGVjdG9yKHdlYlZpZXc6YXV0aGVudGljYXRpb25D aGFsbGVuZ2U6c2hvdWxkQWxsb3dEZXByZWNhdGVkVExTOikpOworICAgICAgICBbbmF2aWdhdGlv bkRlbGVnYXRlLmdldCgpIHdlYlZpZXc6bV9uYXZpZ2F0aW9uU3RhdGUubV93ZWJWaWV3IGF1dGhl bnRpY2F0aW9uQ2hhbGxlbmdlOndyYXBwZXIoYXV0aGVudGljYXRpb25DaGFsbGVuZ2UpIHNob3Vs ZEFsbG93RGVwcmVjYXRlZFRMUzptYWtlQmxvY2tQdHIoW2NoZWNrZXIgPSBXVEZNb3ZlKGNoZWNr ZXIpLCBjb21wbGV0aW9uSGFuZGxlciA9IFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpXShCT09M IHNob3VsZEFsbG93KSBtdXRhYmxlIHsKKyAgICAgICAgICAgIGlmIChjaGVja2VyLT5jb21wbGV0 aW9uSGFuZGxlckhhc0JlZW5DYWxsZWQoKSkKKyAgICAgICAgICAgICAgICByZXR1cm47CisgICAg ICAgICAgICBjaGVja2VyLT5kaWRDYWxsQ29tcGxldGlvbkhhbmRsZXIoKTsKKyAgICAgICAgICAg IGNvbXBsZXRpb25IYW5kbGVyKHNob3VsZEFsbG93KTsKKyAgICAgICAgfSkuZ2V0KCldOworICAg ICAgICByZXR1cm47CisgICAgfQogICAgIGF1dG8gY2hlY2tlciA9IENvbXBsZXRpb25IYW5kbGVy Q2FsbENoZWNrZXI6OmNyZWF0ZShuYXZpZ2F0aW9uRGVsZWdhdGUuZ2V0KCksIEBzZWxlY3Rvcihf d2ViVmlldzphdXRoZW50aWNhdGlvbkNoYWxsZW5nZTpzaG91bGRBbGxvd0xlZ2FjeVRMUzopKTsK ICAgICBbc3RhdGljX2Nhc3Q8aWQgPFdLTmF2aWdhdGlvbkRlbGVnYXRlUHJpdmF0ZT4+KG5hdmln YXRpb25EZWxlZ2F0ZS5nZXQoKSkgX3dlYlZpZXc6bV9uYXZpZ2F0aW9uU3RhdGUubV93ZWJWaWV3 IGF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlOndyYXBwZXIoYXV0aGVudGljYXRpb25DaGFsbGVuZ2Up IHNob3VsZEFsbG93TGVnYWN5VExTOm1ha2VCbG9ja1B0cihbY2hlY2tlciA9IFdURk1vdmUoY2hl Y2tlciksIGNvbXBsZXRpb25IYW5kbGVyID0gV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcildKEJP T0wgc2hvdWxkQWxsb3cpIG11dGFibGUgewogICAgICAgICBpZiAoY2hlY2tlci0+Y29tcGxldGlv bkhhbmRsZXJIYXNCZWVuQ2FsbGVkKCkpCkluZGV4OiBUb29scy9DaGFuZ2VMb2cKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gVG9vbHMvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNjA2NTkpCisrKyBUb29scy9DaGFuZ2VM b2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxOSBAQAorMjAyMC0wNC0yNCAgQWxleCBDaHJp c3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgorCisgICAgICAgIEFkZCBXS05hdmln YXRpb25EZWxlZ2F0ZSBBUEkgc2hvdWxkQWxsb3dEZXByZWNhdGVkVExTCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTA5ODEKKyAgICAgICAgPHJkYXI6 Ly9wcm9ibGVtLzYxNzQyOTc2PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9UTFNEZXByZWNh dGlvbi5tbToKKyAgICAgICAgKC1bVExTTmF2aWdhdGlvbkRlbGVnYXRlIHJlY2VpdmVkU2hvdWxk QWxsb3dEZXByZWNhdGVkVExTXSk6CisgICAgICAgICgtW1RMU05hdmlnYXRpb25EZWxlZ2F0ZSB3 ZWJWaWV3OmF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlOnNob3VsZEFsbG93RGVwcmVjYXRlZFRMUzpd KToKKyAgICAgICAgKFRlc3RXZWJLaXRBUEk6OlRFU1QpOgorICAgICAgICAoLVtUTFNOYXZpZ2F0 aW9uRGVsZWdhdGUgcmVjZWl2ZWRTaG91bGRBbGxvd0xlZ2FjeVRMU10pOiBEZWxldGVkLgorICAg ICAgICAoLVtUTFNOYXZpZ2F0aW9uRGVsZWdhdGUgX3dlYlZpZXc6YXV0aGVudGljYXRpb25DaGFs bGVuZ2U6c2hvdWxkQWxsb3dMZWdhY3lUTFM6XSk6IERlbGV0ZWQuCisgICAgICAgICogVGVzdFdl YktpdEFQSS9jb25maWcuaDoKKwogMjAyMC0wNC0yNCAgRGF2aWQgS2lsemVyICA8ZGRraWx6ZXJA YXBwbGUuY29tPgogCiAgICAgICAgIGNoZWNrLXdlYmtpdC1zdHlsZSBzaG91bGQgcmVjb2duaXpl ICpJbnRlcm5hbC5oIGFuZCAqUHJpdmF0ZS5oIGFzIHByaW1hcnkgaGVhZGVycwpJbmRleDogVG9v bHMvVGVzdFdlYktpdEFQSS9jb25maWcuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9UZXN0V2ViS2l0 QVBJL2NvbmZpZy5oCShyZXZpc2lvbiAyNjA2NTkpCisrKyBUb29scy9UZXN0V2ViS2l0QVBJL2Nv bmZpZy5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMjYsMyArMTI2LDcgQEAKICNpZiBQTEFURk9STShD T0NPQSkgJiYgIShQTEFURk9STShNQUMpICYmIF9fTUFDX09TX1hfVkVSU0lPTl9NSU5fUkVRVUlS RUQgPCAxMDE1MDApCiAjZGVmaW5lIEhBVkVfVExTX1BST1RPQ09MX1ZFUlNJT05fVCAxCiAjZW5k aWYKKworI2lmIChQTEFURk9STShNQUMpICYmIF9fTUFDX09TX1hfVkVSU0lPTl9NSU5fUkVRVUlS RUQgPj0gMTAxNjAwKSB8fCAoUExBVEZPUk0oSU9TX0ZBTUlMWSkgJiYgX19JUEhPTkVfT1NfVkVS U0lPTl9NSU5fUkVRVUlSRUQgPj0gMTQwMDAwKQorI2RlZmluZSBIQVZFX1RMU19WRVJTSU9OX0RV UklOR19DSEFMTEVOR0UgMQorI2VuZGlmCkluZGV4OiBUb29scy9UZXN0V2ViS2l0QVBJL1Rlc3Rz L1dlYktpdENvY29hL1RMU0RlcHJlY2F0aW9uLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1Rlc3RX ZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvVExTRGVwcmVjYXRpb24ubW0JKHJldmlzaW9uIDI2 MDY1OSkKKysrIFRvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvVExTRGVwcmVj YXRpb24ubW0JKHdvcmtpbmcgY29weSkKQEAgLTc0LDE0ICs3NCwxNCBAQCBAaW50ZXJmYWNlIFRM U05hdmlnYXRpb25EZWxlZ2F0ZSA6IE5TT2JqCiAtICh2b2lkKXdhaXRGb3JEaWRGaW5pc2hOYXZp Z2F0aW9uOwogLSAodm9pZCl3YWl0Rm9yRGlkRmFpbFByb3Zpc2lvbmFsTmF2aWdhdGlvbjsKIC0g KE5TVVJMQXV0aGVudGljYXRpb25DaGFsbGVuZ2UgKil3YWl0Rm9yRGlkTmVnb3RpYXRlTW9kZXJu VExTOwotLSAoYm9vbClyZWNlaXZlZFNob3VsZEFsbG93TGVnYWN5VExTOwotQHByb3BlcnR5IChu b25hdG9taWMpIGJvb2wgc2hvdWxkQWxsb3dMZWdhY3lUTFM7CistIChib29sKXJlY2VpdmVkU2hv dWxkQWxsb3dEZXByZWNhdGVkVExTOworQHByb3BlcnR5IChub25hdG9taWMpIGJvb2wgc2hvdWxk QWxsb3dEZXByZWNhdGVkVExTOwogQGVuZAogCiBAaW1wbGVtZW50YXRpb24gVExTTmF2aWdhdGlv bkRlbGVnYXRlIHsKICAgICBib29sIF9uYXZpZ2F0aW9uRmluaXNoZWQ7CiAgICAgYm9vbCBfbmF2 aWdhdGlvbkZhaWxlZDsKLSAgICBib29sIF9yZWNlaXZlZFNob3VsZEFsbG93TGVnYWN5VExTOwor ICAgIGJvb2wgX3JlY2VpdmVkU2hvdWxkQWxsb3dEZXByZWNhdGVkVExTOwogICAgIFJldGFpblB0 cjxOU1VSTEF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlPiBfbmVnb3RpYXRlZE1vZGVyblRMUzsKIH0K IApAQCAtMTA0LDkgKzEwNCw5IEBAIC0gKE5TVVJMQXV0aGVudGljYXRpb25DaGFsbGVuZ2UgKil3 YWl0Rm8KICAgICByZXR1cm4gX25lZ290aWF0ZWRNb2Rlcm5UTFMuYXV0b3JlbGVhc2UoKTsKIH0K IAotLSAoYm9vbClyZWNlaXZlZFNob3VsZEFsbG93TGVnYWN5VExTCistIChib29sKXJlY2VpdmVk U2hvdWxkQWxsb3dEZXByZWNhdGVkVExTCiB7Ci0gICAgcmV0dXJuIF9yZWNlaXZlZFNob3VsZEFs bG93TGVnYWN5VExTOworICAgIHJldHVybiBfcmVjZWl2ZWRTaG91bGRBbGxvd0RlcHJlY2F0ZWRU TFM7CiB9CiAKIC0gKHZvaWQpd2ViVmlldzooV0tXZWJWaWV3ICopd2ViVmlldyBkaWRSZWNlaXZl QXV0aGVudGljYXRpb25DaGFsbGVuZ2U6KE5TVVJMQXV0aGVudGljYXRpb25DaGFsbGVuZ2UgKilj aGFsbGVuZ2UgY29tcGxldGlvbkhhbmRsZXI6KHZvaWQgKF4pKE5TVVJMU2Vzc2lvbkF1dGhDaGFs bGVuZ2VEaXNwb3NpdGlvbiBkaXNwb3NpdGlvbiwgTlNVUkxDcmVkZW50aWFsICogY3JlZGVudGlh bCkpY29tcGxldGlvbkhhbmRsZXIKQEAgLTEyNSwxMCArMTI1LDEwIEBAIC0gKHZvaWQpd2ViVmll dzooV0tXZWJWaWV3ICopd2ViVmlldyBkaWQKICAgICBfbmF2aWdhdGlvbkZhaWxlZCA9IHRydWU7 CiB9CiAKLS0gKHZvaWQpX3dlYlZpZXc6KFdLV2ViVmlldyAqKXdlYlZpZXcgYXV0aGVudGljYXRp b25DaGFsbGVuZ2U6KE5TVVJMQXV0aGVudGljYXRpb25DaGFsbGVuZ2UgKiljaGFsbGVuZ2Ugc2hv dWxkQWxsb3dMZWdhY3lUTFM6KHZvaWQgKF4pKEJPT0wpKWNvbXBsZXRpb25IYW5kbGVyCistICh2 b2lkKXdlYlZpZXc6KFdLV2ViVmlldyAqKXdlYlZpZXcgYXV0aGVudGljYXRpb25DaGFsbGVuZ2U6 KE5TVVJMQXV0aGVudGljYXRpb25DaGFsbGVuZ2UgKiljaGFsbGVuZ2Ugc2hvdWxkQWxsb3dEZXBy ZWNhdGVkVExTOih2b2lkICheKShCT09MKSljb21wbGV0aW9uSGFuZGxlcgogewotICAgIF9yZWNl aXZlZFNob3VsZEFsbG93TGVnYWN5VExTID0gdHJ1ZTsKLSAgICBjb21wbGV0aW9uSGFuZGxlcihb c2VsZiBzaG91bGRBbGxvd0xlZ2FjeVRMU10pOworICAgIF9yZWNlaXZlZFNob3VsZEFsbG93RGVw cmVjYXRlZFRMUyA9IHRydWU7CisgICAgY29tcGxldGlvbkhhbmRsZXIoW3NlbGYgc2hvdWxkQWxs b3dEZXByZWNhdGVkVExTXSk7CiB9CiAKIC0gKHZvaWQpX3dlYlZpZXc6KFdLV2ViVmlldyAqKXdl YlZpZXcgZGlkTmVnb3RpYXRlTW9kZXJuVExTOihOU1VSTEF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdl ICopY2hhbGxlbmdlCkBAIC0xNTgsOCArMTU4LDkgQEAgVEVTVChUTFNWZXJzaW9uLCBEZWZhdWx0 QmVoYXZpb3IpCiAgICAgW2RlbGVnYXRlIHdhaXRGb3JEaWRGaW5pc2hOYXZpZ2F0aW9uXTsKIH0K IAotLy8gRklYTUU6IFRoaXMgdGVzdCBzaG91bGQgcmVtYWluIGRpc2FibGVkIHVudGlsIHJkYXI6 Ly9wcm9ibGVtLzU2NTIyNjAxIGlzIGZpeGVkLgotVEVTVChUTFNWZXJzaW9uLCBESVNBQkxFRF9O ZXR3b3JrU2Vzc2lvbikKKyNpZiBIQVZFKFRMU19WRVJTSU9OX0RVUklOR19DSEFMTEVOR0UpCisK K1RFU1QoVExTVmVyc2lvbiwgTmV0d29ya1Nlc3Npb24pCiB7CiAgICAgc3RhdGljIGF1dG8gZGVs ZWdhdGUgPSBhZG9wdE5TKFtUZXN0TmF2aWdhdGlvbkRlbGVnYXRlIG5ld10pOwogICAgIGF1dG8g bWFrZVdlYlZpZXdXaXRoID0gWyZdIChXS1dlYnNpdGVEYXRhU3RvcmUgKnN0b3JlKSB7CkBAIC0y MTYsMzMgKzIxNywzMyBAQCBURVNUKFRMU1ZlcnNpb24sIERJU0FCTEVEX05ldHdvcmtTZXNzaW9u CiAgICAgW1tOU1VzZXJEZWZhdWx0cyBzdGFuZGFyZFVzZXJEZWZhdWx0c10gcmVtb3ZlT2JqZWN0 Rm9yS2V5OmRlZmF1bHRzS2V5XTsKIH0KIAotLy8gRklYTUU6IFRoaXMgdGVzdCBzaG91bGQgcmVt YWluIGRpc2FibGVkIHVudGlsIHJkYXI6Ly9wcm9ibGVtLzU2NTIyNjAxIGlzIGZpeGVkLgotVEVT VChUTFNWZXJzaW9uLCBESVNBQkxFRF9OYXZpZ2F0aW9uRGVsZWdhdGVTUEkpCitURVNUKFRMU1Zl cnNpb24sIFNob3VsZEFsbG93RGVwcmVjYXRlZFRMUykKIHsKICAgICB7CiAgICAgICAgIGF1dG8g ZGVsZWdhdGUgPSBhZG9wdE5TKFtUTFNOYXZpZ2F0aW9uRGVsZWdhdGUgbmV3XSk7CiAgICAgICAg IFRDUFNlcnZlciBzZXJ2ZXIoVENQU2VydmVyOjpQcm90b2NvbDo6SFRUUFMsIFtdKFNTTCAqc3Ns KSB7Ci0gICAgICAgICAgICAvLyBGSVhNRTogVGhpcyBpcyBvbmx5IGlmIHdlIGhhdmUgdGhlIG5l dyBTUEkuCiAgICAgICAgICAgICBFWFBFQ1RfRkFMU0Uoc3NsKTsKICAgICAgICAgfSwgdGxzMV8x KTsKICAgICAgICAgYXV0byB3ZWJWaWV3ID0gYWRvcHROUyhbV0tXZWJWaWV3IG5ld10pOwogICAg ICAgICBbd2ViVmlldyBzZXROYXZpZ2F0aW9uRGVsZWdhdGU6ZGVsZWdhdGUuZ2V0KCldOwogICAg ICAgICBbd2ViVmlldyBsb2FkUmVxdWVzdDpbTlNVUkxSZXF1ZXN0IHJlcXVlc3RXaXRoVVJMOltO U1VSTCBVUkxXaXRoU3RyaW5nOltOU1N0cmluZyBzdHJpbmdXaXRoRm9ybWF0OkAiaHR0cHM6Ly8x MjcuMC4wLjE6JWQvIiwgc2VydmVyLnBvcnQoKV1dXV07CiAgICAgICAgIFtkZWxlZ2F0ZSB3YWl0 Rm9yRGlkRmFpbFByb3Zpc2lvbmFsTmF2aWdhdGlvbl07Ci0gICAgICAgIEVYUEVDVF9UUlVFKFtk ZWxlZ2F0ZSByZWNlaXZlZFNob3VsZEFsbG93TGVnYWN5VExTXSk7CisgICAgICAgIEVYUEVDVF9U UlVFKFtkZWxlZ2F0ZSByZWNlaXZlZFNob3VsZEFsbG93RGVwcmVjYXRlZFRMU10pOwogICAgIH0K ICAgICB7CiAgICAgICAgIGF1dG8gZGVsZWdhdGUgPSBhZG9wdE5TKFtUTFNOYXZpZ2F0aW9uRGVs ZWdhdGUgbmV3XSk7Ci0gICAgICAgIGRlbGVnYXRlLmdldCgpLnNob3VsZEFsbG93TGVnYWN5VExT ID0gWUVTOworICAgICAgICBkZWxlZ2F0ZS5nZXQoKS5zaG91bGRBbGxvd0RlcHJlY2F0ZWRUTFMg PSBZRVM7CiAgICAgICAgIFRDUFNlcnZlciBzZXJ2ZXIoVENQU2VydmVyOjpQcm90b2NvbDo6SFRU UFMsIFRDUFNlcnZlcjo6cmVzcG9uZFdpdGhPSywgdGxzMV8xKTsKICAgICAgICAgYXV0byB3ZWJW aWV3ID0gYWRvcHROUyhbV0tXZWJWaWV3IG5ld10pOwogICAgICAgICBbd2ViVmlldyBzZXROYXZp Z2F0aW9uRGVsZWdhdGU6ZGVsZWdhdGUuZ2V0KCldOwogICAgICAgICBbd2ViVmlldyBsb2FkUmVx dWVzdDpbTlNVUkxSZXF1ZXN0IHJlcXVlc3RXaXRoVVJMOltOU1VSTCBVUkxXaXRoU3RyaW5nOltO U1N0cmluZyBzdHJpbmdXaXRoRm9ybWF0OkAiaHR0cHM6Ly8xMjcuMC4wLjE6JWQvIiwgc2VydmVy LnBvcnQoKV1dXV07CiAgICAgICAgIFtkZWxlZ2F0ZSB3YWl0Rm9yRGlkRmluaXNoTmF2aWdhdGlv bl07Ci0gICAgICAgIEVYUEVDVF9UUlVFKFtkZWxlZ2F0ZSByZWNlaXZlZFNob3VsZEFsbG93TGVn YWN5VExTXSk7CisgICAgICAgIEVYUEVDVF9UUlVFKFtkZWxlZ2F0ZSByZWNlaXZlZFNob3VsZEFs bG93RGVwcmVjYXRlZFRMU10pOwogICAgIH0KIH0KIAorI2VuZGlmIC8vIEhBVkUoVExTX1ZFUlNJ T05fRFVSSU5HX0NIQUxMRU5HRSkKKwogI2lmIEhBVkUoTkVUV09SS19GUkFNRVdPUkspICYmIEhB VkUoVExTX1BST1RPQ09MX1ZFUlNJT05fVCkKIAogc3RhdGljIHN0ZDo6cGFpcjxSZXRhaW5QdHI8 V0tXZWJWaWV3PiwgUmV0YWluUHRyPFRlc3ROYXZpZ2F0aW9uRGVsZWdhdGU+PiB3ZWJWaWV3V2l0 aE5hdmlnYXRpb25EZWxlZ2F0ZSgpCg==