227220 2021-06-21 09:24:13 -0700 [WK2] Don't process-swap on navigations within the same non-HTTP(s) protocol 2021-06-21 17:45:20 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 cdumez cdumez aakash_jain achristensen ap beidson ggaren kkinnunen ryanhaddad thorton webkit-bot-watchers-bugzilla webkit-bug-importer oldest_to_newest 1771315 0 cdumez 2021-06-21 09:24:13 -0700 Don't process-swap on navigations within the same non-HTTP(s) protocol. Trying to extract registrable domains from non HTTP(s) URLs does not make much sense and leads to unexpected process swaps. 1771316 1 431870 cdumez 2021-06-21 09:26:03 -0700 Created attachment 431870 Patch 1771317 2 cdumez 2021-06-21 09:26:30 -0700 <rdar://79106461> 1771346 3 431877 cdumez 2021-06-21 10:54:41 -0700 Created attachment 431877 Patch 1771428 4 ews-feeder 2021-06-21 13:47:35 -0700 Committed r279079 (238998@main): <https://commits.webkit.org/238998@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 431877. 1771478 5 aakash_jain 2021-06-21 15:09:31 -0700 (In reply to EWS from comment #4) > Committed r279079 (238998@main): <https://commits.webkit.org/238998@main> Seems like it broke api-gtk test /WebKit2Gtk/TestWebExtensions:/webkit/WebKitWebExtension/page-id 1771480 6 cdumez 2021-06-21 15:17:24 -0700 (In reply to Aakash Jain from comment #5) > (In reply to EWS from comment #4) > > Committed r279079 (238998@main): <https://commits.webkit.org/238998@main> > Seems like it broke api-gtk test > /WebKit2Gtk/TestWebExtensions:/webkit/WebKitWebExtension/page-id I'll see if I can figure it out but did we ever change the rule that WK2 changes were allowed to break non-Cocoa ports to not hold back development? 1771481 7 cdumez 2021-06-21 15:21:07 -0700 The GTK test is observing process swaps by checking if the pageID changed or not. Should be easy to update the test. Looking into it now. 1771484 8 cdumez 2021-06-21 15:23:50 -0700 Reopening to attach new patch. 1771485 9 431917 cdumez 2021-06-21 15:23:51 -0700 Created attachment 431917 Follow-up to fix GTK API test 1771487 10 aakash_jain 2021-06-21 15:26:12 -0700 > I'll see if I can figure it out but did we ever change the rule that WK2 changes were allowed to break non-Cocoa ports to not hold back development? Thanks. I am not sure of the exact rule. However, this test breakage is slowing does https://ews-build.webkit.org/#/builders/API-Tests-GTK-EWS queue. This would result in progressively increasing delay in getting ews results on that queue, which might result in reduced coverage and thereby causing more regressions on that queue. From maintaining the infrastructure point of view, it's important to keep the test-suites in good state. 1771489 11 cdumez 2021-06-21 15:28:00 -0700 (In reply to Aakash Jain from comment #10) > > I'll see if I can figure it out but did we ever change the rule that WK2 changes were allowed to break non-Cocoa ports to not hold back development? > Thanks. I am not sure of the exact rule. However, this test breakage is > slowing does https://ews-build.webkit.org/#/builders/API-Tests-GTK-EWS > queue. This would result in progressively increasing delay in getting ews > results on that queue, which might result in reduced coverage and thereby > causing more regressions on that queue. From maintaining the infrastructure > point of view, it's important to keep the test-suites in good state. Understood. I think breaking other ports is bad practice either way, I was just surprised to get ping'd by Apple about it. I have a speculative fix ready but am waiting for EWS to process and confirm it works since I cannot validate locally. 1771550 12 ews-feeder 2021-06-21 17:45:18 -0700 Committed r279095 (239012@main): <https://commits.webkit.org/239012@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 431917. 431870 2021-06-21 09:26:03 -0700 2021-06-21 10:54:39 -0700 Patch bug-227220-20210621092602.patch text/plain 12826 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjc5MDY2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDAwNjlkOTBmNjFlODVkZTc0 YmE3OTM4Njk5YjNiNDAyYTYyNTM4ODYuLmY5ZmNiNmUzMTg4OGRkYWFmNDk0YWQ5NzIwZDZlM2Zj YzZmYjEyYTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUgQEAKKzIwMjEtMDYtMjEgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBbV0syXSBEb24ndCBwcm9jZXNzLXN3 YXAgb24gbmF2aWdhdGlvbnMgd2l0aGluIHRoZSBzYW1lIG5vbi1IVFRQKHMpIHByb3RvY29sCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjcyMjAKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBEb24ndCBwcm9j ZXNzLXN3YXAgb24gbmF2aWdhdGlvbnMgd2l0aGluIHRoZSBzYW1lIG5vbi1IVFRQKHMpIHByb3Rv Y29sLiBUcnlpbmcgdG8gZXh0cmFjdCByZWdpc3RyYWJsZSBkb21haW5zCisgICAgICAgIGZyb20g bm9uLUhUVFAocykgVVJMcyBkb2VzIG5vdCBtYWtlIG11Y2ggc2Vuc2UgYW5kIGxlYWRzIHRvIHVu ZXhwZWN0ZWQgcHJvY2VzcyBzd2Fwcy4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQVBJUHJv Y2Vzc1Bvb2xDb25maWd1cmF0aW9uLmNwcDoKKyAgICAgICAgKEFQSTo6UHJvY2Vzc1Bvb2xDb25m aWd1cmF0aW9uOjpjb3B5KToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0FQSVByb2Nlc3NQb29s Q29uZmlndXJhdGlvbi5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLUHJvY2Vz c1Bvb2xDb25maWd1cmF0aW9uLmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tQ cm9jZXNzUG9vbENvbmZpZ3VyYXRpb24ubW06CisgICAgICAgICgtW19XS1Byb2Nlc3NQb29sQ29u ZmlndXJhdGlvbiBzZXRQcm9jZXNzU3dhcHNPbk5hdmlnYXRpb25XaXRoaW5TYW1lTm9uSFRUUEZh bWlseVByb3RvY29sOl0pOgorICAgICAgICAoLVtfV0tQcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24g cHJvY2Vzc1N3YXBzT25OYXZpZ2F0aW9uV2l0aGluU2FtZU5vbkhUVFBGYW1pbHlQcm90b2NvbF0p OgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHA6CisgICAgICAgIChXZWJL aXQ6OldlYlByb2Nlc3NQb29sOjpwcm9jZXNzRm9yTmF2aWdhdGlvbkludGVybmFsKToKKyAgICAg ICAgKiBVSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2Vi UHJvY2Vzc1Byb3h5OjpkaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvck1haW5GcmFtZSk6CisKIDIw MjEtMDYtMjAgIFdlbnNvbiBIc2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CiAKICAgICAg ICAgW21hY09TXSBSZW5hbWUgV0tWaXN1YWxTZWFyY2hQcmV2aWV3Q29udHJvbGxlciB0byBXS1F1 aWNrTG9va1ByZXZpZXdDb250cm9sbGVyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9BUEkvQVBJUHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uLmNwcCBiL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL0FQSS9BUElQcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24uY3BwCmluZGV4IGQxNmVk Nzc1M2ZhNTlmYzg3ZWE5NDAyZjVmZjQ4NzI1MjVlZDMyZjYuLjk1ZmZlMDU4NGNhYTcxOTExZGFi Y2U2MTlkODQyOWRmNTVkYWVjZTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L0FQSS9BUElQcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24uY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL0FQSS9BUElQcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24uY3BwCkBAIC02NCw2ICs2 NCw3IEBAIFJlZjxQcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24+IFByb2Nlc3NQb29sQ29uZmlndXJh dGlvbjo6Y29weSgpCiAgICAgY29weS0+bV9wcm9jZXNzU3dhcHNPbk5hdmlnYXRpb25Gcm9tRXhw ZXJpbWVudGFsRmVhdHVyZXMgPSB0aGlzLT5tX3Byb2Nlc3NTd2Fwc09uTmF2aWdhdGlvbkZyb21F eHBlcmltZW50YWxGZWF0dXJlczsKICAgICBjb3B5LT5tX2Fsd2F5c0tlZXBBbmRSZXVzZVN3YXBw ZWRQcm9jZXNzZXMgPSB0aGlzLT5tX2Fsd2F5c0tlZXBBbmRSZXVzZVN3YXBwZWRQcm9jZXNzZXM7 CiAgICAgY29weS0+bV9wcm9jZXNzU3dhcHNPbldpbmRvd09wZW5XaXRoT3BlbmVyID0gdGhpcy0+ bV9wcm9jZXNzU3dhcHNPbldpbmRvd09wZW5XaXRoT3BlbmVyOworICAgIGNvcHktPm1fcHJvY2Vz c1N3YXBzT25OYXZpZ2F0aW9uV2l0aGluU2FtZU5vbkhUVFBGYW1pbHlQcm90b2NvbCA9IHRoaXMt Pm1fcHJvY2Vzc1N3YXBzT25OYXZpZ2F0aW9uV2l0aGluU2FtZU5vbkhUVFBGYW1pbHlQcm90b2Nv bDsKICAgICBjb3B5LT5tX2lzQXV0b21hdGljUHJvY2Vzc1dhcm1pbmdFbmFibGVkQnlDbGllbnQg PSB0aGlzLT5tX2lzQXV0b21hdGljUHJvY2Vzc1dhcm1pbmdFbmFibGVkQnlDbGllbnQ7CiAgICAg Y29weS0+bV91c2VzV2ViUHJvY2Vzc0NhY2hlID0gdGhpcy0+bV91c2VzV2ViUHJvY2Vzc0NhY2hl OwogICAgIGNvcHktPm1fdXNlc0JhY2tGb3J3YXJkQ2FjaGUgPSB0aGlzLT5tX3VzZXNCYWNrRm9y d2FyZENhY2hlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0FQSVBy b2Nlc3NQb29sQ29uZmlndXJhdGlvbi5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0FQ SVByb2Nlc3NQb29sQ29uZmlndXJhdGlvbi5oCmluZGV4IDlmYjJkNjNmNjE0ZTFlZDc5ZGEzZmJh MTgyNmU4OWZjNWJkNzM3YjQuLmZhNjlhNGI0NTdlZTMxY2VjNzg3NjVlMjYyYjBhZjEzZmU0MGI4 N2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9BUElQcm9jZXNzUG9v bENvbmZpZ3VyYXRpb24uaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQVBJUHJv Y2Vzc1Bvb2xDb25maWd1cmF0aW9uLmgKQEAgLTEyOCw2ICsxMjgsOSBAQCBwdWJsaWM6CiAgICAg Ym9vbCBhbHdheXNLZWVwQW5kUmV1c2VTd2FwcGVkUHJvY2Vzc2VzKCkgY29uc3QgeyByZXR1cm4g bV9hbHdheXNLZWVwQW5kUmV1c2VTd2FwcGVkUHJvY2Vzc2VzOyB9CiAgICAgdm9pZCBzZXRBbHdh eXNLZWVwQW5kUmV1c2VTd2FwcGVkUHJvY2Vzc2VzKGJvb2wga2VlcEFuZFJldXNlKSB7IG1fYWx3 YXlzS2VlcEFuZFJldXNlU3dhcHBlZFByb2Nlc3NlcyA9IGtlZXBBbmRSZXVzZTsgfQogCisgICAg Ym9vbCBwcm9jZXNzU3dhcHNPbk5hdmlnYXRpb25XaXRoaW5TYW1lTm9uSFRUUEZhbWlseVByb3Rv Y29sKCkgY29uc3QgeyByZXR1cm4gbV9wcm9jZXNzU3dhcHNPbk5hdmlnYXRpb25XaXRoaW5TYW1l Tm9uSFRUUEZhbWlseVByb3RvY29sOyB9CisgICAgdm9pZCBzZXRQcm9jZXNzU3dhcHNPbk5hdmln YXRpb25XaXRoaW5TYW1lTm9uSFRUUEZhbWlseVByb3RvY29sKGJvb2wgc3dhcHMpIHsgbV9wcm9j ZXNzU3dhcHNPbk5hdmlnYXRpb25XaXRoaW5TYW1lTm9uSFRUUEZhbWlseVByb3RvY29sID0gc3dh cHM7IH0KKwogICAgIGJvb2wgcHJvY2Vzc1N3YXBzT25XaW5kb3dPcGVuV2l0aE9wZW5lcigpIGNv bnN0IHsgcmV0dXJuIG1fcHJvY2Vzc1N3YXBzT25XaW5kb3dPcGVuV2l0aE9wZW5lcjsgfQogICAg IHZvaWQgc2V0UHJvY2Vzc1N3YXBzT25XaW5kb3dPcGVuV2l0aE9wZW5lcihib29sIHN3YXBzKSB7 IG1fcHJvY2Vzc1N3YXBzT25XaW5kb3dPcGVuV2l0aE9wZW5lciA9IHN3YXBzOyB9CiAKQEAgLTE2 OSw2ICsxNzIsNyBAQCBwcml2YXRlOgogICAgIGJvb2wgbV9wcm9jZXNzU3dhcHNPbk5hdmlnYXRp b25Gcm9tRXhwZXJpbWVudGFsRmVhdHVyZXMgeyBmYWxzZSB9OwogICAgIGJvb2wgbV9hbHdheXNL ZWVwQW5kUmV1c2VTd2FwcGVkUHJvY2Vzc2VzIHsgZmFsc2UgfTsKICAgICBib29sIG1fcHJvY2Vz c1N3YXBzT25XaW5kb3dPcGVuV2l0aE9wZW5lciB7IGZhbHNlIH07CisgICAgYm9vbCBtX3Byb2Nl c3NTd2Fwc09uTmF2aWdhdGlvbldpdGhpblNhbWVOb25IVFRQRmFtaWx5UHJvdG9jb2wgeyBmYWxz ZSB9OwogICAgIHN0ZDo6b3B0aW9uYWw8Ym9vbD4gbV9pc0F1dG9tYXRpY1Byb2Nlc3NXYXJtaW5n RW5hYmxlZEJ5Q2xpZW50OwogICAgIGJvb2wgbV91c2VzV2ViUHJvY2Vzc0NhY2hlIHsgZmFsc2Ug fTsKICAgICBib29sIG1fdXNlc0JhY2tGb3J3YXJkQ2FjaGUgeyB0cnVlIH07CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLUHJvY2Vzc1Bvb2xDb25maWd1 cmF0aW9uLmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLUHJvY2Vzc1Bv b2xDb25maWd1cmF0aW9uLmgKaW5kZXggZDRiNjUxNzdmOWZlNTkzNTEwYmVhNjQ4MzJkNDI1NTY5 M2JlNTRiMy4uMDgwNjQzZmUyMmY3MDRkZjJiYWQ3NzRiNzVmMTNkNGUwMGM4MWM1MCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL19XS1Byb2Nlc3NQb29sQ29u ZmlndXJhdGlvbi5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tQ cm9jZXNzUG9vbENvbmZpZ3VyYXRpb24uaApAQCAtNjcsNiArNjcsNyBAQCBXS19DTEFTU19BVkFJ TEFCTEUobWFjb3MoMTAuMTApLCBpb3MoOC4wKSkKIEBwcm9wZXJ0eSAobm9uYXRvbWljKSBCT09M IHByb2Nlc3NTd2Fwc09uTmF2aWdhdGlvbiBXS19BUElfQVZBSUxBQkxFKG1hY29zKDEwLjE0KSwg aW9zKDEyLjApKTsKIEBwcm9wZXJ0eSAobm9uYXRvbWljKSBCT09MIGFsd2F5c0tlZXBBbmRSZXVz ZVN3YXBwZWRQcm9jZXNzZXMgV0tfQVBJX0FWQUlMQUJMRShtYWNvcygxMC4xNCksIGlvcygxMi4w KSk7CiBAcHJvcGVydHkgKG5vbmF0b21pYykgQk9PTCBwcm9jZXNzU3dhcHNPbldpbmRvd09wZW5X aXRoT3BlbmVyIFdLX0FQSV9BVkFJTEFCTEUobWFjb3MoMTAuMTQpLCBpb3MoMTIuMCkpOworQHBy b3BlcnR5IChub25hdG9taWMpIEJPT0wgcHJvY2Vzc1N3YXBzT25OYXZpZ2F0aW9uV2l0aGluU2Ft ZU5vbkhUVFBGYW1pbHlQcm90b2NvbCBXS19BUElfQVZBSUxBQkxFKG1hY29zKFdLX01BQ19UQkEp LCBpb3MoV0tfSU9TX1RCQSkpOwogQHByb3BlcnR5IChub25hdG9taWMpIEJPT0wgcHJld2FybXNQ cm9jZXNzZXNBdXRvbWF0aWNhbGx5IFdLX0FQSV9BVkFJTEFCTEUobWFjb3MoMTAuMTQuNCksIGlv cygxMi4yKSk7CiBAcHJvcGVydHkgKG5vbmF0b21pYykgQk9PTCB1c2VzV2ViUHJvY2Vzc0NhY2hl IFdLX0FQSV9BVkFJTEFCTEUobWFjb3MoMTAuMTQuNCksIGlvcygxMi4yKSk7CiBAcHJvcGVydHkg KG5vbmF0b21pYykgQk9PTCBwYWdlQ2FjaGVFbmFibGVkIFdLX0FQSV9BVkFJTEFCTEUobWFjb3Mo MTAuMTQpLCBpb3MoMTIuMCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv QVBJL0NvY29hL19XS1Byb2Nlc3NQb29sQ29uZmlndXJhdGlvbi5tbSBiL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tQcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24ubW0KaW5kZXgg OTNkMGIxZWQ4MDZlZTY5OGJkZjUxYTcwMjJiMGNiNWVhYmJhYTk0My4uZTIzMzE0YTI5MDRjNzgx Y2EyM2E5ZjhkOTA2Mjk5NzQwNjc3NzU5ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvQVBJL0NvY29hL19XS1Byb2Nlc3NQb29sQ29uZmlndXJhdGlvbi5tbQorKysgYi9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLUHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9u Lm1tCkBAIC0yODUsNiArMjg1LDE2IEBAIC0gKEJPT0wpcHJvY2Vzc1N3YXBzT25XaW5kb3dPcGVu V2l0aE9wZW5lcgogICAgIHJldHVybiBfcHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uLT5wcm9jZXNz U3dhcHNPbldpbmRvd09wZW5XaXRoT3BlbmVyKCk7CiB9CiAKKy0gKHZvaWQpc2V0UHJvY2Vzc1N3 YXBzT25OYXZpZ2F0aW9uV2l0aGluU2FtZU5vbkhUVFBGYW1pbHlQcm90b2NvbDooQk9PTClzd2Fw cworeworICAgIF9wcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24tPnNldFByb2Nlc3NTd2Fwc09uTmF2 aWdhdGlvbldpdGhpblNhbWVOb25IVFRQRmFtaWx5UHJvdG9jb2woc3dhcHMpOworfQorCistIChC T09MKXByb2Nlc3NTd2Fwc09uTmF2aWdhdGlvbldpdGhpblNhbWVOb25IVFRQRmFtaWx5UHJvdG9j b2wKK3sKKyAgICByZXR1cm4gX3Byb2Nlc3NQb29sQ29uZmlndXJhdGlvbi0+cHJvY2Vzc1N3YXBz T25OYXZpZ2F0aW9uV2l0aGluU2FtZU5vbkhUVFBGYW1pbHlQcm90b2NvbCgpOworfQorCiAtIChC T09MKXBhZ2VDYWNoZUVuYWJsZWQKIHsKICAgICByZXR1cm4gX3Byb2Nlc3NQb29sQ29uZmlndXJh dGlvbi0+dXNlc0JhY2tGb3J3YXJkQ2FjaGUoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dl YlByb2Nlc3NQb29sLmNwcAppbmRleCBiMjc2ODU3Njk0NDVlYzdhMTU3NjZhOTZlNGQ5YWM2OTAy MWZjYzgxLi45YjViNmE0ODQ3N2QwNTM0ODI2ZTdiODk4NTY2ZjhiZTBjMjhiMmU0IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHAKKysrIGIvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwCkBAIC0xODQ0LDYgKzE4NDQs MTAgQEAgdm9pZCBXZWJQcm9jZXNzUG9vbDo6cHJvY2Vzc0Zvck5hdmlnYXRpb25JbnRlcm5hbChX ZWJQYWdlUHJveHkmIHBhZ2UsIGNvbnN0IEFQSToKICAgICAgICAgV0VCUFJPQ0VTU1BPT0xfUkVM RUFTRV9MT0coUHJvY2Vzc1N3YXBwaW5nLCAicHJvY2Vzc0Zvck5hdmlnYXRpb25JbnRlcm5hbDog VXNpbmcgcmVsYXRlZCBwYWdlJ3MgVVJMIGFzIHNvdXJjZSBVUkwgZm9yIHByb2Nlc3Mgc3dhcCBk ZWNpc2lvbiAocGFnZT0lcCkiLCBwYWdlLmNvbmZpZ3VyYXRpb24oKS5yZWxhdGVkUGFnZSgpKTsK ICAgICB9CiAKKyAgICAvLyBGb3Igbm9uLUhUVFAocykgVVJMcywgd2Ugb25seSBzd2FwIHdoZW4g bmF2aWdhdGluZyB0byBhIG5ldyBzY2hlbWUsIHVubGVzcyBwcm9jZXNzU3dhcHNPbk5hdmlnYXRp b25XaXRoaW5TYW1lTm9uSFRUUEZhbWlseVByb3RvY29sIGlzIHNldC4KKyAgICBpZiAoIW1fY29u ZmlndXJhdGlvbi0+cHJvY2Vzc1N3YXBzT25OYXZpZ2F0aW9uV2l0aGluU2FtZU5vbkhUVFBGYW1p bHlQcm90b2NvbCgpICYmICFzb3VyY2VVUkwucHJvdG9jb2xJc0luSFRUUEZhbWlseSgpICYmIHNv dXJjZVVSTC5wcm90b2NvbCgpID09IHRhcmdldFVSTC5wcm90b2NvbCgpKQorICAgICAgICByZXR1 cm4gY29tcGxldGlvbkhhbmRsZXIoV1RGTW92ZShzb3VyY2VQcm9jZXNzKSwgbnVsbHB0ciwgIk5h dmlnYXRpb24gd2l0aGluIHRoZSBzYW1lIG5vbi1IVFRQKHMpIHByb3RvY29sIl9zKTsKKwogICAg IGlmICghc291cmNlVVJMLmlzVmFsaWQoKSB8fCAhdGFyZ2V0VVJMLmlzVmFsaWQoKSB8fCBzb3Vy Y2VVUkwuaXNFbXB0eSgpIHx8IHNvdXJjZVVSTC5wcm90b2NvbElzQWJvdXQoKSB8fCB0YXJnZXRS ZWdpc3RyYWJsZURvbWFpbi5tYXRjaGVzKHNvdXJjZVVSTCkpCiAgICAgICAgIHJldHVybiBjb21w bGV0aW9uSGFuZGxlcihXVEZNb3ZlKHNvdXJjZVByb2Nlc3MpLCBudWxscHRyLCAiTmF2aWdhdGlv biBpcyBzYW1lLXNpdGUiX3MpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9XZWJQcm9jZXNzUHJveHkuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vz c1Byb3h5LmNwcAppbmRleCBhMTRmZjVhNTg2MTI1OWI0YzVkY2ZmZDRmNjBkZTY2MGQ3ZTFkYjU3 Li4xMDdhMmJiMGY1MzcyMDUwMTkyMjY2NDAzZGZjZDk1Y2NhNzBhNWMzIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuY3BwCisrKyBiL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5jcHAKQEAgLTE2MjYsNiArMTYyNiwxMyBA QCB2b2lkIFdlYlByb2Nlc3NQcm94eTo6ZGlkU3RhcnRQcm92aXNpb25hbExvYWRGb3JNYWluRnJh bWUoY29uc3QgVVJMJiB1cmwpCiAgICAgaWYgKHVybC5wcm90b2NvbElzQWJvdXQoKSkKICAgICAg ICAgcmV0dXJuOwogCisgICAgaWYgKCF1cmwucHJvdG9jb2xJc0luSFRUUEZhbWlseSgpICYmICFw cm9jZXNzUG9vbCgpLmNvbmZpZ3VyYXRpb24oKS5wcm9jZXNzU3dhcHNPbk5hdmlnYXRpb25XaXRo aW5TYW1lTm9uSFRUUEZhbWlseVByb3RvY29sKCkpIHsKKyAgICAgICAgLy8gVW5sZXNzIHRoZSBw cm9jZXNzU3dhcHNPbk5hdmlnYXRpb25XaXRoaW5TYW1lTm9uSFRUUEZhbWlseVByb3RvY29sIGZs YWcgaXMgc2V0LCB3ZSBkb24ndCBwcm9jZXNzIHN3YXAgb24gbmF2aWdhdGlvbnMgd2l0aGluZyB0 aGUgc2FtZQorICAgICAgICAvLyBub24gSFRUUChzKSBwcm90b2NvbC4gRm9yIHRoaXMgcmVhc29u LCB3ZSBpZ25vcmUgdGhlIHJlZ2lzdHJhYmxlIGRvbWFpbiBhbmQgcHJvY2Vzc2VzIGFyZSBub3Qg ZWxpZ2libGUgZm9yIHRoZSBwcm9jZXNzIGNhY2hlLgorICAgICAgICBtX3JlZ2lzdHJhYmxlRG9t YWluID0gV2ViQ29yZTo6UmVnaXN0cmFibGVEb21haW4geyB9OworICAgICAgICByZXR1cm47Cisg ICAgfQorCiAgICAgYXV0byByZWdpc3RyYWJsZURvbWFpbiA9IFdlYkNvcmU6OlJlZ2lzdHJhYmxl RG9tYWluIHsgdXJsIH07CiAgICAgaWYgKG1fcmVnaXN0cmFibGVEb21haW4gJiYgKm1fcmVnaXN0 cmFibGVEb21haW4gIT0gcmVnaXN0cmFibGVEb21haW4pIHsKICNpZiBFTkFCTEUoU0VSVklDRV9X T1JLRVIpCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5k ZXggZWZhYzUzMzVjZjk1NDYzZjkyOWE5NWU4MDU4YjcxZGRjYzljMmRhZi4uNzI2YjFiYWY0NjQ4 NGM4OTQ3OTI0NzdhNGIxODA2MzczZmViZDcyYiAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9n CisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIxLTA2LTIxICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgW1dLMl0gRG9uJ3QgcHJvY2Vz cy1zd2FwIG9uIG5hdmlnYXRpb25zIHdpdGhpbiB0aGUgc2FtZSBub24tSFRUUChzKSBwcm90b2Nv bAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI3MjIw CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIEFQ SSB0ZXN0IGNvdmVyYWdlLgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRD b2NvYS9Qcm9jZXNzU3dhcE9uTmF2aWdhdGlvbi5tbToKKwogMjAyMS0wNi0xOSAgQ29tbWl0IFF1 ZXVlICA8Y29tbWl0LXF1ZXVlQHdlYmtpdC5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcmV2 ZXJ0aW5nIHIyNzg2OTkuCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dl YktpdENvY29hL1Byb2Nlc3NTd2FwT25OYXZpZ2F0aW9uLm1tIGIvVG9vbHMvVGVzdFdlYktpdEFQ SS9UZXN0cy9XZWJLaXRDb2NvYS9Qcm9jZXNzU3dhcE9uTmF2aWdhdGlvbi5tbQppbmRleCBhN2Nm MjA0NzBhYzA2OGQ2MmRmMmVlOTAwZTE2ODIyM2Y2MWFmYjc0Li5mOWI4ZGFmNjlmNDQ3NDI3OTVm ZDhmOTE2YzZmNmY4NWI0MGU0ODYxIDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rl c3RzL1dlYktpdENvY29hL1Byb2Nlc3NTd2FwT25OYXZpZ2F0aW9uLm1tCisrKyBiL1Rvb2xzL1Rl c3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvUHJvY2Vzc1N3YXBPbk5hdmlnYXRpb24ubW0K QEAgLTUwNiw2ICs1MDYsNyBAQCBzdGF0aWMgUmV0YWluUHRyPF9XS1Byb2Nlc3NQb29sQ29uZmln dXJhdGlvbj4gcHNvblByb2Nlc3NQb29sQ29uZmlndXJhdGlvbigpCiAgICAgcHJvY2Vzc1Bvb2xD b25maWd1cmF0aW9uLmdldCgpLnByb2Nlc3NTd2Fwc09uTmF2aWdhdGlvbiA9IFlFUzsKICAgICBw cm9jZXNzUG9vbENvbmZpZ3VyYXRpb24uZ2V0KCkudXNlc1dlYlByb2Nlc3NDYWNoZSA9IFlFUzsK ICAgICBwcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24uZ2V0KCkucHJld2FybXNQcm9jZXNzZXNBdXRv bWF0aWNhbGx5ID0gWUVTOworICAgIHByb2Nlc3NQb29sQ29uZmlndXJhdGlvbi5nZXQoKS5wcm9j ZXNzU3dhcHNPbk5hdmlnYXRpb25XaXRoaW5TYW1lTm9uSFRUUEZhbWlseVByb3RvY29sID0gWUVT OwogICAgIHJldHVybiBwcm9jZXNzUG9vbENvbmZpZ3VyYXRpb247CiB9CiAKQEAgLTU2Niw2ICs1 NjcsNTcgQEAgVEVTVChQcm9jZXNzU3dhcCwgQmFzaWNXaXRoQXN5bmNTY2hlbWVIYW5kbGVyKQog ICAgIHJ1bkJhc2ljVGVzdChTY2hlbWVIYW5kbGVyU2hvdWxkQmVBc3luYzo6WWVzKTsKIH0KIAor VEVTVChQcm9jZXNzU3dhcCwgTm9Qcm9jZXNzU3dhcHBpbmdXaXRoaW5TYW1lTm9uSFRUUEZhbWls eVByb3RvY29sKQoreworICAgIGF1dG8gcHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uID0gcHNvblBy b2Nlc3NQb29sQ29uZmlndXJhdGlvbigpOworICAgIHByb2Nlc3NQb29sQ29uZmlndXJhdGlvbi5n ZXQoKS5wcm9jZXNzU3dhcHNPbk5hdmlnYXRpb25XaXRoaW5TYW1lTm9uSFRUUEZhbWlseVByb3Rv Y29sID0gTk87CisgICAgYXV0byBwcm9jZXNzUG9vbCA9IGFkb3B0TlMoW1tXS1Byb2Nlc3NQb29s IGFsbG9jXSBfaW5pdFdpdGhDb25maWd1cmF0aW9uOnByb2Nlc3NQb29sQ29uZmlndXJhdGlvbi5n ZXQoKV0pOworCisgICAgYXV0byB3ZWJWaWV3Q29uZmlndXJhdGlvbiA9IGFkb3B0TlMoW1tXS1dl YlZpZXdDb25maWd1cmF0aW9uIGFsbG9jXSBpbml0XSk7CisgICAgW3dlYlZpZXdDb25maWd1cmF0 aW9uIHNldFByb2Nlc3NQb29sOnByb2Nlc3NQb29sLmdldCgpXTsKKyAgICBhdXRvIGhhbmRsZXIg PSBhZG9wdE5TKFtbUFNPTlNjaGVtZSBhbGxvY10gaW5pdF0pOworICAgIFt3ZWJWaWV3Q29uZmln dXJhdGlvbiBzZXRVUkxTY2hlbWVIYW5kbGVyOmhhbmRsZXIuZ2V0KCkgZm9yVVJMU2NoZW1lOkAi Q1VTVE9NIl07CisKKyAgICBhdXRvIHdlYlZpZXcgPSBhZG9wdE5TKFtbV0tXZWJWaWV3IGFsbG9j XSBpbml0V2l0aEZyYW1lOk5TTWFrZVJlY3QoMCwgMCwgODAwLCA2MDApIGNvbmZpZ3VyYXRpb246 d2ViVmlld0NvbmZpZ3VyYXRpb24uZ2V0KCldKTsKKyAgICBhdXRvIGRlbGVnYXRlID0gYWRvcHRO UyhbW1BTT05OYXZpZ2F0aW9uRGVsZWdhdGUgYWxsb2NdIGluaXRdKTsKKyAgICBbd2ViVmlldyBz ZXROYXZpZ2F0aW9uRGVsZWdhdGU6ZGVsZWdhdGUuZ2V0KCldOworCisgICAgTlNVUkxSZXF1ZXN0 ICpyZXF1ZXN0ID0gW05TVVJMUmVxdWVzdCByZXF1ZXN0V2l0aFVSTDpbTlNVUkwgVVJMV2l0aFN0 cmluZzpAImN1c3RvbTovL2FiYy9tYWluMS5odG1sIl1dOworICAgIFt3ZWJWaWV3IGxvYWRSZXF1 ZXN0OnJlcXVlc3RdOworICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmZG9uZSk7CisgICAg ZG9uZSA9IGZhbHNlOworCisgICAgYXV0byBwaWQxID0gW3dlYlZpZXcgX3dlYlByb2Nlc3NJZGVu dGlmaWVyXTsKKworICAgIHJlcXVlc3QgPSBbTlNVUkxSZXF1ZXN0IHJlcXVlc3RXaXRoVVJMOltO U1VSTCBVUkxXaXRoU3RyaW5nOkAiY3VzdG9tOi8vZGVmL21haW4yLmh0bWwiXV07CisgICAgW3dl YlZpZXcgbG9hZFJlcXVlc3Q6cmVxdWVzdF07CisgICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6cnVu KCZkb25lKTsKKyAgICBkb25lID0gZmFsc2U7CisKKyAgICBFWFBFQ1RfRVEocGlkMSwgW3dlYlZp ZXcgX3dlYlByb2Nlc3NJZGVudGlmaWVyXSk7CisKKyAgICByZXF1ZXN0ID0gW05TVVJMUmVxdWVz dCByZXF1ZXN0V2l0aFVSTDpbTlNVUkwgVVJMV2l0aFN0cmluZzpAImN1c3RvbTovL2doaS9tYWlu My5odG1sIl1dOworICAgIFt3ZWJWaWV3IGxvYWRSZXF1ZXN0OnJlcXVlc3RdOworICAgIFRlc3RX ZWJLaXRBUEk6OlV0aWw6OnJ1bigmZG9uZSk7CisgICAgZG9uZSA9IGZhbHNlOworCisgICAgRVhQ RUNUX0VRKHBpZDEsIFt3ZWJWaWV3IF93ZWJQcm9jZXNzSWRlbnRpZmllcl0pOworCisgICAgLy8g U3dpdGNoIHRvIHRoZSBmaWxlIHByb3RvY29sLgorICAgIFt3ZWJWaWV3IGxvYWRSZXF1ZXN0OltO U1VSTFJlcXVlc3QgcmVxdWVzdFdpdGhVUkw6W1tOU0J1bmRsZSBtYWluQnVuZGxlXSBVUkxGb3JS ZXNvdXJjZTpAInNpbXBsZSIgd2l0aEV4dGVuc2lvbjpAImh0bWwiIHN1YmRpcmVjdG9yeTpAIlRl c3RXZWJLaXRBUEkucmVzb3VyY2VzIl1dXTsKKyAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4o JmRvbmUpOworICAgIGRvbmUgPSBmYWxzZTsKKworICAgIGF1dG8gcGlkMiA9IFt3ZWJWaWV3IF93 ZWJQcm9jZXNzSWRlbnRpZmllcl07CisgICAgRVhQRUNUX05FKHBpZDEsIHBpZDIpOworCisgICAg W3dlYlZpZXcgbG9hZFJlcXVlc3Q6W05TVVJMUmVxdWVzdCByZXF1ZXN0V2l0aFVSTDpbW05TQnVu ZGxlIG1haW5CdW5kbGVdIFVSTEZvclJlc291cmNlOkAic2ltcGxlMiIgd2l0aEV4dGVuc2lvbjpA Imh0bWwiIHN1YmRpcmVjdG9yeTpAIlRlc3RXZWJLaXRBUEkucmVzb3VyY2VzIl1dXTsKKyAgICBU ZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJmRvbmUpOworICAgIGRvbmUgPSBmYWxzZTsKKworICAg IEVYUEVDVF9FUShwaWQyLCBbd2ViVmlldyBfd2ViUHJvY2Vzc0lkZW50aWZpZXJdKTsKK30KKwog VEVTVChQcm9jZXNzU3dhcCwgTG9hZEFmdGVyUG9saWN5RGVjaXNpb24pCiB7CiAgICAgYXV0byBw cm9jZXNzUG9vbENvbmZpZ3VyYXRpb24gPSBwc29uUHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uKCk7 Cg== 431877 2021-06-21 10:54:41 -0700 2021-06-21 15:24:41 -0700 Patch bug-227220-20210621105440.patch text/plain 16417 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjc5MDY2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDAwNjlkOTBmNjFlODVkZTc0 YmE3OTM4Njk5YjNiNDAyYTYyNTM4ODYuLmY5ZmNiNmUzMTg4OGRkYWFmNDk0YWQ5NzIwZDZlM2Zj YzZmYjEyYTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUgQEAKKzIwMjEtMDYtMjEgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBbV0syXSBEb24ndCBwcm9jZXNzLXN3 YXAgb24gbmF2aWdhdGlvbnMgd2l0aGluIHRoZSBzYW1lIG5vbi1IVFRQKHMpIHByb3RvY29sCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjcyMjAKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBEb24ndCBwcm9j ZXNzLXN3YXAgb24gbmF2aWdhdGlvbnMgd2l0aGluIHRoZSBzYW1lIG5vbi1IVFRQKHMpIHByb3Rv Y29sLiBUcnlpbmcgdG8gZXh0cmFjdCByZWdpc3RyYWJsZSBkb21haW5zCisgICAgICAgIGZyb20g bm9uLUhUVFAocykgVVJMcyBkb2VzIG5vdCBtYWtlIG11Y2ggc2Vuc2UgYW5kIGxlYWRzIHRvIHVu ZXhwZWN0ZWQgcHJvY2VzcyBzd2Fwcy4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQVBJUHJv Y2Vzc1Bvb2xDb25maWd1cmF0aW9uLmNwcDoKKyAgICAgICAgKEFQSTo6UHJvY2Vzc1Bvb2xDb25m aWd1cmF0aW9uOjpjb3B5KToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0FQSVByb2Nlc3NQb29s Q29uZmlndXJhdGlvbi5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLUHJvY2Vz c1Bvb2xDb25maWd1cmF0aW9uLmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tQ cm9jZXNzUG9vbENvbmZpZ3VyYXRpb24ubW06CisgICAgICAgICgtW19XS1Byb2Nlc3NQb29sQ29u ZmlndXJhdGlvbiBzZXRQcm9jZXNzU3dhcHNPbk5hdmlnYXRpb25XaXRoaW5TYW1lTm9uSFRUUEZh bWlseVByb3RvY29sOl0pOgorICAgICAgICAoLVtfV0tQcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24g cHJvY2Vzc1N3YXBzT25OYXZpZ2F0aW9uV2l0aGluU2FtZU5vbkhUVFBGYW1pbHlQcm90b2NvbF0p OgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHA6CisgICAgICAgIChXZWJL aXQ6OldlYlByb2Nlc3NQb29sOjpwcm9jZXNzRm9yTmF2aWdhdGlvbkludGVybmFsKToKKyAgICAg ICAgKiBVSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2Vi UHJvY2Vzc1Byb3h5OjpkaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvck1haW5GcmFtZSk6CisKIDIw MjEtMDYtMjAgIFdlbnNvbiBIc2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CiAKICAgICAg ICAgW21hY09TXSBSZW5hbWUgV0tWaXN1YWxTZWFyY2hQcmV2aWV3Q29udHJvbGxlciB0byBXS1F1 aWNrTG9va1ByZXZpZXdDb250cm9sbGVyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9BUEkvQVBJUHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uLmNwcCBiL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL0FQSS9BUElQcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24uY3BwCmluZGV4IGQxNmVk Nzc1M2ZhNTlmYzg3ZWE5NDAyZjVmZjQ4NzI1MjVlZDMyZjYuLjk1ZmZlMDU4NGNhYTcxOTExZGFi Y2U2MTlkODQyOWRmNTVkYWVjZTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L0FQSS9BUElQcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24uY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL0FQSS9BUElQcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24uY3BwCkBAIC02NCw2ICs2 NCw3IEBAIFJlZjxQcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24+IFByb2Nlc3NQb29sQ29uZmlndXJh dGlvbjo6Y29weSgpCiAgICAgY29weS0+bV9wcm9jZXNzU3dhcHNPbk5hdmlnYXRpb25Gcm9tRXhw ZXJpbWVudGFsRmVhdHVyZXMgPSB0aGlzLT5tX3Byb2Nlc3NTd2Fwc09uTmF2aWdhdGlvbkZyb21F eHBlcmltZW50YWxGZWF0dXJlczsKICAgICBjb3B5LT5tX2Fsd2F5c0tlZXBBbmRSZXVzZVN3YXBw ZWRQcm9jZXNzZXMgPSB0aGlzLT5tX2Fsd2F5c0tlZXBBbmRSZXVzZVN3YXBwZWRQcm9jZXNzZXM7 CiAgICAgY29weS0+bV9wcm9jZXNzU3dhcHNPbldpbmRvd09wZW5XaXRoT3BlbmVyID0gdGhpcy0+ bV9wcm9jZXNzU3dhcHNPbldpbmRvd09wZW5XaXRoT3BlbmVyOworICAgIGNvcHktPm1fcHJvY2Vz c1N3YXBzT25OYXZpZ2F0aW9uV2l0aGluU2FtZU5vbkhUVFBGYW1pbHlQcm90b2NvbCA9IHRoaXMt Pm1fcHJvY2Vzc1N3YXBzT25OYXZpZ2F0aW9uV2l0aGluU2FtZU5vbkhUVFBGYW1pbHlQcm90b2Nv bDsKICAgICBjb3B5LT5tX2lzQXV0b21hdGljUHJvY2Vzc1dhcm1pbmdFbmFibGVkQnlDbGllbnQg PSB0aGlzLT5tX2lzQXV0b21hdGljUHJvY2Vzc1dhcm1pbmdFbmFibGVkQnlDbGllbnQ7CiAgICAg Y29weS0+bV91c2VzV2ViUHJvY2Vzc0NhY2hlID0gdGhpcy0+bV91c2VzV2ViUHJvY2Vzc0NhY2hl OwogICAgIGNvcHktPm1fdXNlc0JhY2tGb3J3YXJkQ2FjaGUgPSB0aGlzLT5tX3VzZXNCYWNrRm9y d2FyZENhY2hlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0FQSVBy b2Nlc3NQb29sQ29uZmlndXJhdGlvbi5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0FQ SVByb2Nlc3NQb29sQ29uZmlndXJhdGlvbi5oCmluZGV4IDlmYjJkNjNmNjE0ZTFlZDc5ZGEzZmJh MTgyNmU4OWZjNWJkNzM3YjQuLmZhNjlhNGI0NTdlZTMxY2VjNzg3NjVlMjYyYjBhZjEzZmU0MGI4 N2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9BUElQcm9jZXNzUG9v bENvbmZpZ3VyYXRpb24uaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQVBJUHJv Y2Vzc1Bvb2xDb25maWd1cmF0aW9uLmgKQEAgLTEyOCw2ICsxMjgsOSBAQCBwdWJsaWM6CiAgICAg Ym9vbCBhbHdheXNLZWVwQW5kUmV1c2VTd2FwcGVkUHJvY2Vzc2VzKCkgY29uc3QgeyByZXR1cm4g bV9hbHdheXNLZWVwQW5kUmV1c2VTd2FwcGVkUHJvY2Vzc2VzOyB9CiAgICAgdm9pZCBzZXRBbHdh eXNLZWVwQW5kUmV1c2VTd2FwcGVkUHJvY2Vzc2VzKGJvb2wga2VlcEFuZFJldXNlKSB7IG1fYWx3 YXlzS2VlcEFuZFJldXNlU3dhcHBlZFByb2Nlc3NlcyA9IGtlZXBBbmRSZXVzZTsgfQogCisgICAg Ym9vbCBwcm9jZXNzU3dhcHNPbk5hdmlnYXRpb25XaXRoaW5TYW1lTm9uSFRUUEZhbWlseVByb3Rv Y29sKCkgY29uc3QgeyByZXR1cm4gbV9wcm9jZXNzU3dhcHNPbk5hdmlnYXRpb25XaXRoaW5TYW1l Tm9uSFRUUEZhbWlseVByb3RvY29sOyB9CisgICAgdm9pZCBzZXRQcm9jZXNzU3dhcHNPbk5hdmln YXRpb25XaXRoaW5TYW1lTm9uSFRUUEZhbWlseVByb3RvY29sKGJvb2wgc3dhcHMpIHsgbV9wcm9j ZXNzU3dhcHNPbk5hdmlnYXRpb25XaXRoaW5TYW1lTm9uSFRUUEZhbWlseVByb3RvY29sID0gc3dh cHM7IH0KKwogICAgIGJvb2wgcHJvY2Vzc1N3YXBzT25XaW5kb3dPcGVuV2l0aE9wZW5lcigpIGNv bnN0IHsgcmV0dXJuIG1fcHJvY2Vzc1N3YXBzT25XaW5kb3dPcGVuV2l0aE9wZW5lcjsgfQogICAg IHZvaWQgc2V0UHJvY2Vzc1N3YXBzT25XaW5kb3dPcGVuV2l0aE9wZW5lcihib29sIHN3YXBzKSB7 IG1fcHJvY2Vzc1N3YXBzT25XaW5kb3dPcGVuV2l0aE9wZW5lciA9IHN3YXBzOyB9CiAKQEAgLTE2 OSw2ICsxNzIsNyBAQCBwcml2YXRlOgogICAgIGJvb2wgbV9wcm9jZXNzU3dhcHNPbk5hdmlnYXRp b25Gcm9tRXhwZXJpbWVudGFsRmVhdHVyZXMgeyBmYWxzZSB9OwogICAgIGJvb2wgbV9hbHdheXNL ZWVwQW5kUmV1c2VTd2FwcGVkUHJvY2Vzc2VzIHsgZmFsc2UgfTsKICAgICBib29sIG1fcHJvY2Vz c1N3YXBzT25XaW5kb3dPcGVuV2l0aE9wZW5lciB7IGZhbHNlIH07CisgICAgYm9vbCBtX3Byb2Nl c3NTd2Fwc09uTmF2aWdhdGlvbldpdGhpblNhbWVOb25IVFRQRmFtaWx5UHJvdG9jb2wgeyBmYWxz ZSB9OwogICAgIHN0ZDo6b3B0aW9uYWw8Ym9vbD4gbV9pc0F1dG9tYXRpY1Byb2Nlc3NXYXJtaW5n RW5hYmxlZEJ5Q2xpZW50OwogICAgIGJvb2wgbV91c2VzV2ViUHJvY2Vzc0NhY2hlIHsgZmFsc2Ug fTsKICAgICBib29sIG1fdXNlc0JhY2tGb3J3YXJkQ2FjaGUgeyB0cnVlIH07CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLUHJvY2Vzc1Bvb2xDb25maWd1 cmF0aW9uLmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLUHJvY2Vzc1Bv b2xDb25maWd1cmF0aW9uLmgKaW5kZXggZDRiNjUxNzdmOWZlNTkzNTEwYmVhNjQ4MzJkNDI1NTY5 M2JlNTRiMy4uMDgwNjQzZmUyMmY3MDRkZjJiYWQ3NzRiNzVmMTNkNGUwMGM4MWM1MCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL19XS1Byb2Nlc3NQb29sQ29u ZmlndXJhdGlvbi5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tQ cm9jZXNzUG9vbENvbmZpZ3VyYXRpb24uaApAQCAtNjcsNiArNjcsNyBAQCBXS19DTEFTU19BVkFJ TEFCTEUobWFjb3MoMTAuMTApLCBpb3MoOC4wKSkKIEBwcm9wZXJ0eSAobm9uYXRvbWljKSBCT09M IHByb2Nlc3NTd2Fwc09uTmF2aWdhdGlvbiBXS19BUElfQVZBSUxBQkxFKG1hY29zKDEwLjE0KSwg aW9zKDEyLjApKTsKIEBwcm9wZXJ0eSAobm9uYXRvbWljKSBCT09MIGFsd2F5c0tlZXBBbmRSZXVz ZVN3YXBwZWRQcm9jZXNzZXMgV0tfQVBJX0FWQUlMQUJMRShtYWNvcygxMC4xNCksIGlvcygxMi4w KSk7CiBAcHJvcGVydHkgKG5vbmF0b21pYykgQk9PTCBwcm9jZXNzU3dhcHNPbldpbmRvd09wZW5X aXRoT3BlbmVyIFdLX0FQSV9BVkFJTEFCTEUobWFjb3MoMTAuMTQpLCBpb3MoMTIuMCkpOworQHBy b3BlcnR5IChub25hdG9taWMpIEJPT0wgcHJvY2Vzc1N3YXBzT25OYXZpZ2F0aW9uV2l0aGluU2Ft ZU5vbkhUVFBGYW1pbHlQcm90b2NvbCBXS19BUElfQVZBSUxBQkxFKG1hY29zKFdLX01BQ19UQkEp LCBpb3MoV0tfSU9TX1RCQSkpOwogQHByb3BlcnR5IChub25hdG9taWMpIEJPT0wgcHJld2FybXNQ cm9jZXNzZXNBdXRvbWF0aWNhbGx5IFdLX0FQSV9BVkFJTEFCTEUobWFjb3MoMTAuMTQuNCksIGlv cygxMi4yKSk7CiBAcHJvcGVydHkgKG5vbmF0b21pYykgQk9PTCB1c2VzV2ViUHJvY2Vzc0NhY2hl IFdLX0FQSV9BVkFJTEFCTEUobWFjb3MoMTAuMTQuNCksIGlvcygxMi4yKSk7CiBAcHJvcGVydHkg KG5vbmF0b21pYykgQk9PTCBwYWdlQ2FjaGVFbmFibGVkIFdLX0FQSV9BVkFJTEFCTEUobWFjb3Mo MTAuMTQpLCBpb3MoMTIuMCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv QVBJL0NvY29hL19XS1Byb2Nlc3NQb29sQ29uZmlndXJhdGlvbi5tbSBiL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tQcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24ubW0KaW5kZXgg OTNkMGIxZWQ4MDZlZTY5OGJkZjUxYTcwMjJiMGNiNWVhYmJhYTk0My4uZTIzMzE0YTI5MDRjNzgx Y2EyM2E5ZjhkOTA2Mjk5NzQwNjc3NzU5ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvQVBJL0NvY29hL19XS1Byb2Nlc3NQb29sQ29uZmlndXJhdGlvbi5tbQorKysgYi9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLUHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9u Lm1tCkBAIC0yODUsNiArMjg1LDE2IEBAIC0gKEJPT0wpcHJvY2Vzc1N3YXBzT25XaW5kb3dPcGVu V2l0aE9wZW5lcgogICAgIHJldHVybiBfcHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uLT5wcm9jZXNz U3dhcHNPbldpbmRvd09wZW5XaXRoT3BlbmVyKCk7CiB9CiAKKy0gKHZvaWQpc2V0UHJvY2Vzc1N3 YXBzT25OYXZpZ2F0aW9uV2l0aGluU2FtZU5vbkhUVFBGYW1pbHlQcm90b2NvbDooQk9PTClzd2Fw cworeworICAgIF9wcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24tPnNldFByb2Nlc3NTd2Fwc09uTmF2 aWdhdGlvbldpdGhpblNhbWVOb25IVFRQRmFtaWx5UHJvdG9jb2woc3dhcHMpOworfQorCistIChC T09MKXByb2Nlc3NTd2Fwc09uTmF2aWdhdGlvbldpdGhpblNhbWVOb25IVFRQRmFtaWx5UHJvdG9j b2wKK3sKKyAgICByZXR1cm4gX3Byb2Nlc3NQb29sQ29uZmlndXJhdGlvbi0+cHJvY2Vzc1N3YXBz T25OYXZpZ2F0aW9uV2l0aGluU2FtZU5vbkhUVFBGYW1pbHlQcm90b2NvbCgpOworfQorCiAtIChC T09MKXBhZ2VDYWNoZUVuYWJsZWQKIHsKICAgICByZXR1cm4gX3Byb2Nlc3NQb29sQ29uZmlndXJh dGlvbi0+dXNlc0JhY2tGb3J3YXJkQ2FjaGUoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dl YlByb2Nlc3NQb29sLmNwcAppbmRleCBiMjc2ODU3Njk0NDVlYzdhMTU3NjZhOTZlNGQ5YWM2OTAy MWZjYzgxLi45YjViNmE0ODQ3N2QwNTM0ODI2ZTdiODk4NTY2ZjhiZTBjMjhiMmU0IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHAKKysrIGIvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwCkBAIC0xODQ0LDYgKzE4NDQs MTAgQEAgdm9pZCBXZWJQcm9jZXNzUG9vbDo6cHJvY2Vzc0Zvck5hdmlnYXRpb25JbnRlcm5hbChX ZWJQYWdlUHJveHkmIHBhZ2UsIGNvbnN0IEFQSToKICAgICAgICAgV0VCUFJPQ0VTU1BPT0xfUkVM RUFTRV9MT0coUHJvY2Vzc1N3YXBwaW5nLCAicHJvY2Vzc0Zvck5hdmlnYXRpb25JbnRlcm5hbDog VXNpbmcgcmVsYXRlZCBwYWdlJ3MgVVJMIGFzIHNvdXJjZSBVUkwgZm9yIHByb2Nlc3Mgc3dhcCBk ZWNpc2lvbiAocGFnZT0lcCkiLCBwYWdlLmNvbmZpZ3VyYXRpb24oKS5yZWxhdGVkUGFnZSgpKTsK ICAgICB9CiAKKyAgICAvLyBGb3Igbm9uLUhUVFAocykgVVJMcywgd2Ugb25seSBzd2FwIHdoZW4g bmF2aWdhdGluZyB0byBhIG5ldyBzY2hlbWUsIHVubGVzcyBwcm9jZXNzU3dhcHNPbk5hdmlnYXRp b25XaXRoaW5TYW1lTm9uSFRUUEZhbWlseVByb3RvY29sIGlzIHNldC4KKyAgICBpZiAoIW1fY29u ZmlndXJhdGlvbi0+cHJvY2Vzc1N3YXBzT25OYXZpZ2F0aW9uV2l0aGluU2FtZU5vbkhUVFBGYW1p bHlQcm90b2NvbCgpICYmICFzb3VyY2VVUkwucHJvdG9jb2xJc0luSFRUUEZhbWlseSgpICYmIHNv dXJjZVVSTC5wcm90b2NvbCgpID09IHRhcmdldFVSTC5wcm90b2NvbCgpKQorICAgICAgICByZXR1 cm4gY29tcGxldGlvbkhhbmRsZXIoV1RGTW92ZShzb3VyY2VQcm9jZXNzKSwgbnVsbHB0ciwgIk5h dmlnYXRpb24gd2l0aGluIHRoZSBzYW1lIG5vbi1IVFRQKHMpIHByb3RvY29sIl9zKTsKKwogICAg IGlmICghc291cmNlVVJMLmlzVmFsaWQoKSB8fCAhdGFyZ2V0VVJMLmlzVmFsaWQoKSB8fCBzb3Vy Y2VVUkwuaXNFbXB0eSgpIHx8IHNvdXJjZVVSTC5wcm90b2NvbElzQWJvdXQoKSB8fCB0YXJnZXRS ZWdpc3RyYWJsZURvbWFpbi5tYXRjaGVzKHNvdXJjZVVSTCkpCiAgICAgICAgIHJldHVybiBjb21w bGV0aW9uSGFuZGxlcihXVEZNb3ZlKHNvdXJjZVByb2Nlc3MpLCBudWxscHRyLCAiTmF2aWdhdGlv biBpcyBzYW1lLXNpdGUiX3MpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9XZWJQcm9jZXNzUHJveHkuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vz c1Byb3h5LmNwcAppbmRleCBhMTRmZjVhNTg2MTI1OWI0YzVkY2ZmZDRmNjBkZTY2MGQ3ZTFkYjU3 Li4xMDdhMmJiMGY1MzcyMDUwMTkyMjY2NDAzZGZjZDk1Y2NhNzBhNWMzIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuY3BwCisrKyBiL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5jcHAKQEAgLTE2MjYsNiArMTYyNiwxMyBA QCB2b2lkIFdlYlByb2Nlc3NQcm94eTo6ZGlkU3RhcnRQcm92aXNpb25hbExvYWRGb3JNYWluRnJh bWUoY29uc3QgVVJMJiB1cmwpCiAgICAgaWYgKHVybC5wcm90b2NvbElzQWJvdXQoKSkKICAgICAg ICAgcmV0dXJuOwogCisgICAgaWYgKCF1cmwucHJvdG9jb2xJc0luSFRUUEZhbWlseSgpICYmICFw cm9jZXNzUG9vbCgpLmNvbmZpZ3VyYXRpb24oKS5wcm9jZXNzU3dhcHNPbk5hdmlnYXRpb25XaXRo aW5TYW1lTm9uSFRUUEZhbWlseVByb3RvY29sKCkpIHsKKyAgICAgICAgLy8gVW5sZXNzIHRoZSBw cm9jZXNzU3dhcHNPbk5hdmlnYXRpb25XaXRoaW5TYW1lTm9uSFRUUEZhbWlseVByb3RvY29sIGZs YWcgaXMgc2V0LCB3ZSBkb24ndCBwcm9jZXNzIHN3YXAgb24gbmF2aWdhdGlvbnMgd2l0aGluZyB0 aGUgc2FtZQorICAgICAgICAvLyBub24gSFRUUChzKSBwcm90b2NvbC4gRm9yIHRoaXMgcmVhc29u LCB3ZSBpZ25vcmUgdGhlIHJlZ2lzdHJhYmxlIGRvbWFpbiBhbmQgcHJvY2Vzc2VzIGFyZSBub3Qg ZWxpZ2libGUgZm9yIHRoZSBwcm9jZXNzIGNhY2hlLgorICAgICAgICBtX3JlZ2lzdHJhYmxlRG9t YWluID0gV2ViQ29yZTo6UmVnaXN0cmFibGVEb21haW4geyB9OworICAgICAgICByZXR1cm47Cisg ICAgfQorCiAgICAgYXV0byByZWdpc3RyYWJsZURvbWFpbiA9IFdlYkNvcmU6OlJlZ2lzdHJhYmxl RG9tYWluIHsgdXJsIH07CiAgICAgaWYgKG1fcmVnaXN0cmFibGVEb21haW4gJiYgKm1fcmVnaXN0 cmFibGVEb21haW4gIT0gcmVnaXN0cmFibGVEb21haW4pIHsKICNpZiBFTkFCTEUoU0VSVklDRV9X T1JLRVIpCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5k ZXggZWZhYzUzMzVjZjk1NDYzZjkyOWE5NWU4MDU4YjcxZGRjYzljMmRhZi4uNzI2YjFiYWY0NjQ4 NGM4OTQ3OTI0NzdhNGIxODA2MzczZmViZDcyYiAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9n CisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIxLTA2LTIxICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgW1dLMl0gRG9uJ3QgcHJvY2Vz cy1zd2FwIG9uIG5hdmlnYXRpb25zIHdpdGhpbiB0aGUgc2FtZSBub24tSFRUUChzKSBwcm90b2Nv bAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI3MjIw CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIEFQ SSB0ZXN0IGNvdmVyYWdlLgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRD b2NvYS9Qcm9jZXNzU3dhcE9uTmF2aWdhdGlvbi5tbToKKwogMjAyMS0wNi0xOSAgQ29tbWl0IFF1 ZXVlICA8Y29tbWl0LXF1ZXVlQHdlYmtpdC5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcmV2 ZXJ0aW5nIHIyNzg2OTkuCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dl YktpdENvY29hL1Byb2Nlc3NTd2FwT25OYXZpZ2F0aW9uLm1tIGIvVG9vbHMvVGVzdFdlYktpdEFQ SS9UZXN0cy9XZWJLaXRDb2NvYS9Qcm9jZXNzU3dhcE9uTmF2aWdhdGlvbi5tbQppbmRleCBhN2Nm MjA0NzBhYzA2OGQ2MmRmMmVlOTAwZTE2ODIyM2Y2MWFmYjc0Li5mOWI4ZGFmNjlmNDQ3NDI3OTVm ZDhmOTE2YzZmNmY4NWI0MGU0ODYxIDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rl c3RzL1dlYktpdENvY29hL1Byb2Nlc3NTd2FwT25OYXZpZ2F0aW9uLm1tCisrKyBiL1Rvb2xzL1Rl c3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvUHJvY2Vzc1N3YXBPbk5hdmlnYXRpb24ubW0K QEAgLTUwNiw2ICs1MDYsNyBAQCBzdGF0aWMgUmV0YWluUHRyPF9XS1Byb2Nlc3NQb29sQ29uZmln dXJhdGlvbj4gcHNvblByb2Nlc3NQb29sQ29uZmlndXJhdGlvbigpCiAgICAgcHJvY2Vzc1Bvb2xD b25maWd1cmF0aW9uLmdldCgpLnByb2Nlc3NTd2Fwc09uTmF2aWdhdGlvbiA9IFlFUzsKICAgICBw cm9jZXNzUG9vbENvbmZpZ3VyYXRpb24uZ2V0KCkudXNlc1dlYlByb2Nlc3NDYWNoZSA9IFlFUzsK ICAgICBwcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24uZ2V0KCkucHJld2FybXNQcm9jZXNzZXNBdXRv bWF0aWNhbGx5ID0gWUVTOworICAgIHByb2Nlc3NQb29sQ29uZmlndXJhdGlvbi5nZXQoKS5wcm9j ZXNzU3dhcHNPbk5hdmlnYXRpb25XaXRoaW5TYW1lTm9uSFRUUEZhbWlseVByb3RvY29sID0gWUVT OwogICAgIHJldHVybiBwcm9jZXNzUG9vbENvbmZpZ3VyYXRpb247CiB9CiAKQEAgLTU2Niw2ICs1 NjcsNTcgQEAgVEVTVChQcm9jZXNzU3dhcCwgQmFzaWNXaXRoQXN5bmNTY2hlbWVIYW5kbGVyKQog ICAgIHJ1bkJhc2ljVGVzdChTY2hlbWVIYW5kbGVyU2hvdWxkQmVBc3luYzo6WWVzKTsKIH0KIAor VEVTVChQcm9jZXNzU3dhcCwgTm9Qcm9jZXNzU3dhcHBpbmdXaXRoaW5TYW1lTm9uSFRUUEZhbWls eVByb3RvY29sKQoreworICAgIGF1dG8gcHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uID0gcHNvblBy b2Nlc3NQb29sQ29uZmlndXJhdGlvbigpOworICAgIHByb2Nlc3NQb29sQ29uZmlndXJhdGlvbi5n ZXQoKS5wcm9jZXNzU3dhcHNPbk5hdmlnYXRpb25XaXRoaW5TYW1lTm9uSFRUUEZhbWlseVByb3Rv Y29sID0gTk87CisgICAgYXV0byBwcm9jZXNzUG9vbCA9IGFkb3B0TlMoW1tXS1Byb2Nlc3NQb29s IGFsbG9jXSBfaW5pdFdpdGhDb25maWd1cmF0aW9uOnByb2Nlc3NQb29sQ29uZmlndXJhdGlvbi5n ZXQoKV0pOworCisgICAgYXV0byB3ZWJWaWV3Q29uZmlndXJhdGlvbiA9IGFkb3B0TlMoW1tXS1dl YlZpZXdDb25maWd1cmF0aW9uIGFsbG9jXSBpbml0XSk7CisgICAgW3dlYlZpZXdDb25maWd1cmF0 aW9uIHNldFByb2Nlc3NQb29sOnByb2Nlc3NQb29sLmdldCgpXTsKKyAgICBhdXRvIGhhbmRsZXIg PSBhZG9wdE5TKFtbUFNPTlNjaGVtZSBhbGxvY10gaW5pdF0pOworICAgIFt3ZWJWaWV3Q29uZmln dXJhdGlvbiBzZXRVUkxTY2hlbWVIYW5kbGVyOmhhbmRsZXIuZ2V0KCkgZm9yVVJMU2NoZW1lOkAi Q1VTVE9NIl07CisKKyAgICBhdXRvIHdlYlZpZXcgPSBhZG9wdE5TKFtbV0tXZWJWaWV3IGFsbG9j XSBpbml0V2l0aEZyYW1lOk5TTWFrZVJlY3QoMCwgMCwgODAwLCA2MDApIGNvbmZpZ3VyYXRpb246 d2ViVmlld0NvbmZpZ3VyYXRpb24uZ2V0KCldKTsKKyAgICBhdXRvIGRlbGVnYXRlID0gYWRvcHRO UyhbW1BTT05OYXZpZ2F0aW9uRGVsZWdhdGUgYWxsb2NdIGluaXRdKTsKKyAgICBbd2ViVmlldyBz ZXROYXZpZ2F0aW9uRGVsZWdhdGU6ZGVsZWdhdGUuZ2V0KCldOworCisgICAgTlNVUkxSZXF1ZXN0 ICpyZXF1ZXN0ID0gW05TVVJMUmVxdWVzdCByZXF1ZXN0V2l0aFVSTDpbTlNVUkwgVVJMV2l0aFN0 cmluZzpAImN1c3RvbTovL2FiYy9tYWluMS5odG1sIl1dOworICAgIFt3ZWJWaWV3IGxvYWRSZXF1 ZXN0OnJlcXVlc3RdOworICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmZG9uZSk7CisgICAg ZG9uZSA9IGZhbHNlOworCisgICAgYXV0byBwaWQxID0gW3dlYlZpZXcgX3dlYlByb2Nlc3NJZGVu dGlmaWVyXTsKKworICAgIHJlcXVlc3QgPSBbTlNVUkxSZXF1ZXN0IHJlcXVlc3RXaXRoVVJMOltO U1VSTCBVUkxXaXRoU3RyaW5nOkAiY3VzdG9tOi8vZGVmL21haW4yLmh0bWwiXV07CisgICAgW3dl YlZpZXcgbG9hZFJlcXVlc3Q6cmVxdWVzdF07CisgICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6cnVu KCZkb25lKTsKKyAgICBkb25lID0gZmFsc2U7CisKKyAgICBFWFBFQ1RfRVEocGlkMSwgW3dlYlZp ZXcgX3dlYlByb2Nlc3NJZGVudGlmaWVyXSk7CisKKyAgICByZXF1ZXN0ID0gW05TVVJMUmVxdWVz dCByZXF1ZXN0V2l0aFVSTDpbTlNVUkwgVVJMV2l0aFN0cmluZzpAImN1c3RvbTovL2doaS9tYWlu My5odG1sIl1dOworICAgIFt3ZWJWaWV3IGxvYWRSZXF1ZXN0OnJlcXVlc3RdOworICAgIFRlc3RX ZWJLaXRBUEk6OlV0aWw6OnJ1bigmZG9uZSk7CisgICAgZG9uZSA9IGZhbHNlOworCisgICAgRVhQ RUNUX0VRKHBpZDEsIFt3ZWJWaWV3IF93ZWJQcm9jZXNzSWRlbnRpZmllcl0pOworCisgICAgLy8g U3dpdGNoIHRvIHRoZSBmaWxlIHByb3RvY29sLgorICAgIFt3ZWJWaWV3IGxvYWRSZXF1ZXN0OltO U1VSTFJlcXVlc3QgcmVxdWVzdFdpdGhVUkw6W1tOU0J1bmRsZSBtYWluQnVuZGxlXSBVUkxGb3JS ZXNvdXJjZTpAInNpbXBsZSIgd2l0aEV4dGVuc2lvbjpAImh0bWwiIHN1YmRpcmVjdG9yeTpAIlRl c3RXZWJLaXRBUEkucmVzb3VyY2VzIl1dXTsKKyAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4o JmRvbmUpOworICAgIGRvbmUgPSBmYWxzZTsKKworICAgIGF1dG8gcGlkMiA9IFt3ZWJWaWV3IF93 ZWJQcm9jZXNzSWRlbnRpZmllcl07CisgICAgRVhQRUNUX05FKHBpZDEsIHBpZDIpOworCisgICAg W3dlYlZpZXcgbG9hZFJlcXVlc3Q6W05TVVJMUmVxdWVzdCByZXF1ZXN0V2l0aFVSTDpbW05TQnVu ZGxlIG1haW5CdW5kbGVdIFVSTEZvclJlc291cmNlOkAic2ltcGxlMiIgd2l0aEV4dGVuc2lvbjpA Imh0bWwiIHN1YmRpcmVjdG9yeTpAIlRlc3RXZWJLaXRBUEkucmVzb3VyY2VzIl1dXTsKKyAgICBU ZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJmRvbmUpOworICAgIGRvbmUgPSBmYWxzZTsKKworICAg IEVYUEVDVF9FUShwaWQyLCBbd2ViVmlldyBfd2ViUHJvY2Vzc0lkZW50aWZpZXJdKTsKK30KKwog VEVTVChQcm9jZXNzU3dhcCwgTG9hZEFmdGVyUG9saWN5RGVjaXNpb24pCiB7CiAgICAgYXV0byBw cm9jZXNzUG9vbENvbmZpZ3VyYXRpb24gPSBwc29uUHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uKCk7 CmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1Jlc291 cmNlTG9hZFN0YXRpc3RpY3MubW0gYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENv Y29hL1Jlc291cmNlTG9hZFN0YXRpc3RpY3MubW0KaW5kZXggYzU4Nzg1NzA3MDlkYjI3ODJmODNm NTM3NGU3ZDFiZTU5MzkzN2JiYy4uZWJjMzUyN2ViYzViOGNmNTM3MTNhZGJmNWI1YTQ3M2JiZmEw ZDg5MyAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9S ZXNvdXJjZUxvYWRTdGF0aXN0aWNzLm1tCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMv V2ViS2l0Q29jb2EvUmVzb3VyY2VMb2FkU3RhdGlzdGljcy5tbQpAQCAtMzUsNiArMzUsNyBAQAog I2ltcG9ydCA8V2ViS2l0L1dLV2ViVmlld0NvbmZpZ3VyYXRpb25Qcml2YXRlLmg+CiAjaW1wb3J0 IDxXZWJLaXQvV0tXZWJzaXRlRGF0YVJlY29yZFByaXZhdGUuaD4KICNpbXBvcnQgPFdlYktpdC9X S1dlYnNpdGVEYXRhU3RvcmVQcml2YXRlLmg+CisjaW1wb3J0IDxXZWJLaXQvX1dLUHJvY2Vzc1Bv b2xDb25maWd1cmF0aW9uLmg+CiAjaW1wb3J0IDxXZWJLaXQvX1dLV2Vic2l0ZURhdGFTdG9yZUNv bmZpZ3VyYXRpb24uaD4KICNpbXBvcnQgPHd0Zi9SZXRhaW5QdHIuaD4KIApAQCAtMTMzOCwxMSAr MTMzOSwxNiBAQCBAZW5kCiAKIFRFU1QoUmVzb3VyY2VMb2FkU3RhdGlzdGljcywgQmFja0Zvcndh cmRQZXJQYWdlRGF0YSkKIHsKKyAgICBhdXRvIHByb2Nlc3NQb29sQ29uZmlndXJhdGlvbiA9IGFk b3B0TlMoW1tfV0tQcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24gYWxsb2NdIGluaXRdKTsKKyAgICBw cm9jZXNzUG9vbENvbmZpZ3VyYXRpb24uZ2V0KCkucHJvY2Vzc1N3YXBzT25OYXZpZ2F0aW9uV2l0 aGluU2FtZU5vbkhUVFBGYW1pbHlQcm90b2NvbCA9IFlFUzsKKyAgICBhdXRvIHByb2Nlc3NQb29s ID0gYWRvcHROUyhbW1dLUHJvY2Vzc1Bvb2wgYWxsb2NdIF9pbml0V2l0aENvbmZpZ3VyYXRpb246 cHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uLmdldCgpXSk7CisKICAgICBhdXRvICpkYXRhU3RvcmUg PSBbV0tXZWJzaXRlRGF0YVN0b3JlIGRlZmF1bHREYXRhU3RvcmVdOwogICAgIGF1dG8gZGVsZWdh dGUgPSBhZG9wdE5TKFtUZXN0TmF2aWdhdGlvbkRlbGVnYXRlIG5ld10pOwogCiAgICAgYXV0byBz Y2hlbWVIYW5kbGVyID0gYWRvcHROUyhbW1Jlc291cmNlTG9hZFN0YXRpc3RpY3NTY2hlbWVIYW5k bGVyIGFsbG9jXSBpbml0XSk7CiAgICAgYXV0byBjb25maWd1cmF0aW9uID0gYWRvcHROUyhbW1dL V2ViVmlld0NvbmZpZ3VyYXRpb24gYWxsb2NdIGluaXRdKTsKKyAgICBbY29uZmlndXJhdGlvbiBz ZXRQcm9jZXNzUG9vbDpwcm9jZXNzUG9vbC5nZXQoKV07CiAgICAgW2NvbmZpZ3VyYXRpb24gc2V0 VVJMU2NoZW1lSGFuZGxlcjpzY2hlbWVIYW5kbGVyLmdldCgpIGZvclVSTFNjaGVtZTpAInJlc291 cmNlLWxvYWQtc3RhdGlzdGljcyJdOwogCiAgICAgYXV0byB3ZWJWaWV3ID0gYWRvcHROUyhbW1Rl c3RXS1dlYlZpZXcgYWxsb2NdIGluaXRXaXRoRnJhbWU6TlNNYWtlUmVjdCgwLCAwLCA4MDAsIDYw MCkgY29uZmlndXJhdGlvbjpjb25maWd1cmF0aW9uLmdldCgpXSk7CmRpZmYgLS1naXQgYS9Ub29s cy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1dLV2ViVmlld0V2YWx1YXRlSmF2YVNj cmlwdC5tbSBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV0tXZWJWaWV3 RXZhbHVhdGVKYXZhU2NyaXB0Lm1tCmluZGV4IDUyNmI2NzIzZGY3OTAxZTUyZjVlYjM0ZDA4OTIx MzQyYzA2YWJlYTYuLjdjYTgwOTc4ZTNmMWNjNmJjNTNjN2E1YzdkYjFhM2RiNmRkMTM4YjQgMTAw NjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV0tXZWJWaWV3 RXZhbHVhdGVKYXZhU2NyaXB0Lm1tCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2Vi S2l0Q29jb2EvV0tXZWJWaWV3RXZhbHVhdGVKYXZhU2NyaXB0Lm1tCkBAIC0zOCwxMCArMzgsMTIg QEAKICNpbXBvcnQgPFdlYktpdC9XS0Vycm9yUHJpdmF0ZS5oPgogI2ltcG9ydCA8V2ViS2l0L1dL UHJlZmVyZW5jZXNQcml2YXRlLmg+CiAjaW1wb3J0IDxXZWJLaXQvV0tQcmVmZXJlbmNlc1JlZi5o PgorI2ltcG9ydCA8V2ViS2l0L1dLUHJvY2Vzc1Bvb2xQcml2YXRlLmg+CiAjaW1wb3J0IDxXZWJL aXQvV0tVc2VyQ29udGVudENvbnRyb2xsZXJQcml2YXRlLmg+CiAjaW1wb3J0IDxXZWJLaXQvV0tX ZWJWaWV3Q29uZmlndXJhdGlvblByaXZhdGUuaD4KICNpbXBvcnQgPFdlYktpdC9XS1dlYlZpZXdQ cml2YXRlLmg+CiAjaW1wb3J0IDxXZWJLaXQvX1dLRnJhbWVUcmVlTm9kZS5oPgorI2ltcG9ydCA8 V2ViS2l0L19XS1Byb2Nlc3NQb29sQ29uZmlndXJhdGlvbi5oPgogI2ltcG9ydCA8d3RmL1JldGFp blB0ci5oPgogCiBzdGF0aWMgYm9vbCBpc0RvbmU7CkBAIC03NTAsNiArNzUyLDEwIEBAIFRFU1Qo RXZhbHVhdGVKYXZhU2NyaXB0LCBKYXZhU2NyaXB0SW5NaXNzaW5nRnJhbWVFcnJvcikKIC8vIFRo aXMgdGVzdCB2ZXJpZmllcyB0aGF0IGV2YWx1YXRpbmcgSmF2YVNjcmlwdCBpbiBhIGZyYW1lIGZy b20gdGhlIHByZXZpb3VzIG1haW4gbmF2aWdhdGlvbiByZXN1bHRzIGluIGFuIGVycm9yCiBURVNU KEV2YWx1YXRlSmF2YVNjcmlwdCwgSmF2YVNjcmlwdEluTWlzc2luZ0ZyYW1lQWZ0ZXJOYXZpZ2F0 aW9uRXJyb3IpCiB7CisgICAgYXV0byBwcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24gPSBhZG9wdE5T KFtbX1dLUHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uIGFsbG9jXSBpbml0XSk7CisgICAgcHJvY2Vz c1Bvb2xDb25maWd1cmF0aW9uLmdldCgpLnByb2Nlc3NTd2Fwc09uTmF2aWdhdGlvbldpdGhpblNh bWVOb25IVFRQRmFtaWx5UHJvdG9jb2wgPSBZRVM7CisgICAgYXV0byBwcm9jZXNzUG9vbCA9IGFk b3B0TlMoW1tXS1Byb2Nlc3NQb29sIGFsbG9jXSBfaW5pdFdpdGhDb25maWd1cmF0aW9uOnByb2Nl c3NQb29sQ29uZmlndXJhdGlvbi5nZXQoKV0pOworCiAgICAgYWxsRnJhbWVzID0gYWRvcHROUyhb W05TTXV0YWJsZVNldDxXS0ZyYW1lSW5mbyAqPiBhbGxvY10gaW5pdF0pOwogCiAgICAgYXV0byBo YW5kbGVyID0gYWRvcHROUyhbW1Rlc3RVUkxTY2hlbWVIYW5kbGVyIGFsbG9jXSBpbml0XSk7CkBA IC03NzQsNiArNzgwLDcgQEAgVEVTVChFdmFsdWF0ZUphdmFTY3JpcHQsIEphdmFTY3JpcHRJbk1p c3NpbmdGcmFtZUFmdGVyTmF2aWdhdGlvbkVycm9yKQogICAgIH1dOwogCiAgICAgYXV0byBjb25m aWd1cmF0aW9uID0gYWRvcHROUyhbW1dLV2ViVmlld0NvbmZpZ3VyYXRpb24gYWxsb2NdIGluaXRd KTsKKyAgICBbY29uZmlndXJhdGlvbiBzZXRQcm9jZXNzUG9vbDpwcm9jZXNzUG9vbC5nZXQoKV07 CiAgICAgW2NvbmZpZ3VyYXRpb24gc2V0VVJMU2NoZW1lSGFuZGxlcjpoYW5kbGVyLmdldCgpIGZv clVSTFNjaGVtZTpAImZyYW1lc3Rlc3QiXTsKICAgICBbY29uZmlndXJhdGlvbiBzZXRVUkxTY2hl bWVIYW5kbGVyOmhhbmRsZXIuZ2V0KCkgZm9yVVJMU2NoZW1lOkAib3RoZXJwcm90b2NvbCJdOwog Cg== 431917 2021-06-21 15:23:51 -0700 2021-06-21 17:45:19 -0700 Follow-up to fix GTK API test bug-227220-20210621152350.patch text/plain 2704 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjc5MDg2CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMzBlYTRlM2E1YTk5ZTMwY2UyNmJhM2VkNzhjZjJmNjVk ZGE2ZTc2My4uMDk1NjQ2NjFjYWU4OGFjNDcyMDdiYzQ1M2M4OWMzZmMzNjNmY2RhZiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1 IEBACisyMDIxLTA2LTIxICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAg ICAgW1dLMl0gRG9uJ3QgcHJvY2Vzcy1zd2FwIG9uIG5hdmlnYXRpb25zIHdpdGhpbiB0aGUgc2Ft ZSBub24tSFRUUChzKSBwcm90b2NvbAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjI3MjIwCisgICAgICAgIDxyZGFyOi8vNzkxMDY0NjE+CisKKyAgICAg ICAgVW5yZXZpZXdlZCBmb2xsb3ctdXAgdG8gZml4IEdUSyB0ZXN0IHRoYXQgc3RhcnRlZCBmYWls aW5nIGFmdGVyIHRoZSBiZWhhdmlvcgorICAgICAgICBjaGFuZ2UgaW4gcjI3OTA3OS4KKworICAg ICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0R0xpYi9UZXN0V2ViRXh0ZW5zaW9ucy5j cHA6CisgICAgICAgICh0ZXN0V2ViRXh0ZW5zaW9uUGFnZUlEKToKKwogMjAyMS0wNi0yMSAgS2F0 ZSBDaGVuZXkgIDxrYXRoZXJpbmVfY2hlbmV5QGFwcGxlLmNvbT4KIAogICAgICAgICBNaWdyYXRl IEFwcCBQcml2YWN5IFJlcG9ydCBjb2RlIGZyb20gV2ViS2l0QWRkaXRpb25zCmRpZmYgLS1naXQg YS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdEdMaWIvVGVzdFdlYkV4dGVuc2lvbnMu Y3BwIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRHTGliL1Rlc3RXZWJFeHRlbnNp b25zLmNwcAppbmRleCBkODA3NjFlNTgwMmI5YjEwMjUwN2RlNTJiOTYwMGNjMjJkYzc2MDI5Li41 NTlhZjk1MjhkNjY0ZjNhYWE5MmViZjMzMjRiMWFhNzQ3YzUwMWZhIDEwMDY0NAotLS0gYS9Ub29s cy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdEdMaWIvVGVzdFdlYkV4dGVuc2lvbnMuY3BwCisr KyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0R0xpYi9UZXN0V2ViRXh0ZW5zaW9u cy5jcHAKQEAgLTQ5MiwyNyArNDkyLDI3IEBAIHN0YXRpYyB2b2lkIHRlc3RXZWJFeHRlbnNpb25Q YWdlSUQoV2ViVmlld1Rlc3QqIHRlc3QsIGdjb25zdHBvaW50ZXIpCiAKICAgICB0ZXN0LT5sb2Fk VVJJKCJmb286Ly9ob3N0Ni8iKTsKICAgICB0ZXN0LT53YWl0VW50aWxMb2FkRmluaXNoZWQoKTsK LSAgICBnX2Fzc2VydF90cnVlKHBhZ2VJRENoYW5nZWRFbWl0dGVkKTsKKyAgICBnX2Fzc2VydF9m YWxzZShwYWdlSURDaGFuZ2VkRW1pdHRlZCk7CiAgICAgcGFnZUlEQ2hhbmdlZEVtaXR0ZWQgPSBm YWxzZTsKLSAgICBnX2Fzc2VydF9jbXB1aW50KHBhZ2VJRCwgPCwgd2Via2l0X3dlYl92aWV3X2dl dF9wYWdlX2lkKHRlc3QtPm1fd2ViVmlldykpOworICAgIGdfYXNzZXJ0X2NtcHVpbnQocGFnZUlE LCA9PSwgd2Via2l0X3dlYl92aWV3X2dldF9wYWdlX2lkKHRlc3QtPm1fd2ViVmlldykpOwogICAg IHBhZ2VJRCA9IHdlYmtpdF93ZWJfdmlld19nZXRfcGFnZV9pZCh0ZXN0LT5tX3dlYlZpZXcpOwog ICAgIHByb3h5ID0gdGVzdC0+ZXh0ZW5zaW9uUHJveHkoKTsKICAgICBjaGVja1RpdGxlKHRlc3Qs IHByb3h5LmdldCgpLCAiVGl0bGU2Iik7CiAKICAgICB0ZXN0LT5nb0JhY2soKTsKICAgICB0ZXN0 LT53YWl0VW50aWxMb2FkRmluaXNoZWQoKTsKLSAgICBnX2Fzc2VydF90cnVlKHBhZ2VJRENoYW5n ZWRFbWl0dGVkKTsKKyAgICBnX2Fzc2VydF9mYWxzZShwYWdlSURDaGFuZ2VkRW1pdHRlZCk7CiAg ICAgcGFnZUlEQ2hhbmdlZEVtaXR0ZWQgPSBmYWxzZTsKLSAgICBnX2Fzc2VydF9jbXB1aW50KHBh Z2VJRCwgPiwgd2Via2l0X3dlYl92aWV3X2dldF9wYWdlX2lkKHRlc3QtPm1fd2ViVmlldykpOwor ICAgIGdfYXNzZXJ0X2NtcHVpbnQocGFnZUlELCA9PSwgd2Via2l0X3dlYl92aWV3X2dldF9wYWdl X2lkKHRlc3QtPm1fd2ViVmlldykpOwogICAgIHBhZ2VJRCA9IHdlYmtpdF93ZWJfdmlld19nZXRf cGFnZV9pZCh0ZXN0LT5tX3dlYlZpZXcpOwogICAgIHByb3h5ID0gdGVzdC0+ZXh0ZW5zaW9uUHJv eHkoKTsKICAgICBjaGVja1RpdGxlKHRlc3QsIHByb3h5LmdldCgpLCAiVGl0bGU1Iik7CiAKICAg ICB0ZXN0LT5nb0ZvcndhcmQoKTsKICAgICB0ZXN0LT53YWl0VW50aWxMb2FkRmluaXNoZWQoKTsK LSAgICBnX2Fzc2VydF90cnVlKHBhZ2VJRENoYW5nZWRFbWl0dGVkKTsKKyAgICBnX2Fzc2VydF9m YWxzZShwYWdlSURDaGFuZ2VkRW1pdHRlZCk7CiAgICAgcGFnZUlEQ2hhbmdlZEVtaXR0ZWQgPSBm YWxzZTsKLSAgICBnX2Fzc2VydF9jbXB1aW50KHBhZ2VJRCwgPCwgd2Via2l0X3dlYl92aWV3X2dl dF9wYWdlX2lkKHRlc3QtPm1fd2ViVmlldykpOworICAgIGdfYXNzZXJ0X2NtcHVpbnQocGFnZUlE LCA9PSwgd2Via2l0X3dlYl92aWV3X2dldF9wYWdlX2lkKHRlc3QtPm1fd2ViVmlldykpOwogICAg IHBhZ2VJRCA9IHdlYmtpdF93ZWJfdmlld19nZXRfcGFnZV9pZCh0ZXN0LT5tX3dlYlZpZXcpOwog ICAgIHByb3h5ID0gdGVzdC0+ZXh0ZW5zaW9uUHJveHkoKTsKICAgICBjaGVja1RpdGxlKHRlc3Qs IHByb3h5LmdldCgpLCAiVGl0bGU2Iik7Cg==