196665 2019-04-05 16:44:23 -0700 Clicking "Go Back" from a safe browsing warning from an iframe should navigate the WKWebView back to the previous page 2019-04-09 12:08:02 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=196673 InRadar P2 Normal --- 196688 1 achristensen achristensen aakash_jain ap commit-queue ggaren ryanhaddad tsavell webkit-bot-watchers-bugzilla webkit-bug-importer oldest_to_newest 1524900 0 achristensen 2019-04-05 16:44:23 -0700 Clicking "Go Back" from a safe browsing warning from an iframe should navigate the WKWebView back to the previous page 1524901 1 366858 achristensen 2019-04-05 16:46:58 -0700 Created attachment 366858 Patch 1524903 2 366858 ggaren 2019-04-05 16:58:06 -0700 Comment on attachment 366858 Patch r=me 1524907 3 366860 achristensen 2019-04-05 17:07:50 -0700 Created attachment 366860 Patch 1524908 4 achristensen 2019-04-05 17:10:40 -0700 https://trac.webkit.org/changeset/243956/webkit 1524909 5 webkit-bug-importer 2019-04-05 17:11:15 -0700 <rdar://problem/49662311> 1524950 6 aakash_jain 2019-04-05 19:12:52 -0700 This patch seems to have introduced an API test failure TestWebKitAPI.SafeBrowsing.WKWebViewGoBackIFrame e.g.: See API test failure in https://ews-build.webkit.org/#/builders/9/builds/197 and https://ews-build.webkit.org/#/builders/9/builds/198 Note that we do have EWS for API test now, but EWS didn't get a chance to run API tests on this patch before this patch was landed. 1524964 7 aakash_jain 2019-04-05 20:20:38 -0700 Note that the test is "Timing Out" (not failing). Similarly occurrence on build.webkit.org: https://build.webkit.org/builders/Apple%20iOS%2012%20Simulator%20Release%20WK2%20%28Tests%29/builds/3494/steps/run-api-tests/logs/stdio 1525106 8 ap 2019-04-07 16:54:47 -0700 Please wait for EWS before landing patches. 1525123 9 commit-queue 2019-04-07 19:55:21 -0700 Re-opened since this is blocked by bug 196688 1525433 10 366991 achristensen 2019-04-08 15:48:20 -0700 Created attachment 366991 Patch 1525436 11 achristensen 2019-04-08 15:49:57 -0700 (In reply to Alexey Proskuryakov from comment #8) > Please wait for EWS before landing patches. As one of the bigger supporters of API tests on EWS, I sincerely apologize and promise to do better in the future. I am, contrary to what my behavior last week would indicate, quite glad that we have this new tool. Thanks for getting it working! 1525704 12 366991 commit-queue 2019-04-09 12:08:00 -0700 Comment on attachment 366991 Patch Clearing flags on attachment: 366991 Committed r244089: <https://trac.webkit.org/changeset/244089> 1525705 13 commit-queue 2019-04-09 12:08:02 -0700 All reviewed patches have been landed. Closing bug. 366858 2019-04-05 16:46:58 -0700 2019-04-05 17:07:49 -0700 Patch bug-196665-20190405164657.patch text/plain 8486 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNDM4MzIpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDE5LTA0LTA1ICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgQ2xpY2tpbmcgIkdv IEJhY2siIGZyb20gYSBzYWZlIGJyb3dzaW5nIHdhcm5pbmcgZnJvbSBhbiBpZnJhbWUgc2hvdWxk IG5hdmlnYXRlIHRoZSBXS1dlYlZpZXcgYmFjayB0byB0aGUgcHJldmlvdXMgcGFnZQorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk2NjY1CisgICAgICAg IDxyZGFyOi8vNDUxMTU2Njk+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgSXQgaXMgaW5zdWZmaWNpZW50IHRvIGp1c3Qgbm90IG5hdmlnYXRlIHRoZSBz dWJmcmFtZS4gIFdlIG11c3QgbGVhdmUgdGhlIHBhZ2UgdGhhdCBjb250YWluZWQgaXQuCisKKyAg ICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbToKKyAgICAgICAgKC1bV0tX ZWJWaWV3IF9zaG93U2FmZUJyb3dzaW5nV2FybmluZzpjb21wbGV0aW9uSGFuZGxlcjpdKToKKyAg ICAgICAgKiBVSVByb2Nlc3MvQ29jb2EvV2ViVmlld0ltcGwubW06CisgICAgICAgIChXZWJLaXQ6 OldlYlZpZXdJbXBsOjpzaG93U2FmZUJyb3dzaW5nV2FybmluZyk6CisKIDIwMTktMDQtMDMgIEFs ZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KIAogICAgICAgICBBZGQg U1BJIHRvIGRpc2FibGUgbGVnYWN5IFRMUyBmYWxsYmFjawpJbmRleDogU291cmNlL1dlYktpdC9V SVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tCShyZXZpc2lvbiAyNDM4MzIpCisr KyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tCSh3b3JraW5n IGNvcHkpCkBAIC0xMzU2LDEyICsxMzU2LDE5IEBAIC0gKHZvaWQpX3Nob3dTYWZlQnJvd3NpbmdX YXJuaW5nOihjb25zdCAKICAgICAgICAgYXV0byBzdHJvbmdTZWxmID0gd2Vha1NlbGYuZ2V0KCk7 CiAgICAgICAgIGlmICghc3Ryb25nU2VsZikKICAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAg Ym9vbCBuYXZpZ2F0ZXNNYWluRnJhbWUgPSBXVEY6OnN3aXRjaE9uKHJlc3VsdCwKKyAgICAgICAg Ym9vbCBuYXZpZ2F0ZXNGcmFtZSA9IFdURjo6c3dpdGNoT24ocmVzdWx0LAogICAgICAgICAgICAg W10gKFdlYktpdDo6Q29udGludWVVbnNhZmVMb2FkIGNvbnRpbnVlVW5zYWZlTG9hZCkgeyByZXR1 cm4gY29udGludWVVbnNhZmVMb2FkID09IFdlYktpdDo6Q29udGludWVVbnNhZmVMb2FkOjpZZXM7 IH0sCiAgICAgICAgICAgICBbXSAoY29uc3QgVVJMJikgeyByZXR1cm4gdHJ1ZTsgfQogICAgICAg ICApOwotICAgICAgICBpZiAobmF2aWdhdGVzTWFpbkZyYW1lICYmIFtzdHJvbmdTZWxmLT5fc2Fm ZUJyb3dzaW5nV2FybmluZyBmb3JNYWluRnJhbWVOYXZpZ2F0aW9uXSkKKyAgICAgICAgYm9vbCBm b3JNYWluRnJhbWVOYXZpZ2F0aW9uID0gc3Ryb25nU2VsZi0+X3NhZmVCcm93c2luZ1dhcm5pbmcg JiYgW3N0cm9uZ1NlbGYtPl9zYWZlQnJvd3NpbmdXYXJuaW5nIGZvck1haW5GcmFtZU5hdmlnYXRp b25dOworICAgICAgICBpZiAobmF2aWdhdGVzRnJhbWUgJiYgZm9yTWFpbkZyYW1lTmF2aWdhdGlv bikgeworICAgICAgICAgICAgLy8gVGhlIHNhZmUgYnJvd3Npbmcgd2FybmluZyB3aWxsIGJlIGhp ZGRlbiBvbmNlIHRoZSBuZXh0IHBhZ2UgaXMgc2hvd24uCiAgICAgICAgICAgICByZXR1cm47Cisg ICAgICAgIH0KKyAgICAgICAgaWYgKCFuYXZpZ2F0ZXNGcmFtZSAmJiBzdHJvbmdTZWxmLT5fc2Fm ZUJyb3dzaW5nV2FybmluZyAmJiAhZm9yTWFpbkZyYW1lTmF2aWdhdGlvbikgeworICAgICAgICAg ICAgW3N0cm9uZ1NlbGYgZ29CYWNrXTsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQog ICAgICAgICBbc3RkOjpleGNoYW5nZShzdHJvbmdTZWxmLT5fc2FmZUJyb3dzaW5nV2FybmluZywg bnVsbHB0cikgcmVtb3ZlRnJvbVN1cGVydmlld107CiAgICAgfV0pOwogICAgIFtzZWxmIGFkZFN1 YnZpZXc6X3NhZmVCcm93c2luZ1dhcm5pbmcuZ2V0KCldOwpJbmRleDogU291cmNlL1dlYktpdC9V SVByb2Nlc3MvQ29jb2EvV2ViVmlld0ltcGwubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktp dC9VSVByb2Nlc3MvQ29jb2EvV2ViVmlld0ltcGwubW0JKHJldmlzaW9uIDI0MzgzMikKKysrIFNv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dlYlZpZXdJbXBsLm1tCSh3b3JraW5nIGNvcHkp CkBAIC0xNTg3LDEyICsxNTg3LDE5IEBAIHZvaWQgV2ViVmlld0ltcGw6OnNob3dTYWZlQnJvd3Np bmdXYXJuaW4KICAgICAgICAgY29tcGxldGlvbkhhbmRsZXIoV1RGTW92ZShyZXN1bHQpKTsKICAg ICAgICAgaWYgKCF3ZWFrVGhpcykKICAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgYm9vbCBu YXZpZ2F0ZXNNYWluRnJhbWUgPSBXVEY6OnN3aXRjaE9uKHJlc3VsdCwKKyAgICAgICAgYm9vbCBu YXZpZ2F0ZXNGcmFtZSA9IFdURjo6c3dpdGNoT24ocmVzdWx0LAogICAgICAgICAgICAgW10gKENv bnRpbnVlVW5zYWZlTG9hZCBjb250aW51ZVVuc2FmZUxvYWQpIHsgcmV0dXJuIGNvbnRpbnVlVW5z YWZlTG9hZCA9PSBDb250aW51ZVVuc2FmZUxvYWQ6OlllczsgfSwKICAgICAgICAgICAgIFtdIChj b25zdCBVUkwmKSB7IHJldHVybiB0cnVlOyB9CiAgICAgICAgICk7Ci0gICAgICAgIGlmIChuYXZp Z2F0ZXNNYWluRnJhbWUgJiYgW3dlYWtUaGlzLT5tX3NhZmVCcm93c2luZ1dhcm5pbmcgZm9yTWFp bkZyYW1lTmF2aWdhdGlvbl0pCisgICAgICAgIGJvb2wgZm9yTWFpbkZyYW1lTmF2aWdhdGlvbiA9 IFt3ZWFrVGhpcy0+bV9zYWZlQnJvd3NpbmdXYXJuaW5nIGZvck1haW5GcmFtZU5hdmlnYXRpb25d OworICAgICAgICBpZiAobmF2aWdhdGVzRnJhbWUgJiYgZm9yTWFpbkZyYW1lTmF2aWdhdGlvbikg eworICAgICAgICAgICAgLy8gVGhlIHNhZmUgYnJvd3Npbmcgd2FybmluZyB3aWxsIGJlIGhpZGRl biBvbmNlIHRoZSBuZXh0IHBhZ2UgaXMgc2hvd24uCiAgICAgICAgICAgICByZXR1cm47CisgICAg ICAgIH0KKyAgICAgICAgaWYgKCFuYXZpZ2F0ZXNGcmFtZSAmJiB3ZWFrVGhpcy0+bV9zYWZlQnJv d3NpbmdXYXJuaW5nICYmICFmb3JNYWluRnJhbWVOYXZpZ2F0aW9uKSB7CisgICAgICAgICAgICB3 ZWFrVGhpcy0+bV9wYWdlLT5nb0JhY2soKTsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAg fQogICAgICAgICBbc3RkOjpleGNoYW5nZSh3ZWFrVGhpcy0+bV9zYWZlQnJvd3NpbmdXYXJuaW5n LCBudWxscHRyKSByZW1vdmVGcm9tU3VwZXJ2aWV3XTsKICAgICB9XSk7CiAgICAgW21fdmlldyBh ZGRTdWJ2aWV3Om1fc2FmZUJyb3dzaW5nV2FybmluZy5nZXQoKV07CkluZGV4OiBUb29scy9DaGFu Z2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNDM5NTMpCisr KyBUb29scy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxOSBAQAorMjAxOS0w NC0wNSAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgorCisgICAg ICAgIENsaWNraW5nICJHbyBCYWNrIiBmcm9tIGEgc2FmZSBicm93c2luZyB3YXJuaW5nIGZyb20g YW4gaWZyYW1lIHNob3VsZCBuYXZpZ2F0ZSB0aGUgV0tXZWJWaWV3IGJhY2sgdG8gdGhlIHByZXZp b3VzIHBhZ2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTE5NjY2NQorICAgICAgICA8cmRhcjovLzQ1MTE1NjY5PgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRD b2NvYS9TYWZlQnJvd3NpbmcubW06CisgICAgICAgIChnb0JhY2spOgorICAgICAgICAoK1tTaW1w bGVMb29rdXBDb250ZXh0IHNoYXJlZExvb2t1cENvbnRleHRdKToKKyAgICAgICAgKC1bU2ltcGxl TG9va3VwQ29udGV4dCBsb29rVXBVUkw6Y29tcGxldGlvbkhhbmRsZXI6XSk6CisgICAgICAgIChU RVNUKToKKyAgICAgICAgKCtbU2ltcGxlM0xvb2t1cENvbnRleHQgc2hhcmVkTG9va3VwQ29udGV4 dF0pOiBEZWxldGVkLgorICAgICAgICAoLVtTaW1wbGUzTG9va3VwQ29udGV4dCBsb29rVXBVUkw6 Y29tcGxldGlvbkhhbmRsZXI6XSk6IERlbGV0ZWQuCisKIDIwMTktMDQtMDUgIEFha2FzaCBKYWlu ICA8YWFrYXNoX2phaW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtld3MtYnVpbGRdIEFkZCBjb25m aWd1cmF0aW9uIGFuZCBhcmNoaXRlY3R1cmUgZm9yIHdpbmRvd3MgYnVpbGRlcnMKSW5kZXg6IFRv b2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvU2FmZUJyb3dzaW5nLm1tCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFRvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvU2FmZUJyb3dz aW5nLm1tCShyZXZpc2lvbiAyNDM4MzIpCisrKyBUb29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dl YktpdENvY29hL1NhZmVCcm93c2luZy5tbQkod29ya2luZyBjb3B5KQpAQCAtMjIwLDEyICsyMjAs MTUgQEAgc3RhdGljIHZvaWQgY2hlY2tUaXRsZUFuZENsaWNrKFVJQnV0dG9uIAogfQogI2VuZGlm CiAKLXRlbXBsYXRlPHR5cGVuYW1lIFZpZXdUeXBlPiB2b2lkIGdvQmFjayhWaWV3VHlwZSAqdmll dykKK3RlbXBsYXRlPHR5cGVuYW1lIFZpZXdUeXBlPiB2b2lkIGdvQmFjayhWaWV3VHlwZSAqdmll dywgYm9vbCBtYWluRnJhbWUgPSB0cnVlKQogewogICAgIFdLV2ViVmlldyAqd2ViVmlldyA9IChX S1dlYlZpZXcgKil2aWV3LnN1cGVydmlldzsKICAgICBhdXRvIGJveCA9IHZpZXcuc3Vidmlld3Mu Zmlyc3RPYmplY3Q7CiAgICAgY2hlY2tUaXRsZUFuZENsaWNrKGJveC5zdWJ2aWV3c1szXSwgIkdv IEJhY2siKTsKLSAgICBFWFBFQ1RfRVEoW3dlYlZpZXcgX3NhZmVCcm93c2luZ1dhcm5pbmddLCBu aWwpOworICAgIGlmIChtYWluRnJhbWUpCisgICAgICAgIEVYUEVDVF9FUShbd2ViVmlldyBfc2Fm ZUJyb3dzaW5nV2FybmluZ10sIG5pbCk7CisgICAgZWxzZQorICAgICAgICBFWFBFQ1RfTkUoW3dl YlZpZXcgX3NhZmVCcm93c2luZ1dhcm5pbmddLCBuaWwpOwogfQogCiBURVNUKFNhZmVCcm93c2lu ZywgR29CYWNrKQpAQCAtMzY4LDIxICszNzEsMjMgQEAgVEVTVChTYWZlQnJvd3NpbmcsIFVSTE9i c2VydmF0aW9uKQogICAgIH0KIH0KIAotQGludGVyZmFjZSBTaW1wbGUzTG9va3VwQ29udGV4dCA6 IE5TT2JqZWN0CitzdGF0aWMgUmV0YWluUHRyPE5TU3RyaW5nPiBwaGlzaGluZ1Jlc291cmNlTmFt ZTsKKworQGludGVyZmFjZSBTaW1wbGVMb29rdXBDb250ZXh0IDogTlNPYmplY3QKIEBlbmQKIAot QGltcGxlbWVudGF0aW9uIFNpbXBsZTNMb29rdXBDb250ZXh0CitAaW1wbGVtZW50YXRpb24gU2lt cGxlTG9va3VwQ29udGV4dAogCi0rIChTaW1wbGUzTG9va3VwQ29udGV4dCAqKXNoYXJlZExvb2t1 cENvbnRleHQKKysgKFNpbXBsZUxvb2t1cENvbnRleHQgKilzaGFyZWRMb29rdXBDb250ZXh0CiB7 Ci0gICAgc3RhdGljIFNpbXBsZTNMb29rdXBDb250ZXh0ICpjb250ZXh0ID0gW1tTaW1wbGUzTG9v a3VwQ29udGV4dCBhbGxvY10gaW5pdF07CisgICAgc3RhdGljIFNpbXBsZUxvb2t1cENvbnRleHQg KmNvbnRleHQgPSBbW1NpbXBsZUxvb2t1cENvbnRleHQgYWxsb2NdIGluaXRdOwogICAgIHJldHVy biBjb250ZXh0OwogfQogCiAtICh2b2lkKWxvb2tVcFVSTDooTlNVUkwgKilVUkwgY29tcGxldGlv bkhhbmRsZXI6KHZvaWQgKF4pKFRlc3RMb29rdXBSZXN1bHQgKiwgTlNFcnJvciAqKSljb21wbGV0 aW9uSGFuZGxlcgogewogICAgIEJPT0wgcGhpc2hpbmcgPSBOTzsKLSAgICBpZiAoW1VSTCBpc0Vx dWFsOnJlc291cmNlVVJMKEAic2ltcGxlMyIpXSkKKyAgICBpZiAoW1VSTCBpc0VxdWFsOnJlc291 cmNlVVJMKHBoaXNoaW5nUmVzb3VyY2VOYW1lLmdldCgpKV0pCiAgICAgICAgIHBoaXNoaW5nID0g WUVTOwogICAgIGNvbXBsZXRpb25IYW5kbGVyKFtUZXN0TG9va3VwUmVzdWx0IHJlc3VsdFdpdGhS ZXN1bHRzOkBbW1Rlc3RTZXJ2aWNlTG9va3VwUmVzdWx0IHJlc3VsdFdpdGhQcm92aWRlcjpAIlRl c3RQcm92aWRlciIgcGhpc2hpbmc6cGhpc2hpbmcgbWFsd2FyZTpOTyB1bndhbnRlZFNvZnR3YXJl Ok5PXV1dLCBuaWwpOwogfQpAQCAtNDA1LDcgKzQxMCw4IEBAIC0gKHZvaWQpd2ViVmlldzooV0tX ZWJWaWV3ICopd2ViVmlldyBkaWQKIAogVEVTVChTYWZlQnJvd3NpbmcsIFdLV2ViVmlld0dvQmFj aykKIHsKLSAgICBDbGFzc01ldGhvZFN3aXp6bGVyIHN3aXp6bGVyKG9iamNfZ2V0Q2xhc3MoIlNT Qkxvb2t1cENvbnRleHQiKSwgQHNlbGVjdG9yKHNoYXJlZExvb2t1cENvbnRleHQpLCBbU2ltcGxl M0xvb2t1cENvbnRleHQgbWV0aG9kRm9yU2VsZWN0b3I6QHNlbGVjdG9yKHNoYXJlZExvb2t1cENv bnRleHQpXSk7CisgICAgcGhpc2hpbmdSZXNvdXJjZU5hbWUgPSBAInNpbXBsZTMiOworICAgIENs YXNzTWV0aG9kU3dpenpsZXIgc3dpenpsZXIob2JqY19nZXRDbGFzcygiU1NCTG9va3VwQ29udGV4 dCIpLCBAc2VsZWN0b3Ioc2hhcmVkTG9va3VwQ29udGV4dCksIFtTaW1wbGVMb29rdXBDb250ZXh0 IG1ldGhvZEZvclNlbGVjdG9yOkBzZWxlY3RvcihzaGFyZWRMb29rdXBDb250ZXh0KV0pOwogICAg IAogICAgIGF1dG8gZGVsZWdhdGUgPSBhZG9wdE5TKFtXS1dlYlZpZXdHb0JhY2tOYXZpZ2F0aW9u RGVsZWdhdGUgbmV3XSk7CiAgICAgYXV0byB3ZWJWaWV3ID0gYWRvcHROUyhbV0tXZWJWaWV3IG5l d10pOwpAQCAtNDI3LDYgKzQzMywyNyBAQCBURVNUKFNhZmVCcm93c2luZywgV0tXZWJWaWV3R29C YWNrKQogICAgIEVYUEVDVF9UUlVFKFtbd2ViVmlldyBVUkxdIGlzRXF1YWw6cmVzb3VyY2VVUkwo QCJzaW1wbGUyIildKTsKIH0KIAorVEVTVChTYWZlQnJvd3NpbmcsIFdLV2ViVmlld0dvQmFja0lG cmFtZSkKK3sKKyAgICBwaGlzaGluZ1Jlc291cmNlTmFtZSA9IEAic2ltcGxlIjsKKyAgICBDbGFz c01ldGhvZFN3aXp6bGVyIHN3aXp6bGVyKG9iamNfZ2V0Q2xhc3MoIlNTQkxvb2t1cENvbnRleHQi KSwgQHNlbGVjdG9yKHNoYXJlZExvb2t1cENvbnRleHQpLCBbU2ltcGxlTG9va3VwQ29udGV4dCBt ZXRob2RGb3JTZWxlY3RvcjpAc2VsZWN0b3Ioc2hhcmVkTG9va3VwQ29udGV4dCldKTsKKyAgICAK KyAgICBhdXRvIGRlbGVnYXRlID0gYWRvcHROUyhbV0tXZWJWaWV3R29CYWNrTmF2aWdhdGlvbkRl bGVnYXRlIG5ld10pOworICAgIGF1dG8gd2ViVmlldyA9IGFkb3B0TlMoW1dLV2ViVmlldyBuZXdd KTsKKyAgICBbd2ViVmlldyBjb25maWd1cmF0aW9uXS5wcmVmZXJlbmNlcy5fc2FmZUJyb3dzaW5n RW5hYmxlZCA9IFlFUzsKKyAgICBbd2ViVmlldyBzZXROYXZpZ2F0aW9uRGVsZWdhdGU6ZGVsZWdh dGUuZ2V0KCldOworICAgIFt3ZWJWaWV3IGxvYWRSZXF1ZXN0OltOU1VSTFJlcXVlc3QgcmVxdWVz dFdpdGhVUkw6cmVzb3VyY2VVUkwoQCJzaW1wbGUyIildXTsKKyAgICBUZXN0V2ViS2l0QVBJOjpV dGlsOjpydW4oJm5hdmlnYXRpb25GaW5pc2hlZCk7CisgICAgCisgICAgW3dlYlZpZXcgbG9hZFJl cXVlc3Q6W05TVVJMUmVxdWVzdCByZXF1ZXN0V2l0aFVSTDpyZXNvdXJjZVVSTChAInNpbXBsZS1p ZnJhbWUiKV1dOworICAgIHdoaWxlICghW3dlYlZpZXcgX3NhZmVCcm93c2luZ1dhcm5pbmddKQor ICAgICAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpzcGluUnVuTG9vcCgpOworICAgIG5hdmlnYXRp b25GaW5pc2hlZCA9IGZhbHNlOworICAgIGdvQmFjayhbd2ViVmlldyBfc2FmZUJyb3dzaW5nV2Fy bmluZ10sIGZhbHNlKTsKKyAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJm5hdmlnYXRpb25G aW5pc2hlZCk7CisgICAgRVhQRUNUX1RSVUUoW1t3ZWJWaWV3IFVSTF0gaXNFcXVhbDpyZXNvdXJj ZVVSTChAInNpbXBsZTIiKV0pOworfQorCiBAaW50ZXJmYWNlIE51bGxMb29rdXBDb250ZXh0IDog TlNPYmplY3QKIEBlbmQKIEBpbXBsZW1lbnRhdGlvbiBOdWxsTG9va3VwQ29udGV4dAo= 366860 2019-04-05 17:07:50 -0700 2019-04-08 15:48:18 -0700 Patch bug-196665-20190405170749.patch text/plain 8444 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNDM4MzIpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDE5LTA0LTA1ICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgQ2xpY2tpbmcgIkdv IEJhY2siIGZyb20gYSBzYWZlIGJyb3dzaW5nIHdhcm5pbmcgZnJvbSBhbiBpZnJhbWUgc2hvdWxk IG5hdmlnYXRlIHRoZSBXS1dlYlZpZXcgYmFjayB0byB0aGUgcHJldmlvdXMgcGFnZQorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk2NjY1CisgICAgICAg IDxyZGFyOi8vNDUxMTU2Njk+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgR2VvZmYgR2FyZW4uCisK KyAgICAgICAgSXQgaXMgaW5zdWZmaWNpZW50IHRvIGp1c3Qgbm90IG5hdmlnYXRlIHRoZSBzdWJm cmFtZS4gIFdlIG11c3QgbGVhdmUgdGhlIHBhZ2UgdGhhdCBjb250YWluZWQgaXQuCisKKyAgICAg ICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbToKKyAgICAgICAgKC1bV0tXZWJW aWV3IF9zaG93U2FmZUJyb3dzaW5nV2FybmluZzpjb21wbGV0aW9uSGFuZGxlcjpdKToKKyAgICAg ICAgKiBVSVByb2Nlc3MvQ29jb2EvV2ViVmlld0ltcGwubW06CisgICAgICAgIChXZWJLaXQ6Oldl YlZpZXdJbXBsOjpzaG93U2FmZUJyb3dzaW5nV2FybmluZyk6CisKIDIwMTktMDQtMDMgIEFsZXgg Q2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KIAogICAgICAgICBBZGQgU1BJ IHRvIGRpc2FibGUgbGVnYWN5IFRMUyBmYWxsYmFjawpJbmRleDogU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tCShyZXZpc2lvbiAyNDM4MzIpCisrKyBT b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tCSh3b3JraW5nIGNv cHkpCkBAIC0xMzU2LDEyICsxMzU2LDE5IEBAIC0gKHZvaWQpX3Nob3dTYWZlQnJvd3NpbmdXYXJu aW5nOihjb25zdCAKICAgICAgICAgYXV0byBzdHJvbmdTZWxmID0gd2Vha1NlbGYuZ2V0KCk7CiAg ICAgICAgIGlmICghc3Ryb25nU2VsZikKICAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgYm9v bCBuYXZpZ2F0ZXNNYWluRnJhbWUgPSBXVEY6OnN3aXRjaE9uKHJlc3VsdCwKKyAgICAgICAgYm9v bCBuYXZpZ2F0ZXNGcmFtZSA9IFdURjo6c3dpdGNoT24ocmVzdWx0LAogICAgICAgICAgICAgW10g KFdlYktpdDo6Q29udGludWVVbnNhZmVMb2FkIGNvbnRpbnVlVW5zYWZlTG9hZCkgeyByZXR1cm4g Y29udGludWVVbnNhZmVMb2FkID09IFdlYktpdDo6Q29udGludWVVbnNhZmVMb2FkOjpZZXM7IH0s CiAgICAgICAgICAgICBbXSAoY29uc3QgVVJMJikgeyByZXR1cm4gdHJ1ZTsgfQogICAgICAgICAp OwotICAgICAgICBpZiAobmF2aWdhdGVzTWFpbkZyYW1lICYmIFtzdHJvbmdTZWxmLT5fc2FmZUJy b3dzaW5nV2FybmluZyBmb3JNYWluRnJhbWVOYXZpZ2F0aW9uXSkKKyAgICAgICAgYm9vbCBmb3JN YWluRnJhbWVOYXZpZ2F0aW9uID0gW3N0cm9uZ1NlbGYtPl9zYWZlQnJvd3NpbmdXYXJuaW5nIGZv ck1haW5GcmFtZU5hdmlnYXRpb25dOworICAgICAgICBpZiAobmF2aWdhdGVzRnJhbWUgJiYgZm9y TWFpbkZyYW1lTmF2aWdhdGlvbikgeworICAgICAgICAgICAgLy8gVGhlIHNhZmUgYnJvd3Npbmcg d2FybmluZyB3aWxsIGJlIGhpZGRlbiBvbmNlIHRoZSBuZXh0IHBhZ2UgaXMgc2hvd24uCiAgICAg ICAgICAgICByZXR1cm47CisgICAgICAgIH0KKyAgICAgICAgaWYgKCFuYXZpZ2F0ZXNGcmFtZSAm JiBzdHJvbmdTZWxmLT5fc2FmZUJyb3dzaW5nV2FybmluZyAmJiAhZm9yTWFpbkZyYW1lTmF2aWdh dGlvbikgeworICAgICAgICAgICAgW3N0cm9uZ1NlbGYgZ29CYWNrXTsKKyAgICAgICAgICAgIHJl dHVybjsKKyAgICAgICAgfQogICAgICAgICBbc3RkOjpleGNoYW5nZShzdHJvbmdTZWxmLT5fc2Fm ZUJyb3dzaW5nV2FybmluZywgbnVsbHB0cikgcmVtb3ZlRnJvbVN1cGVydmlld107CiAgICAgfV0p OwogICAgIFtzZWxmIGFkZFN1YnZpZXc6X3NhZmVCcm93c2luZ1dhcm5pbmcuZ2V0KCldOwpJbmRl eDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvV2ViVmlld0ltcGwubW0KPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvV2ViVmlld0ltcGwubW0JKHJldmlz aW9uIDI0MzgzMikKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dlYlZpZXdJbXBs Lm1tCSh3b3JraW5nIGNvcHkpCkBAIC0xNTg3LDEyICsxNTg3LDE5IEBAIHZvaWQgV2ViVmlld0lt cGw6OnNob3dTYWZlQnJvd3NpbmdXYXJuaW4KICAgICAgICAgY29tcGxldGlvbkhhbmRsZXIoV1RG TW92ZShyZXN1bHQpKTsKICAgICAgICAgaWYgKCF3ZWFrVGhpcykKICAgICAgICAgICAgIHJldHVy bjsKLSAgICAgICAgYm9vbCBuYXZpZ2F0ZXNNYWluRnJhbWUgPSBXVEY6OnN3aXRjaE9uKHJlc3Vs dCwKKyAgICAgICAgYm9vbCBuYXZpZ2F0ZXNGcmFtZSA9IFdURjo6c3dpdGNoT24ocmVzdWx0LAog ICAgICAgICAgICAgW10gKENvbnRpbnVlVW5zYWZlTG9hZCBjb250aW51ZVVuc2FmZUxvYWQpIHsg cmV0dXJuIGNvbnRpbnVlVW5zYWZlTG9hZCA9PSBDb250aW51ZVVuc2FmZUxvYWQ6OlllczsgfSwK ICAgICAgICAgICAgIFtdIChjb25zdCBVUkwmKSB7IHJldHVybiB0cnVlOyB9CiAgICAgICAgICk7 Ci0gICAgICAgIGlmIChuYXZpZ2F0ZXNNYWluRnJhbWUgJiYgW3dlYWtUaGlzLT5tX3NhZmVCcm93 c2luZ1dhcm5pbmcgZm9yTWFpbkZyYW1lTmF2aWdhdGlvbl0pCisgICAgICAgIGJvb2wgZm9yTWFp bkZyYW1lTmF2aWdhdGlvbiA9IFt3ZWFrVGhpcy0+bV9zYWZlQnJvd3NpbmdXYXJuaW5nIGZvck1h aW5GcmFtZU5hdmlnYXRpb25dOworICAgICAgICBpZiAobmF2aWdhdGVzRnJhbWUgJiYgZm9yTWFp bkZyYW1lTmF2aWdhdGlvbikgeworICAgICAgICAgICAgLy8gVGhlIHNhZmUgYnJvd3Npbmcgd2Fy bmluZyB3aWxsIGJlIGhpZGRlbiBvbmNlIHRoZSBuZXh0IHBhZ2UgaXMgc2hvd24uCiAgICAgICAg ICAgICByZXR1cm47CisgICAgICAgIH0KKyAgICAgICAgaWYgKCFuYXZpZ2F0ZXNGcmFtZSAmJiB3 ZWFrVGhpcy0+bV9zYWZlQnJvd3NpbmdXYXJuaW5nICYmICFmb3JNYWluRnJhbWVOYXZpZ2F0aW9u KSB7CisgICAgICAgICAgICB3ZWFrVGhpcy0+bV9wYWdlLT5nb0JhY2soKTsKKyAgICAgICAgICAg IHJldHVybjsKKyAgICAgICAgfQogICAgICAgICBbc3RkOjpleGNoYW5nZSh3ZWFrVGhpcy0+bV9z YWZlQnJvd3NpbmdXYXJuaW5nLCBudWxscHRyKSByZW1vdmVGcm9tU3VwZXJ2aWV3XTsKICAgICB9 XSk7CiAgICAgW21fdmlldyBhZGRTdWJ2aWV3Om1fc2FmZUJyb3dzaW5nV2FybmluZy5nZXQoKV07 CkluZGV4OiBUb29scy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvQ2hhbmdlTG9nCShy ZXZpc2lvbiAyNDM5NTMpCisrKyBUb29scy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEs MyArMSwxOSBAQAorMjAxOS0wNC0wNSAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3 ZWJraXQub3JnPgorCisgICAgICAgIENsaWNraW5nICJHbyBCYWNrIiBmcm9tIGEgc2FmZSBicm93 c2luZyB3YXJuaW5nIGZyb20gYW4gaWZyYW1lIHNob3VsZCBuYXZpZ2F0ZSB0aGUgV0tXZWJWaWV3 IGJhY2sgdG8gdGhlIHByZXZpb3VzIHBhZ2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTE5NjY2NQorICAgICAgICA8cmRhcjovLzQ1MTE1NjY5PgorCisg ICAgICAgIFJldmlld2VkIGJ5IEdlb2ZmIEdhcmVuLgorCisgICAgICAgICogVGVzdFdlYktpdEFQ SS9UZXN0cy9XZWJLaXRDb2NvYS9TYWZlQnJvd3NpbmcubW06CisgICAgICAgIChnb0JhY2spOgor ICAgICAgICAoK1tTaW1wbGVMb29rdXBDb250ZXh0IHNoYXJlZExvb2t1cENvbnRleHRdKToKKyAg ICAgICAgKC1bU2ltcGxlTG9va3VwQ29udGV4dCBsb29rVXBVUkw6Y29tcGxldGlvbkhhbmRsZXI6 XSk6CisgICAgICAgIChURVNUKToKKyAgICAgICAgKCtbU2ltcGxlM0xvb2t1cENvbnRleHQgc2hh cmVkTG9va3VwQ29udGV4dF0pOiBEZWxldGVkLgorICAgICAgICAoLVtTaW1wbGUzTG9va3VwQ29u dGV4dCBsb29rVXBVUkw6Y29tcGxldGlvbkhhbmRsZXI6XSk6IERlbGV0ZWQuCisKIDIwMTktMDQt MDUgIEFha2FzaCBKYWluICA8YWFrYXNoX2phaW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtld3Mt YnVpbGRdIEFkZCBjb25maWd1cmF0aW9uIGFuZCBhcmNoaXRlY3R1cmUgZm9yIHdpbmRvd3MgYnVp bGRlcnMKSW5kZXg6IFRvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvU2FmZUJy b3dzaW5nLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0 Q29jb2EvU2FmZUJyb3dzaW5nLm1tCShyZXZpc2lvbiAyNDM4MzIpCisrKyBUb29scy9UZXN0V2Vi S2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1NhZmVCcm93c2luZy5tbQkod29ya2luZyBjb3B5KQpA QCAtMjIwLDEyICsyMjAsMTUgQEAgc3RhdGljIHZvaWQgY2hlY2tUaXRsZUFuZENsaWNrKFVJQnV0 dG9uIAogfQogI2VuZGlmCiAKLXRlbXBsYXRlPHR5cGVuYW1lIFZpZXdUeXBlPiB2b2lkIGdvQmFj ayhWaWV3VHlwZSAqdmlldykKK3RlbXBsYXRlPHR5cGVuYW1lIFZpZXdUeXBlPiB2b2lkIGdvQmFj ayhWaWV3VHlwZSAqdmlldywgYm9vbCBtYWluRnJhbWUgPSB0cnVlKQogewogICAgIFdLV2ViVmll dyAqd2ViVmlldyA9IChXS1dlYlZpZXcgKil2aWV3LnN1cGVydmlldzsKICAgICBhdXRvIGJveCA9 IHZpZXcuc3Vidmlld3MuZmlyc3RPYmplY3Q7CiAgICAgY2hlY2tUaXRsZUFuZENsaWNrKGJveC5z dWJ2aWV3c1szXSwgIkdvIEJhY2siKTsKLSAgICBFWFBFQ1RfRVEoW3dlYlZpZXcgX3NhZmVCcm93 c2luZ1dhcm5pbmddLCBuaWwpOworICAgIGlmIChtYWluRnJhbWUpCisgICAgICAgIEVYUEVDVF9F UShbd2ViVmlldyBfc2FmZUJyb3dzaW5nV2FybmluZ10sIG5pbCk7CisgICAgZWxzZQorICAgICAg ICBFWFBFQ1RfTkUoW3dlYlZpZXcgX3NhZmVCcm93c2luZ1dhcm5pbmddLCBuaWwpOwogfQogCiBU RVNUKFNhZmVCcm93c2luZywgR29CYWNrKQpAQCAtMzY4LDIxICszNzEsMjMgQEAgVEVTVChTYWZl QnJvd3NpbmcsIFVSTE9ic2VydmF0aW9uKQogICAgIH0KIH0KIAotQGludGVyZmFjZSBTaW1wbGUz TG9va3VwQ29udGV4dCA6IE5TT2JqZWN0CitzdGF0aWMgUmV0YWluUHRyPE5TU3RyaW5nPiBwaGlz aGluZ1Jlc291cmNlTmFtZTsKKworQGludGVyZmFjZSBTaW1wbGVMb29rdXBDb250ZXh0IDogTlNP YmplY3QKIEBlbmQKIAotQGltcGxlbWVudGF0aW9uIFNpbXBsZTNMb29rdXBDb250ZXh0CitAaW1w bGVtZW50YXRpb24gU2ltcGxlTG9va3VwQ29udGV4dAogCi0rIChTaW1wbGUzTG9va3VwQ29udGV4 dCAqKXNoYXJlZExvb2t1cENvbnRleHQKKysgKFNpbXBsZUxvb2t1cENvbnRleHQgKilzaGFyZWRM b29rdXBDb250ZXh0CiB7Ci0gICAgc3RhdGljIFNpbXBsZTNMb29rdXBDb250ZXh0ICpjb250ZXh0 ID0gW1tTaW1wbGUzTG9va3VwQ29udGV4dCBhbGxvY10gaW5pdF07CisgICAgc3RhdGljIFNpbXBs ZUxvb2t1cENvbnRleHQgKmNvbnRleHQgPSBbW1NpbXBsZUxvb2t1cENvbnRleHQgYWxsb2NdIGlu aXRdOwogICAgIHJldHVybiBjb250ZXh0OwogfQogCiAtICh2b2lkKWxvb2tVcFVSTDooTlNVUkwg KilVUkwgY29tcGxldGlvbkhhbmRsZXI6KHZvaWQgKF4pKFRlc3RMb29rdXBSZXN1bHQgKiwgTlNF cnJvciAqKSljb21wbGV0aW9uSGFuZGxlcgogewogICAgIEJPT0wgcGhpc2hpbmcgPSBOTzsKLSAg ICBpZiAoW1VSTCBpc0VxdWFsOnJlc291cmNlVVJMKEAic2ltcGxlMyIpXSkKKyAgICBpZiAoW1VS TCBpc0VxdWFsOnJlc291cmNlVVJMKHBoaXNoaW5nUmVzb3VyY2VOYW1lLmdldCgpKV0pCiAgICAg ICAgIHBoaXNoaW5nID0gWUVTOwogICAgIGNvbXBsZXRpb25IYW5kbGVyKFtUZXN0TG9va3VwUmVz dWx0IHJlc3VsdFdpdGhSZXN1bHRzOkBbW1Rlc3RTZXJ2aWNlTG9va3VwUmVzdWx0IHJlc3VsdFdp dGhQcm92aWRlcjpAIlRlc3RQcm92aWRlciIgcGhpc2hpbmc6cGhpc2hpbmcgbWFsd2FyZTpOTyB1 bndhbnRlZFNvZnR3YXJlOk5PXV1dLCBuaWwpOwogfQpAQCAtNDA1LDcgKzQxMCw4IEBAIC0gKHZv aWQpd2ViVmlldzooV0tXZWJWaWV3ICopd2ViVmlldyBkaWQKIAogVEVTVChTYWZlQnJvd3Npbmcs IFdLV2ViVmlld0dvQmFjaykKIHsKLSAgICBDbGFzc01ldGhvZFN3aXp6bGVyIHN3aXp6bGVyKG9i amNfZ2V0Q2xhc3MoIlNTQkxvb2t1cENvbnRleHQiKSwgQHNlbGVjdG9yKHNoYXJlZExvb2t1cENv bnRleHQpLCBbU2ltcGxlM0xvb2t1cENvbnRleHQgbWV0aG9kRm9yU2VsZWN0b3I6QHNlbGVjdG9y KHNoYXJlZExvb2t1cENvbnRleHQpXSk7CisgICAgcGhpc2hpbmdSZXNvdXJjZU5hbWUgPSBAInNp bXBsZTMiOworICAgIENsYXNzTWV0aG9kU3dpenpsZXIgc3dpenpsZXIob2JqY19nZXRDbGFzcygi U1NCTG9va3VwQ29udGV4dCIpLCBAc2VsZWN0b3Ioc2hhcmVkTG9va3VwQ29udGV4dCksIFtTaW1w bGVMb29rdXBDb250ZXh0IG1ldGhvZEZvclNlbGVjdG9yOkBzZWxlY3RvcihzaGFyZWRMb29rdXBD b250ZXh0KV0pOwogICAgIAogICAgIGF1dG8gZGVsZWdhdGUgPSBhZG9wdE5TKFtXS1dlYlZpZXdH b0JhY2tOYXZpZ2F0aW9uRGVsZWdhdGUgbmV3XSk7CiAgICAgYXV0byB3ZWJWaWV3ID0gYWRvcHRO UyhbV0tXZWJWaWV3IG5ld10pOwpAQCAtNDI3LDYgKzQzMywyNyBAQCBURVNUKFNhZmVCcm93c2lu ZywgV0tXZWJWaWV3R29CYWNrKQogICAgIEVYUEVDVF9UUlVFKFtbd2ViVmlldyBVUkxdIGlzRXF1 YWw6cmVzb3VyY2VVUkwoQCJzaW1wbGUyIildKTsKIH0KIAorVEVTVChTYWZlQnJvd3NpbmcsIFdL V2ViVmlld0dvQmFja0lGcmFtZSkKK3sKKyAgICBwaGlzaGluZ1Jlc291cmNlTmFtZSA9IEAic2lt cGxlIjsKKyAgICBDbGFzc01ldGhvZFN3aXp6bGVyIHN3aXp6bGVyKG9iamNfZ2V0Q2xhc3MoIlNT Qkxvb2t1cENvbnRleHQiKSwgQHNlbGVjdG9yKHNoYXJlZExvb2t1cENvbnRleHQpLCBbU2ltcGxl TG9va3VwQ29udGV4dCBtZXRob2RGb3JTZWxlY3RvcjpAc2VsZWN0b3Ioc2hhcmVkTG9va3VwQ29u dGV4dCldKTsKKyAgICAKKyAgICBhdXRvIGRlbGVnYXRlID0gYWRvcHROUyhbV0tXZWJWaWV3R29C YWNrTmF2aWdhdGlvbkRlbGVnYXRlIG5ld10pOworICAgIGF1dG8gd2ViVmlldyA9IGFkb3B0TlMo W1dLV2ViVmlldyBuZXddKTsKKyAgICBbd2ViVmlldyBjb25maWd1cmF0aW9uXS5wcmVmZXJlbmNl cy5fc2FmZUJyb3dzaW5nRW5hYmxlZCA9IFlFUzsKKyAgICBbd2ViVmlldyBzZXROYXZpZ2F0aW9u RGVsZWdhdGU6ZGVsZWdhdGUuZ2V0KCldOworICAgIFt3ZWJWaWV3IGxvYWRSZXF1ZXN0OltOU1VS TFJlcXVlc3QgcmVxdWVzdFdpdGhVUkw6cmVzb3VyY2VVUkwoQCJzaW1wbGUyIildXTsKKyAgICBU ZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJm5hdmlnYXRpb25GaW5pc2hlZCk7CisgICAgCisgICAg W3dlYlZpZXcgbG9hZFJlcXVlc3Q6W05TVVJMUmVxdWVzdCByZXF1ZXN0V2l0aFVSTDpyZXNvdXJj ZVVSTChAInNpbXBsZS1pZnJhbWUiKV1dOworICAgIHdoaWxlICghW3dlYlZpZXcgX3NhZmVCcm93 c2luZ1dhcm5pbmddKQorICAgICAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpzcGluUnVuTG9vcCgp OworICAgIG5hdmlnYXRpb25GaW5pc2hlZCA9IGZhbHNlOworICAgIGdvQmFjayhbd2ViVmlldyBf c2FmZUJyb3dzaW5nV2FybmluZ10sIGZhbHNlKTsKKyAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpy dW4oJm5hdmlnYXRpb25GaW5pc2hlZCk7CisgICAgRVhQRUNUX1RSVUUoW1t3ZWJWaWV3IFVSTF0g aXNFcXVhbDpyZXNvdXJjZVVSTChAInNpbXBsZTIiKV0pOworfQorCiBAaW50ZXJmYWNlIE51bGxM b29rdXBDb250ZXh0IDogTlNPYmplY3QKIEBlbmQKIEBpbXBsZW1lbnRhdGlvbiBOdWxsTG9va3Vw Q29udGV4dAo= 366991 2019-04-08 15:48:20 -0700 2019-04-09 12:08:00 -0700 Patch bug-196665-20190408154819.patch text/plain 8509 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNDQwNDgpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDE5LTA0LTA4ICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgQ2xpY2tpbmcgIkdv IEJhY2siIGZyb20gYSBzYWZlIGJyb3dzaW5nIHdhcm5pbmcgZnJvbSBhbiBpZnJhbWUgc2hvdWxk IG5hdmlnYXRlIHRoZSBXS1dlYlZpZXcgYmFjayB0byB0aGUgcHJldmlvdXMgcGFnZQorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk2NjY1CisgICAgICAg IDxyZGFyOi8vNDUxMTU2Njk+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgR2VvZmYgR2FyZW4uCisK KyAgICAgICAgSXQgaXMgaW5zdWZmaWNpZW50IHRvIGp1c3Qgbm90IG5hdmlnYXRlIHRoZSBzdWJm cmFtZS4gIFdlIG11c3QgbGVhdmUgdGhlIHBhZ2UgdGhhdCBjb250YWluZWQgaXQuCisKKyAgICAg ICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbToKKyAgICAgICAgKC1bV0tXZWJW aWV3IF9zaG93U2FmZUJyb3dzaW5nV2FybmluZzpjb21wbGV0aW9uSGFuZGxlcjpdKToKKyAgICAg ICAgKiBVSVByb2Nlc3MvQ29jb2EvV2ViVmlld0ltcGwubW06CisgICAgICAgIChXZWJLaXQ6Oldl YlZpZXdJbXBsOjpzaG93U2FmZUJyb3dzaW5nV2FybmluZyk6CisKIDIwMTktMDQtMDggIEFsZXgg Q2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KIAogICAgICAgICBGaXggc2Vs ZWN0b3IgbmFtZSBhZnRlciByMjQzODM0CkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9B UEkvQ29jb2EvV0tXZWJWaWV3Lm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0JKHJldmlzaW9uIDI0NDAzMykKKysrIFNvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0JKHdvcmtpbmcgY29weSkKQEAg LTEzNTUsMTIgKzEzNTUsMTkgQEAgLSAodm9pZClfc2hvd1NhZmVCcm93c2luZ1dhcm5pbmc6KGNv bnN0IAogICAgICAgICBhdXRvIHN0cm9uZ1NlbGYgPSB3ZWFrU2VsZi5nZXQoKTsKICAgICAgICAg aWYgKCFzdHJvbmdTZWxmKQogICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICBib29sIG5hdmln YXRlc01haW5GcmFtZSA9IFdURjo6c3dpdGNoT24ocmVzdWx0LAorICAgICAgICBib29sIG5hdmln YXRlc0ZyYW1lID0gV1RGOjpzd2l0Y2hPbihyZXN1bHQsCiAgICAgICAgICAgICBbXSAoV2ViS2l0 OjpDb250aW51ZVVuc2FmZUxvYWQgY29udGludWVVbnNhZmVMb2FkKSB7IHJldHVybiBjb250aW51 ZVVuc2FmZUxvYWQgPT0gV2ViS2l0OjpDb250aW51ZVVuc2FmZUxvYWQ6OlllczsgfSwKICAgICAg ICAgICAgIFtdIChjb25zdCBVUkwmKSB7IHJldHVybiB0cnVlOyB9CiAgICAgICAgICk7Ci0gICAg ICAgIGlmIChuYXZpZ2F0ZXNNYWluRnJhbWUgJiYgW3N0cm9uZ1NlbGYtPl9zYWZlQnJvd3NpbmdX YXJuaW5nIGZvck1haW5GcmFtZU5hdmlnYXRpb25dKQorICAgICAgICBib29sIGZvck1haW5GcmFt ZU5hdmlnYXRpb24gPSBbc3Ryb25nU2VsZi0+X3NhZmVCcm93c2luZ1dhcm5pbmcgZm9yTWFpbkZy YW1lTmF2aWdhdGlvbl07CisgICAgICAgIGlmIChuYXZpZ2F0ZXNGcmFtZSAmJiBmb3JNYWluRnJh bWVOYXZpZ2F0aW9uKSB7CisgICAgICAgICAgICAvLyBUaGUgc2FmZSBicm93c2luZyB3YXJuaW5n IHdpbGwgYmUgaGlkZGVuIG9uY2UgdGhlIG5leHQgcGFnZSBpcyBzaG93bi4KICAgICAgICAgICAg IHJldHVybjsKKyAgICAgICAgfQorICAgICAgICBpZiAoIW5hdmlnYXRlc0ZyYW1lICYmIHN0cm9u Z1NlbGYtPl9zYWZlQnJvd3NpbmdXYXJuaW5nICYmICFmb3JNYWluRnJhbWVOYXZpZ2F0aW9uKSB7 CisgICAgICAgICAgICBzdHJvbmdTZWxmLT5fcGFnZS0+Z29CYWNrKCk7CisgICAgICAgICAgICBy ZXR1cm47CisgICAgICAgIH0KICAgICAgICAgW3N0ZDo6ZXhjaGFuZ2Uoc3Ryb25nU2VsZi0+X3Nh ZmVCcm93c2luZ1dhcm5pbmcsIG51bGxwdHIpIHJlbW92ZUZyb21TdXBlcnZpZXddOwogICAgIH1d KTsKICAgICBbc2VsZiBhZGRTdWJ2aWV3Ol9zYWZlQnJvd3NpbmdXYXJuaW5nLmdldCgpXTsKSW5k ZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dlYlZpZXdJbXBsLm1tCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dlYlZpZXdJbXBsLm1tCShyZXZp c2lvbiAyNDQwMzMpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9XZWJWaWV3SW1w bC5tbQkod29ya2luZyBjb3B5KQpAQCAtMTU4NywxMiArMTU4NywxOSBAQCB2b2lkIFdlYlZpZXdJ bXBsOjpzaG93U2FmZUJyb3dzaW5nV2FybmluCiAgICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKFdU Rk1vdmUocmVzdWx0KSk7CiAgICAgICAgIGlmICghd2Vha1RoaXMpCiAgICAgICAgICAgICByZXR1 cm47Ci0gICAgICAgIGJvb2wgbmF2aWdhdGVzTWFpbkZyYW1lID0gV1RGOjpzd2l0Y2hPbihyZXN1 bHQsCisgICAgICAgIGJvb2wgbmF2aWdhdGVzRnJhbWUgPSBXVEY6OnN3aXRjaE9uKHJlc3VsdCwK ICAgICAgICAgICAgIFtdIChDb250aW51ZVVuc2FmZUxvYWQgY29udGludWVVbnNhZmVMb2FkKSB7 IHJldHVybiBjb250aW51ZVVuc2FmZUxvYWQgPT0gQ29udGludWVVbnNhZmVMb2FkOjpZZXM7IH0s CiAgICAgICAgICAgICBbXSAoY29uc3QgVVJMJikgeyByZXR1cm4gdHJ1ZTsgfQogICAgICAgICAp OwotICAgICAgICBpZiAobmF2aWdhdGVzTWFpbkZyYW1lICYmIFt3ZWFrVGhpcy0+bV9zYWZlQnJv d3NpbmdXYXJuaW5nIGZvck1haW5GcmFtZU5hdmlnYXRpb25dKQorICAgICAgICBib29sIGZvck1h aW5GcmFtZU5hdmlnYXRpb24gPSBbd2Vha1RoaXMtPm1fc2FmZUJyb3dzaW5nV2FybmluZyBmb3JN YWluRnJhbWVOYXZpZ2F0aW9uXTsKKyAgICAgICAgaWYgKG5hdmlnYXRlc0ZyYW1lICYmIGZvck1h aW5GcmFtZU5hdmlnYXRpb24pIHsKKyAgICAgICAgICAgIC8vIFRoZSBzYWZlIGJyb3dzaW5nIHdh cm5pbmcgd2lsbCBiZSBoaWRkZW4gb25jZSB0aGUgbmV4dCBwYWdlIGlzIHNob3duLgogICAgICAg ICAgICAgcmV0dXJuOworICAgICAgICB9CisgICAgICAgIGlmICghbmF2aWdhdGVzRnJhbWUgJiYg d2Vha1RoaXMtPm1fc2FmZUJyb3dzaW5nV2FybmluZyAmJiAhZm9yTWFpbkZyYW1lTmF2aWdhdGlv bikgeworICAgICAgICAgICAgd2Vha1RoaXMtPm1fcGFnZS0+Z29CYWNrKCk7CisgICAgICAgICAg ICByZXR1cm47CisgICAgICAgIH0KICAgICAgICAgW3N0ZDo6ZXhjaGFuZ2Uod2Vha1RoaXMtPm1f c2FmZUJyb3dzaW5nV2FybmluZywgbnVsbHB0cikgcmVtb3ZlRnJvbVN1cGVydmlld107CiAgICAg fV0pOwogICAgIFttX3ZpZXcgYWRkU3VidmlldzptX3NhZmVCcm93c2luZ1dhcm5pbmcuZ2V0KCld OwpJbmRleDogVG9vbHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0NoYW5nZUxvZwko cmV2aXNpb24gMjQ0MDMzKQorKysgVG9vbHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0x LDMgKzEsMTkgQEAKKzIwMTktMDQtMDggIEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5A d2Via2l0Lm9yZz4KKworICAgICAgICBDbGlja2luZyAiR28gQmFjayIgZnJvbSBhIHNhZmUgYnJv d3Npbmcgd2FybmluZyBmcm9tIGFuIGlmcmFtZSBzaG91bGQgbmF2aWdhdGUgdGhlIFdLV2ViVmll dyBiYWNrIHRvIHRoZSBwcmV2aW91cyBwYWdlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xOTY2NjUKKyAgICAgICAgPHJkYXI6Ly80NTExNTY2OT4KKwor ICAgICAgICBSZXZpZXdlZCBieSBHZW9mZiBHYXJlbi4KKworICAgICAgICAqIFRlc3RXZWJLaXRB UEkvVGVzdHMvV2ViS2l0Q29jb2EvU2FmZUJyb3dzaW5nLm1tOgorICAgICAgICAoZ29CYWNrKToK KyAgICAgICAgKCtbU2ltcGxlTG9va3VwQ29udGV4dCBzaGFyZWRMb29rdXBDb250ZXh0XSk6Cisg ICAgICAgICgtW1NpbXBsZUxvb2t1cENvbnRleHQgbG9va1VwVVJMOmNvbXBsZXRpb25IYW5kbGVy Ol0pOgorICAgICAgICAoVEVTVCk6CisgICAgICAgICgrW1NpbXBsZTNMb29rdXBDb250ZXh0IHNo YXJlZExvb2t1cENvbnRleHRdKTogRGVsZXRlZC4KKyAgICAgICAgKC1bU2ltcGxlM0xvb2t1cENv bnRleHQgbG9va1VwVVJMOmNvbXBsZXRpb25IYW5kbGVyOl0pOiBEZWxldGVkLgorCiAyMDE5LTA0 LTA4ICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNvbT4KIAogICAgICAgICBbZXdz LWJ1aWxkXSBEbyBub3QgdXBsb2FkIGFyY2hpdmUgd2hlbiBDb21waWxlIEZhaWxzCkluZGV4OiBU b29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1NhZmVCcm93c2luZy5tbQo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBUb29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1NhZmVCcm93 c2luZy5tbQkocmV2aXNpb24gMjQ0MDMzKQorKysgVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9X ZWJLaXRDb2NvYS9TYWZlQnJvd3NpbmcubW0JKHdvcmtpbmcgY29weSkKQEAgLTIyMCwxMiArMjIw LDE1IEBAIHN0YXRpYyB2b2lkIGNoZWNrVGl0bGVBbmRDbGljayhVSUJ1dHRvbiAKIH0KICNlbmRp ZgogCi10ZW1wbGF0ZTx0eXBlbmFtZSBWaWV3VHlwZT4gdm9pZCBnb0JhY2soVmlld1R5cGUgKnZp ZXcpCit0ZW1wbGF0ZTx0eXBlbmFtZSBWaWV3VHlwZT4gdm9pZCBnb0JhY2soVmlld1R5cGUgKnZp ZXcsIGJvb2wgbWFpbkZyYW1lID0gdHJ1ZSkKIHsKICAgICBXS1dlYlZpZXcgKndlYlZpZXcgPSAo V0tXZWJWaWV3ICopdmlldy5zdXBlcnZpZXc7CiAgICAgYXV0byBib3ggPSB2aWV3LnN1YnZpZXdz LmZpcnN0T2JqZWN0OwogICAgIGNoZWNrVGl0bGVBbmRDbGljayhib3guc3Vidmlld3NbM10sICJH byBCYWNrIik7Ci0gICAgRVhQRUNUX0VRKFt3ZWJWaWV3IF9zYWZlQnJvd3NpbmdXYXJuaW5nXSwg bmlsKTsKKyAgICBpZiAobWFpbkZyYW1lKQorICAgICAgICBFWFBFQ1RfRVEoW3dlYlZpZXcgX3Nh ZmVCcm93c2luZ1dhcm5pbmddLCBuaWwpOworICAgIGVsc2UKKyAgICAgICAgRVhQRUNUX05FKFt3 ZWJWaWV3IF9zYWZlQnJvd3NpbmdXYXJuaW5nXSwgbmlsKTsKIH0KIAogVEVTVChTYWZlQnJvd3Np bmcsIEdvQmFjaykKQEAgLTM2OCwyMSArMzcxLDIzIEBAIFRFU1QoU2FmZUJyb3dzaW5nLCBVUkxP YnNlcnZhdGlvbikKICAgICB9CiB9CiAKLUBpbnRlcmZhY2UgU2ltcGxlM0xvb2t1cENvbnRleHQg OiBOU09iamVjdAorc3RhdGljIFJldGFpblB0cjxOU1N0cmluZz4gcGhpc2hpbmdSZXNvdXJjZU5h bWU7CisKK0BpbnRlcmZhY2UgU2ltcGxlTG9va3VwQ29udGV4dCA6IE5TT2JqZWN0CiBAZW5kCiAK LUBpbXBsZW1lbnRhdGlvbiBTaW1wbGUzTG9va3VwQ29udGV4dAorQGltcGxlbWVudGF0aW9uIFNp bXBsZUxvb2t1cENvbnRleHQKIAotKyAoU2ltcGxlM0xvb2t1cENvbnRleHQgKilzaGFyZWRMb29r dXBDb250ZXh0CisrIChTaW1wbGVMb29rdXBDb250ZXh0ICopc2hhcmVkTG9va3VwQ29udGV4dAog ewotICAgIHN0YXRpYyBTaW1wbGUzTG9va3VwQ29udGV4dCAqY29udGV4dCA9IFtbU2ltcGxlM0xv b2t1cENvbnRleHQgYWxsb2NdIGluaXRdOworICAgIHN0YXRpYyBTaW1wbGVMb29rdXBDb250ZXh0 ICpjb250ZXh0ID0gW1tTaW1wbGVMb29rdXBDb250ZXh0IGFsbG9jXSBpbml0XTsKICAgICByZXR1 cm4gY29udGV4dDsKIH0KIAogLSAodm9pZClsb29rVXBVUkw6KE5TVVJMICopVVJMIGNvbXBsZXRp b25IYW5kbGVyOih2b2lkICheKShUZXN0TG9va3VwUmVzdWx0ICosIE5TRXJyb3IgKikpY29tcGxl dGlvbkhhbmRsZXIKIHsKICAgICBCT09MIHBoaXNoaW5nID0gTk87Ci0gICAgaWYgKFtVUkwgaXNF cXVhbDpyZXNvdXJjZVVSTChAInNpbXBsZTMiKV0pCisgICAgaWYgKFtVUkwgaXNFcXVhbDpyZXNv dXJjZVVSTChwaGlzaGluZ1Jlc291cmNlTmFtZS5nZXQoKSldKQogICAgICAgICBwaGlzaGluZyA9 IFlFUzsKICAgICBjb21wbGV0aW9uSGFuZGxlcihbVGVzdExvb2t1cFJlc3VsdCByZXN1bHRXaXRo UmVzdWx0czpAW1tUZXN0U2VydmljZUxvb2t1cFJlc3VsdCByZXN1bHRXaXRoUHJvdmlkZXI6QCJU ZXN0UHJvdmlkZXIiIHBoaXNoaW5nOnBoaXNoaW5nIG1hbHdhcmU6Tk8gdW53YW50ZWRTb2Z0d2Fy ZTpOT11dXSwgbmlsKTsKIH0KQEAgLTQwNSw3ICs0MTAsOCBAQCAtICh2b2lkKXdlYlZpZXc6KFdL V2ViVmlldyAqKXdlYlZpZXcgZGlkCiAKIFRFU1QoU2FmZUJyb3dzaW5nLCBXS1dlYlZpZXdHb0Jh Y2spCiB7Ci0gICAgQ2xhc3NNZXRob2RTd2l6emxlciBzd2l6emxlcihvYmpjX2dldENsYXNzKCJT U0JMb29rdXBDb250ZXh0IiksIEBzZWxlY3RvcihzaGFyZWRMb29rdXBDb250ZXh0KSwgW1NpbXBs ZTNMb29rdXBDb250ZXh0IG1ldGhvZEZvclNlbGVjdG9yOkBzZWxlY3RvcihzaGFyZWRMb29rdXBD b250ZXh0KV0pOworICAgIHBoaXNoaW5nUmVzb3VyY2VOYW1lID0gQCJzaW1wbGUzIjsKKyAgICBD bGFzc01ldGhvZFN3aXp6bGVyIHN3aXp6bGVyKG9iamNfZ2V0Q2xhc3MoIlNTQkxvb2t1cENvbnRl eHQiKSwgQHNlbGVjdG9yKHNoYXJlZExvb2t1cENvbnRleHQpLCBbU2ltcGxlTG9va3VwQ29udGV4 dCBtZXRob2RGb3JTZWxlY3RvcjpAc2VsZWN0b3Ioc2hhcmVkTG9va3VwQ29udGV4dCldKTsKICAg ICAKICAgICBhdXRvIGRlbGVnYXRlID0gYWRvcHROUyhbV0tXZWJWaWV3R29CYWNrTmF2aWdhdGlv bkRlbGVnYXRlIG5ld10pOwogICAgIGF1dG8gd2ViVmlldyA9IGFkb3B0TlMoW1dLV2ViVmlldyBu ZXddKTsKQEAgLTQyNyw2ICs0MzMsMzAgQEAgVEVTVChTYWZlQnJvd3NpbmcsIFdLV2ViVmlld0dv QmFjaykKICAgICBFWFBFQ1RfVFJVRShbW3dlYlZpZXcgVVJMXSBpc0VxdWFsOnJlc291cmNlVVJM KEAic2ltcGxlMiIpXSk7CiB9CiAKK1RFU1QoU2FmZUJyb3dzaW5nLCBXS1dlYlZpZXdHb0JhY2tJ RnJhbWUpCit7CisgICAgcGhpc2hpbmdSZXNvdXJjZU5hbWUgPSBAInNpbXBsZSI7CisgICAgQ2xh c3NNZXRob2RTd2l6emxlciBzd2l6emxlcihvYmpjX2dldENsYXNzKCJTU0JMb29rdXBDb250ZXh0 IiksIEBzZWxlY3RvcihzaGFyZWRMb29rdXBDb250ZXh0KSwgW1NpbXBsZUxvb2t1cENvbnRleHQg bWV0aG9kRm9yU2VsZWN0b3I6QHNlbGVjdG9yKHNoYXJlZExvb2t1cENvbnRleHQpXSk7CisgICAg CisgICAgYXV0byBkZWxlZ2F0ZSA9IGFkb3B0TlMoW1dLV2ViVmlld0dvQmFja05hdmlnYXRpb25E ZWxlZ2F0ZSBuZXddKTsKKyAgICBhdXRvIHdlYlZpZXcgPSBhZG9wdE5TKFtXS1dlYlZpZXcgbmV3 XSk7CisgICAgW3dlYlZpZXcgY29uZmlndXJhdGlvbl0ucHJlZmVyZW5jZXMuX3NhZmVCcm93c2lu Z0VuYWJsZWQgPSBZRVM7CisgICAgW3dlYlZpZXcgc2V0TmF2aWdhdGlvbkRlbGVnYXRlOmRlbGVn YXRlLmdldCgpXTsKKyAgICBbd2ViVmlldyBsb2FkUmVxdWVzdDpbTlNVUkxSZXF1ZXN0IHJlcXVl c3RXaXRoVVJMOnJlc291cmNlVVJMKEAic2ltcGxlMiIpXV07CisgICAgVGVzdFdlYktpdEFQSTo6 VXRpbDo6cnVuKCZuYXZpZ2F0aW9uRmluaXNoZWQpOworCisgICAgW3dlYlZpZXcgbG9hZFJlcXVl c3Q6W05TVVJMUmVxdWVzdCByZXF1ZXN0V2l0aFVSTDpyZXNvdXJjZVVSTChAInNpbXBsZS1pZnJh bWUiKV1dOworICAgIHdoaWxlICghW3dlYlZpZXcgX3NhZmVCcm93c2luZ1dhcm5pbmddKQorICAg ICAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpzcGluUnVuTG9vcCgpOworI2lmICFQTEFURk9STShN QUMpCisgICAgW1t3ZWJWaWV3IF9zYWZlQnJvd3NpbmdXYXJuaW5nXSBkaWRNb3ZlVG9XaW5kb3dd OworI2VuZGlmCisgICAgbmF2aWdhdGlvbkZpbmlzaGVkID0gZmFsc2U7CisgICAgZ29CYWNrKFt3 ZWJWaWV3IF9zYWZlQnJvd3NpbmdXYXJuaW5nXSwgZmFsc2UpOworICAgIFRlc3RXZWJLaXRBUEk6 OlV0aWw6OnJ1bigmbmF2aWdhdGlvbkZpbmlzaGVkKTsKKyAgICBFWFBFQ1RfVFJVRShbW3dlYlZp ZXcgVVJMXSBpc0VxdWFsOnJlc291cmNlVVJMKEAic2ltcGxlMiIpXSk7Cit9CisKIEBpbnRlcmZh Y2UgTnVsbExvb2t1cENvbnRleHQgOiBOU09iamVjdAogQGVuZAogQGltcGxlbWVudGF0aW9uIE51 bGxMb29rdXBDb250ZXh0Cg==