183971 2018-03-23 21:21:26 -0700 Web Automation: remove unnecessary member variable in WebAutomationSession 2018-03-25 13:24:13 -0700 1 1 1 Unclassified WebKit WebDriver WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 bburg bburg bburg cgarcia joepeck timothy webkit-bug-importer oldest_to_newest 1409020 0 bburg 2018-03-23 21:21:26 -0700 . 1409104 1 336477 bburg 2018-03-24 10:59:08 -0700 Created attachment 336477 Proposed Fix v2 1409108 2 336479 bburg 2018-03-24 11:37:25 -0700 Created attachment 336479 Proposed Fix 1409208 3 bburg 2018-03-25 13:22:50 -0700 Committed r229964: <https://trac.webkit.org/changeset/229964> 1409209 4 webkit-bug-importer 2018-03-25 13:24:13 -0700 <rdar://problem/38845793> 336477 2018-03-24 10:59:08 -0700 2018-03-24 10:59:45 -0700 Proposed Fix v2 bug-183971-20180324105907.patch text/plain 20477 bburg U3VidmVyc2lvbiBSZXZpc2lvbjogMjI5OTMyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGFjMDZlYzcxNzMwNGRlODI4 OWY3OWJmMWM0NTljMzliNmVjMTdiNWQuLmIxMDZiMWM0YTg5ZDllZTkxM2FhYzc2ZDY2YmNhOTky YmQ1OGM4YWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNTAgQEAKKzIwMTgtMDMtMDYgIEJyaWFuIEJ1 cmcgIDxiYnVyZ0BhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEF1dG9tYXRpb246IHByb3ZpZGUg YSB3YXkgdG8gYXNrIGNsaWVudHMgZm9yIGEgbmV3IHRhYiBvciB3aW5kb3cKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4MzM4MQorICAgICAgICA8cmRh cjovL3Byb2JsZW0vMzgxNjczMDE+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgQWRkIHN1cHBvcnQgZm9yIHNwZWNpZnlpbmcgYnJvd3NpbmcgY29udGV4 dCBvcHRpb25zIHdoZW4gcmVxdWVzdGluZworICAgICAgICBhIG5ldyBicm93c2luZyBjb250ZXh0 IGZyb20gdGhlIGF1dG9tYXRpb24gc2Vzc2lvbiBjbGllbnQvZGVsZWdhdGUuCisgICAgICAgIFRo aXMgaXMgY3VycmVudGx5IGp1c3QgdXNlZCBmb3Igc3BlY2lmeWluZyB0YWIgdnMgd2luZG93LCBi dXQgY291bGQKKyAgICAgICAgYWxzbyBiZSB1c2VkIGZvciB0aGluZ3MgbGlrZSB0b2dnbGluZyBj ZXJ0YWluIGJyb3dzZXIgY2hyb21lIG9yIGZlYXR1cmVzLgorCisgICAgICAgIFRoZXJlIGlzIG5v IGd1YXJhbnRlZSB0aGF0IHRoZSBjbGllbnQgaGFzIGEgbm90aW9uIG9mIHRhYnMgdnMgd2luZG93 cywKKyAgICAgICAgc28gdGhpcyBvcHRpb24gaXMgcHVyZWx5IGFkdmlzb3J5IGFuZCBzaG91bGQg bm90IGNhdXNlIHRoZSBjb21tYW5kIHRvCisgICAgICAgIGZhaWwgaWYgaXQgY2Fubm90IGJlIGhv bm9yZWQuCisKKyAgICAgICAgVGhpcyBiZWhhdmlvciBjYXVzZWQgYnkgc3BlY2lmeWluZyB0aGlz IG9wdGlvbiBpcyBjbGllbnQtc3BlY2lmaWMsIHNvIG5vCisgICAgICAgIG5ldyB0ZXN0cyBhcmUg aW5jbHVkZWQgaW4gV2ViS2l0IGZvciB0aGlzIGNoYW5nZS4KKworICAgICAgICAqIFVJUHJvY2Vz cy9BUEkvQVBJQXV0b21hdGlvblNlc3Npb25DbGllbnQuaDoKKyAgICAgICAgKEFQSTo6QXV0b21h dGlvblNlc3Npb25DbGllbnQ6OmRpZFJlcXVlc3ROZXdQYWdlV2l0aE9wdGlvbnMpOgorICAgICAg ICAoQVBJOjpBdXRvbWF0aW9uU2Vzc2lvbkNsaWVudDo6ZGlkUmVxdWVzdE5ld1dpbmRvdyk6IERl bGV0ZWQuCisgICAgICAgIEFkZCBvcHRpb25zIHBhcmFtZXRlci4KKworICAgICAgICAqIFVJUHJv Y2Vzcy9BUEkvZ2xpYi9XZWJLaXRBdXRvbWF0aW9uU2Vzc2lvbi5jcHA6CisgICAgICAgIEFkanVz dCB0byBuZXcgc2lnbmF0dXJlLiBNb3JlIHdvcmsgaXMgbmVlZGVkIHRvIHBsdW1iIHRoaXMgaW5m b3JtYXRpb24KKyAgICAgICAgdG8gdGhlIHB1YmxpYyBBUEkgZm9yIEdUSy9XUEUgYW5kIHN1cHBv cnQgaXQgaW4gV2ViS2l0R1RLIGRyaXZlci4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BdXRvbWF0 aW9uL0F1dG9tYXRpb24uanNvbjogQWRkIG5ldyBvcHRpb25hbCBwYXJhbWV0ZXIuCisKKyAgICAg ICAgKiBVSVByb2Nlc3MvQXV0b21hdGlvbi9XZWJBdXRvbWF0aW9uU2Vzc2lvbi5oOgorICAgICAg ICAqIFVJUHJvY2Vzcy9BdXRvbWF0aW9uL1dlYkF1dG9tYXRpb25TZXNzaW9uLmNwcDoKKyAgICAg ICAgKFdlYktpdDo6V2ViQXV0b21hdGlvblNlc3Npb246OmNyZWF0ZUJyb3dzaW5nQ29udGV4dCk6 CisgICAgICAgIENvbnZlcnQgdGhlIHByb3RvY29sIG9wdGlvbiB0byBhbiBBUEkgb3B0aW9uLgor CisgICAgICAgICogVUlQcm9jZXNzL0NvY29hL0F1dG9tYXRpb25TZXNzaW9uQ2xpZW50Lmg6Cisg ICAgICAgICogVUlQcm9jZXNzL0NvY29hL0F1dG9tYXRpb25TZXNzaW9uQ2xpZW50Lm1tOgorICAg ICAgICAoV2ViS2l0OjpBdXRvbWF0aW9uU2Vzc2lvbkNsaWVudDo6QXV0b21hdGlvblNlc3Npb25D bGllbnQpOgorICAgICAgICAoV2ViS2l0Ojp0b0FQSSk6CisgICAgICAgIChXZWJLaXQ6OkF1dG9t YXRpb25TZXNzaW9uQ2xpZW50OjpkaWRSZXF1ZXN0TmV3UGFnZVdpdGhPcHRpb25zKToKKyAgICAg ICAgKFdlYktpdDo6QXV0b21hdGlvblNlc3Npb25DbGllbnQ6OmRpZFJlcXVlc3ROZXdXaW5kb3cp OiBEZWxldGVkLgorICAgICAgICBDb252ZXJ0IHRoZSBpbnRlcm5hbCBvcHRpb24gdG8gYSBDb2Nv YSBTUEkgb3B0aW9uIGFuZCBwYXNzIGl0IGFsb25nLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQ SS9Db2NvYS9fV0tBdXRvbWF0aW9uU2Vzc2lvbkRlbGVnYXRlLmg6CisgICAgICAgIEFkanVzdCBk ZWxlZ2F0ZSBtZXRob2RzIHRvIGluY2x1ZGUgb3B0aW9ucy4gQ2xpZW50cyBuZWVkIHRvIGFkb3B0 IHRoZSBuZXcgc2lnbmF0dXJlKHMpLgorCiAyMDE4LTAzLTIzICBXZW5zb24gSHNpZWggIDx3ZW5z b25faHNpZWhAYXBwbGUuY29tPgogCiAgICAgICAgIFtFeHRyYSB6b29tIG1vZGVdIEFkb3B0IGxp c3QgdmlldyBjb250cm9sbGVyIFVJIGZvciBzZWxlY3QgbWVudXMKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9BUElBdXRvbWF0aW9uU2Vzc2lvbkNsaWVudC5oIGIvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0FQSUF1dG9tYXRpb25TZXNzaW9uQ2xpZW50LmgKaW5k ZXggMGZjODU0YTNiMTk2NGJkMjJiYjBiNGY3NDcxMjgyMzM4MGI4NDQxZi4uNjgzNTNiYjU2NDJj MTllNWY1MGFkZjVmZmQxMWVjOTk0MGE0ZjBhZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvQVBJL0FQSUF1dG9tYXRpb25TZXNzaW9uQ2xpZW50LmgKKysrIGIvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvQVBJL0FQSUF1dG9tYXRpb25TZXNzaW9uQ2xpZW50LmgKQEAgLTEsNSAr MSw1IEBACiAvKgotICogQ29weXJpZ2h0IChDKSAyMDE2IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyBy ZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAxNiwgMjAxOCBBcHBsZSBJbmMuIEFsbCByaWdo dHMgcmVzZXJ2ZWQuCiAgKgogICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5k IGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CiAgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJt aXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTI2LDYgKzI2 LDcgQEAKICNpZm5kZWYgQVBJQXV0b21hdGlvblNlc3Npb25DbGllbnRfaAogI2RlZmluZSBBUElB dXRvbWF0aW9uU2Vzc2lvbkNsaWVudF9oCiAKKyNpbmNsdWRlIDx3dGYvQ29tcGxldGlvbkhhbmRs ZXIuaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9XVEZTdHJpbmcuaD4KIAogbmFtZXNwYWNlIFdlYktp dCB7CkBAIC0zNSw2ICszNiwxMCBAQCBjbGFzcyBXZWJQYWdlUHJveHk7CiAKIG5hbWVzcGFjZSBB UEkgewogCitlbnVtIEF1dG9tYXRpb25TZXNzaW9uQnJvd3NpbmdDb250ZXh0T3B0aW9ucyA6IHVp bnQxNl90IHsKKyAgICBBdXRvbWF0aW9uU2Vzc2lvbkJyb3dzaW5nQ29udGV4dE9wdGlvbnNQcmVm ZXJOZXdUYWIgPSAxIDw8IDAsCit9OworCiBjbGFzcyBBdXRvbWF0aW9uU2Vzc2lvbkNsaWVudCB7 CiBwdWJsaWM6CiAgICAgZW51bSBjbGFzcyBKYXZhU2NyaXB0RGlhbG9nVHlwZSB7CkBAIC00OCw3 ICs1Myw3IEBAIHB1YmxpYzoKIAogICAgIHZpcnR1YWwgU3RyaW5nIHNlc3Npb25JZGVudGlmaWVy KCkgY29uc3QgeyByZXR1cm4gU3RyaW5nKCk7IH0KICAgICB2aXJ0dWFsIHZvaWQgZGlkRGlzY29u bmVjdEZyb21SZW1vdGUoV2ViS2l0OjpXZWJBdXRvbWF0aW9uU2Vzc2lvbiYpIHsgfQotICAgIHZp cnR1YWwgV2ViS2l0OjpXZWJQYWdlUHJveHkqIGRpZFJlcXVlc3ROZXdXaW5kb3coV2ViS2l0OjpX ZWJBdXRvbWF0aW9uU2Vzc2lvbiYpIHsgcmV0dXJuIG51bGxwdHI7IH0KKyAgICB2aXJ0dWFsIHZv aWQgcmVxdWVzdE5ld1BhZ2VXaXRoT3B0aW9ucyhXZWJLaXQ6OldlYkF1dG9tYXRpb25TZXNzaW9u JiwgQXV0b21hdGlvblNlc3Npb25Ccm93c2luZ0NvbnRleHRPcHRpb25zLCBDb21wbGV0aW9uSGFu ZGxlcjx2b2lkKFdlYktpdDo6V2ViUGFnZVByb3h5Kik+JiYgY29tcGxldGlvbkhhbmRsZXIpIHsg Y29tcGxldGlvbkhhbmRsZXIobnVsbHB0cik7IH0KICAgICB2aXJ0dWFsIGJvb2wgaXNTaG93aW5n SmF2YVNjcmlwdERpYWxvZ09uUGFnZShXZWJLaXQ6OldlYkF1dG9tYXRpb25TZXNzaW9uJiwgV2Vi S2l0OjpXZWJQYWdlUHJveHkmKSB7IHJldHVybiBmYWxzZTsgfQogICAgIHZpcnR1YWwgdm9pZCBk aXNtaXNzQ3VycmVudEphdmFTY3JpcHREaWFsb2dPblBhZ2UoV2ViS2l0OjpXZWJBdXRvbWF0aW9u U2Vzc2lvbiYsIFdlYktpdDo6V2ViUGFnZVByb3h5JikgeyB9CiAgICAgdmlydHVhbCB2b2lkIGFj Y2VwdEN1cnJlbnRKYXZhU2NyaXB0RGlhbG9nT25QYWdlKFdlYktpdDo6V2ViQXV0b21hdGlvblNl c3Npb24mLCBXZWJLaXQ6OldlYlBhZ2VQcm94eSYpIHsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL19XS0F1dG9tYXRpb25TZXNzaW9uRGVsZWdhdGUuaCBi L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tBdXRvbWF0aW9uU2Vzc2lvbkRl bGVnYXRlLmgKaW5kZXggYTU1NWNkNmZmNGE4YzJkMmRiZjA2N2E1YTUyNDY3YTQ1NWM3NmQyMi4u NDhmYTdlYmUzNmQxYzBmZGNmYjQ3NjYwZWNkMDhkYjIyMTdmN2Q5ZiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL19XS0F1dG9tYXRpb25TZXNzaW9uRGVsZWdh dGUuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLQXV0b21hdGlv blNlc3Npb25EZWxlZ2F0ZS5oCkBAIC0zMCw2ICszMCw4IEBACiAjaW1wb3J0IDxGb3VuZGF0aW9u L0ZvdW5kYXRpb24uaD4KICNpbXBvcnQgPFdlYktpdC9XS0Jhc2UuaD4KIAorTlNfQVNTVU1FX05P Tk5VTExfQkVHSU4KKwogQGNsYXNzIFdLV2ViVmlldzsKIEBjbGFzcyBfV0tBdXRvbWF0aW9uU2Vz c2lvbjsKIApAQCAtNDAsMTIgKzQyLDE2IEBAIHR5cGVkZWYgTlNfRU5VTShOU0ludGVnZXIsIF9X S0F1dG9tYXRpb25TZXNzaW9uSmF2YVNjcmlwdERpYWxvZ1R5cGUpIHsKICAgICBfV0tBdXRvbWF0 aW9uU2Vzc2lvbkphdmFTY3JpcHREaWFsb2dUeXBlUHJvbXB0LAogfSBXS19BUElfQVZBSUxBQkxF KG1hY29zeChXS19NQUNfVEJBKSwgaW9zKFdLX0lPU19UQkEpKTsKIAordHlwZWRlZiBOU19FTlVN KE5TVUludGVnZXIsIF9XS0F1dG9tYXRpb25TZXNzaW9uQnJvd3NpbmdDb250ZXh0T3B0aW9ucykg eworICAgIF9XS0F1dG9tYXRpb25TZXNzaW9uQnJvd3NpbmdDb250ZXh0T3B0aW9uc1ByZWZlck5l d1RhYiA9IDEgPDwgMCwKK30gV0tfQVBJX0FWQUlMQUJMRShtYWNvc3goV0tfTUFDX1RCQSksIGlv cyhXS19JT1NfVEJBKSk7CisKIEBwcm90b2NvbCBfV0tBdXRvbWF0aW9uU2Vzc2lvbkRlbGVnYXRl IDxOU09iamVjdD4KIEBvcHRpb25hbAogCiAtICh2b2lkKV9hdXRvbWF0aW9uU2Vzc2lvbkRpZERp c2Nvbm5lY3RGcm9tUmVtb3RlOihfV0tBdXRvbWF0aW9uU2Vzc2lvbiAqKWF1dG9tYXRpb25TZXNz aW9uOwogCi0tIChXS1dlYlZpZXcgKilfYXV0b21hdGlvblNlc3Npb25EaWRSZXF1ZXN0TmV3V2Vi VmlldzooX1dLQXV0b21hdGlvblNlc3Npb24gKilhdXRvbWF0aW9uU2Vzc2lvbiBXS19BUElfQVZB SUxBQkxFKG1hY29zeCgxMC4xMyksIGlvcygxMS4wKSk7CistICh2b2lkKV9hdXRvbWF0aW9uU2Vz c2lvbjooX1dLQXV0b21hdGlvblNlc3Npb24gKilhdXRvbWF0aW9uU2Vzc2lvbiByZXF1ZXN0TmV3 V2ViVmlld1dpdGhPcHRpb25zOihfV0tBdXRvbWF0aW9uU2Vzc2lvbkJyb3dzaW5nQ29udGV4dE9w dGlvbnMpb3B0aW9ucyBjb21wbGV0aW9uSGFuZGxlcjoodm9pZCheKShXS1dlYlZpZXcgKiBfTnVs bGFibGUpKWNvbXBsZXRpb25IYW5kbGVyIFdLX0FQSV9BVkFJTEFCTEUobWFjb3N4KFdLX01BQ19U QkEpLCBpb3MoV0tfSU9TX1RCQSkpOwogLSAoQk9PTClfYXV0b21hdGlvblNlc3Npb246KF9XS0F1 dG9tYXRpb25TZXNzaW9uICopYXV0b21hdGlvblNlc3Npb24gaXNTaG93aW5nSmF2YVNjcmlwdERp YWxvZ0ZvcldlYlZpZXc6KFdLV2ViVmlldyAqKXdlYlZpZXcgV0tfQVBJX0FWQUlMQUJMRShtYWNv c3goMTAuMTMpLCBpb3MoMTEuMCkpOwogLSAodm9pZClfYXV0b21hdGlvblNlc3Npb246KF9XS0F1 dG9tYXRpb25TZXNzaW9uICopYXV0b21hdGlvblNlc3Npb24gZGlzbWlzc0N1cnJlbnRKYXZhU2Ny aXB0RGlhbG9nRm9yV2ViVmlldzooV0tXZWJWaWV3ICopd2ViVmlldyBXS19BUElfQVZBSUxBQkxF KG1hY29zeCgxMC4xMyksIGlvcygxMS4wKSk7CiAtICh2b2lkKV9hdXRvbWF0aW9uU2Vzc2lvbjoo X1dLQXV0b21hdGlvblNlc3Npb24gKilhdXRvbWF0aW9uU2Vzc2lvbiBhY2NlcHRDdXJyZW50SmF2 YVNjcmlwdERpYWxvZ0ZvcldlYlZpZXc6KFdLV2ViVmlldyAqKXdlYlZpZXcgV0tfQVBJX0FWQUlM QUJMRShtYWNvc3goMTAuMTMpLCBpb3MoMTEuMCkpOwpAQCAtNTUsNyArNjEsNyBAQCB0eXBlZGVm IE5TX0VOVU0oTlNJbnRlZ2VyLCBfV0tBdXRvbWF0aW9uU2Vzc2lvbkphdmFTY3JpcHREaWFsb2dU eXBlKSB7CiAKIC8vIEZJWE1FIDM3NDA4NzE4OiBPYmplY3RpdmUtQyBkZWxlZ2F0ZSBtZXRob2Rz IHNob3VsZG4ndCB1c2UgQyBBUEkgdHlwZXMgbGlrZSBXS1BhZ2VSZWYuIFdlIG5lZWQgdG8KIC8v IG1pZ3JhdGUgY2xpZW50cyB0byB1c2UgV0tXZWJWaWV3LCBvciBleHBvc2UgdGhlIHNhbWUgYmVo YXZpb3IgdmlhIGEgQyBTUEkgZm9yIHRob3NlIGNsaWVudHMuCi0tIChXS1BhZ2VSZWYpX2F1dG9t YXRpb25TZXNzaW9uRGlkUmVxdWVzdE5ld1dpbmRvdzooX1dLQXV0b21hdGlvblNlc3Npb24gKilh dXRvbWF0aW9uU2Vzc2lvbiBXS19BUElfQVZBSUxBQkxFKG1hY29zeCgxMC4xMyksIGlvcygxMS4w KSk7CistICh2b2lkKV9hdXRvbWF0aW9uU2Vzc2lvbjooX1dLQXV0b21hdGlvblNlc3Npb24gKilh dXRvbWF0aW9uU2Vzc2lvbiByZXF1ZXN0TmV3UGFnZVdpdGhPcHRpb25zOihfV0tBdXRvbWF0aW9u U2Vzc2lvbkJyb3dzaW5nQ29udGV4dE9wdGlvbnMpb3B0aW9ucyBjb21wbGV0aW9uSGFuZGxlcjoo dm9pZCheKShXS1BhZ2VSZWYpKWNvbXBsZXRpb25IYW5kbGVyIFdLX0FQSV9BVkFJTEFCTEUobWFj b3N4KFdLX01BQ19UQkEpLCBpb3MoV0tfSU9TX1RCQSkpOwogLSAoQk9PTClfYXV0b21hdGlvblNl c3Npb246KF9XS0F1dG9tYXRpb25TZXNzaW9uICopYXV0b21hdGlvblNlc3Npb24gaXNTaG93aW5n SmF2YVNjcmlwdERpYWxvZ09uUGFnZTooV0tQYWdlUmVmKXBhZ2UgV0tfQVBJX0FWQUlMQUJMRSht YWNvc3goMTAuMTMpLCBpb3MoMTEuMCkpOwogLSAodm9pZClfYXV0b21hdGlvblNlc3Npb246KF9X S0F1dG9tYXRpb25TZXNzaW9uICopYXV0b21hdGlvblNlc3Npb24gZGlzbWlzc0N1cnJlbnRKYXZh U2NyaXB0RGlhbG9nT25QYWdlOihXS1BhZ2VSZWYpcGFnZSBXS19BUElfQVZBSUxBQkxFKG1hY29z eCgxMC4xMyksIGlvcygxMS4wKSk7CiAtICh2b2lkKV9hdXRvbWF0aW9uU2Vzc2lvbjooX1dLQXV0 b21hdGlvblNlc3Npb24gKilhdXRvbWF0aW9uU2Vzc2lvbiBhY2NlcHRDdXJyZW50SmF2YVNjcmlw dERpYWxvZ09uUGFnZTooV0tQYWdlUmVmKXBhZ2UgV0tfQVBJX0FWQUlMQUJMRShtYWNvc3goMTAu MTMpLCBpb3MoMTEuMCkpOwpAQCAtNjQsNCArNzAsNiBAQCB0eXBlZGVmIE5TX0VOVU0oTlNJbnRl Z2VyLCBfV0tBdXRvbWF0aW9uU2Vzc2lvbkphdmFTY3JpcHREaWFsb2dUeXBlKSB7CiAtIChfV0tB dXRvbWF0aW9uU2Vzc2lvbkphdmFTY3JpcHREaWFsb2dUeXBlKV9hdXRvbWF0aW9uU2Vzc2lvbjoo X1dLQXV0b21hdGlvblNlc3Npb24gKilhdXRvbWF0aW9uU2Vzc2lvbiB0eXBlT2ZDdXJyZW50SmF2 YVNjcmlwdERpYWxvZ09uUGFnZTooV0tQYWdlUmVmKXBhZ2UgV0tfQVBJX0FWQUlMQUJMRShtYWNv c3goV0tfTUFDX1RCQSksIGlvcyhXS19JT1NfVEJBKSk7CiBAZW5kCiAKK05TX0FTU1VNRV9OT05O VUxMX0VORAorCiAjZW5kaWYgLy8gV0tfQVBJX0VOQUJMRUQKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL0FQSS9nbGliL1dlYktpdEF1dG9tYXRpb25TZXNzaW9uLmNwcCBiL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9nbGliL1dlYktpdEF1dG9tYXRpb25TZXNzaW9uLmNw cAppbmRleCA5M2FiOGQ1MDc4NDUyMmVjMjk1ZDU4ZGYwYzczNzRjMzRlYzVjOWE5Li5mMGQ1ZGIy MTQyMTgwYmUwYWRiZGE2MWU3MDRjZjk4NWQ0OWY0MDMzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9BUEkvZ2xpYi9XZWJLaXRBdXRvbWF0aW9uU2Vzc2lvbi5jcHAKKysrIGIv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2dsaWIvV2ViS2l0QXV0b21hdGlvblNlc3Npb24u Y3BwCkBAIC04Miw3ICs4Miw3IEBAIHByaXZhdGU6CiAgICAgICAgIHJldHVybiBTdHJpbmc6OmZy b21VVEY4KG1fc2Vzc2lvbi0+cHJpdi0+aWQuZGF0YSgpKTsKICAgICB9CiAKLSAgICBXZWJQYWdl UHJveHkqIGRpZFJlcXVlc3ROZXdXaW5kb3coV2ViQXV0b21hdGlvblNlc3Npb24mKSBvdmVycmlk ZQorICAgIFdlYlBhZ2VQcm94eSogZGlkUmVxdWVzdE5ld1BhZ2VXaXRoT3B0aW9ucyhXZWJBdXRv bWF0aW9uU2Vzc2lvbiYsIEFQSTo6QXV0b21hdGlvblNlc3Npb25Ccm93c2luZ0NvbnRleHRPcHRp b25zKSBvdmVycmlkZQogICAgIHsKICAgICAgICAgV2ViS2l0V2ViVmlldyogd2ViVmlldyA9IG51 bGxwdHI7CiAgICAgICAgIGdfc2lnbmFsX2VtaXQobV9zZXNzaW9uLCBzaWduYWxzW0NSRUFURV9X RUJfVklFV10sIDAsICZ3ZWJWaWV3KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL0F1dG9tYXRpb24vQXV0b21hdGlvbi5qc29uIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv QXV0b21hdGlvbi9BdXRvbWF0aW9uLmpzb24KaW5kZXggODg0MDgyNjZhMWM4NGIwNDU0MGQ3YmRh ODhiMjE1OTEzN2NlMzA1MS4uN2FlNjhjYmQ1ZGQzNzJjYjVjYzkwN2ZhM2JhYjY1MGQ5NDBlZTY1 NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQXV0b21hdGlvbi9BdXRvbWF0 aW9uLmpzb24KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQXV0b21hdGlvbi9BdXRvbWF0 aW9uLmpzb24KQEAgLTI2OSw5ICsyNjksMTMgQEAKICAgICAgICAgewogICAgICAgICAgICAgIm5h bWUiOiAiY3JlYXRlQnJvd3NpbmdDb250ZXh0IiwKICAgICAgICAgICAgICJkZXNjcmlwdGlvbiI6 ICJPcGVucyBhIG5ldyBicm93c2luZyBjb250ZXh0IGluIHRoZSBhdXRvbWF0aW9uIHNlc3Npb24g YW5kIG1ha2VzIGl0IHRoZSBhY3RpdmUgYnJvd3NpbmcgY29udGV4dCBmb3IgdXNlciBpbnRlcmFj dGlvbi4gVGhpcyBjb21tYW5kIGNyZWF0ZXMgYSBicm93c2luZyBjb250ZXh0IGluIGEgbmV3IHdp bmRvdyByYXRoZXIgdGhhbiBhZGRpbmcgYSB0YWIgdG8gYW4gZXhpc3Rpbmcgd2luZG93LiIsCisg ICAgICAgICAgICAicGFyYW1ldGVycyI6IFsKKyAgICAgICAgICAgICAgICB7ICJuYW1lIjogInBy ZWZlck5ld1RhYiIsICJ0eXBlIjogImJvb2xlYW4iLCAib3B0aW9uYWwiOiB0cnVlLCAiZGVzY3Jp cHRpb24iOiAiQ3JlYXRlIHRoZSBuZXcgYnJvd3NpbmcgY29udGV4dCBhcyBhIHRhYiBpbiBhbiBl eGlzdGluZyBBdXRvbWF0aW9uIHdpbmRvdywgaWYgcG9zc2libGUuIn0KKyAgICAgICAgICAgIF0s CiAgICAgICAgICAgICAicmV0dXJucyI6IFsKICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImhh bmRsZSIsICIkcmVmIjogIkJyb3dzaW5nQ29udGV4dEhhbmRsZSIsICJkZXNjcmlwdGlvbiI6ICJB biBvcGFxdWUgaGFuZGxlIGZvciB0aGUgbmV3bHkgY3JlYXRlZCBicm93c2luZyBjb250ZXh0LiIg fQotICAgICAgICAgICAgXQorICAgICAgICAgICAgXSwKKyAgICAgICAgICAgICJhc3luYyI6IHRy dWUKICAgICAgICAgfSwKICAgICAgICAgewogICAgICAgICAgICAgIm5hbWUiOiAiY2xvc2VCcm93 c2luZ0NvbnRleHQiLApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQXV0b21h dGlvbi9XZWJBdXRvbWF0aW9uU2Vzc2lvbi5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9B dXRvbWF0aW9uL1dlYkF1dG9tYXRpb25TZXNzaW9uLmNwcAppbmRleCBkMmE5MzllMTUzYjZkNDhm MjQyYWE4ODYwMWM5NjQ2NjVkYzI5NTdiLi4xODRiMDg2NGUwNjg0MjEyMjI3NjE4MWIzZWQwMzhj YzFkYjUyMjY5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BdXRvbWF0aW9u L1dlYkF1dG9tYXRpb25TZXNzaW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9B dXRvbWF0aW9uL1dlYkF1dG9tYXRpb25TZXNzaW9uLmNwcApAQCAtMjcxLDE3ICsyNzEsMjQgQEAg dm9pZCBXZWJBdXRvbWF0aW9uU2Vzc2lvbjo6Z2V0QnJvd3NpbmdDb250ZXh0KGNvbnN0IFN0cmlu ZyYgaGFuZGxlLCBSZWY8R2V0QnJvd3MKICAgICB9KTsKIH0KIAotdm9pZCBXZWJBdXRvbWF0aW9u U2Vzc2lvbjo6Y3JlYXRlQnJvd3NpbmdDb250ZXh0KEluc3BlY3Rvcjo6RXJyb3JTdHJpbmcmIGVy cm9yU3RyaW5nLCBTdHJpbmcqIGhhbmRsZSkKK3ZvaWQgV2ViQXV0b21hdGlvblNlc3Npb246OmNy ZWF0ZUJyb3dzaW5nQ29udGV4dChjb25zdCBib29sKiBwcmVmZXJOZXdUYWIsIFJlZjxDcmVhdGVC cm93c2luZ0NvbnRleHRDYWxsYmFjaz4mJiBjYWxsYmFjaykKIHsKICAgICBBU1NFUlQobV9jbGll bnQpOwogICAgIGlmICghbV9jbGllbnQpCi0gICAgICAgIFNZTkNfRkFJTF9XSVRIX1BSRURFRklO RURfRVJST1JfQU5EX0RFVEFJTFMoSW50ZXJuYWxFcnJvciwgIlRoZSByZW1vdGUgc2Vzc2lvbiBj b3VsZCBub3QgcmVxdWVzdCBhIG5ldyBicm93c2luZyBjb250ZXh0LiIpOwotCi0gICAgV2ViUGFn ZVByb3h5KiBwYWdlID0gbV9jbGllbnQtPmRpZFJlcXVlc3ROZXdXaW5kb3coKnRoaXMpOwotICAg IGlmICghcGFnZSkKLSAgICAgICAgU1lOQ19GQUlMX1dJVEhfUFJFREVGSU5FRF9FUlJPUl9BTkRf REVUQUlMUyhJbnRlcm5hbEVycm9yLCAiVGhlIHJlbW90ZSBzZXNzaW9uIGZhaWxlZCB0byBjcmVh dGUgYSBuZXcgYnJvd3NpbmcgY29udGV4dC4iKTsKLQotICAgIG1fYWN0aXZlQnJvd3NpbmdDb250 ZXh0SGFuZGxlID0gKmhhbmRsZSA9IGhhbmRsZUZvcldlYlBhZ2VQcm94eSgqcGFnZSk7CisgICAg ICAgIEFTWU5DX0ZBSUxfV0lUSF9QUkVERUZJTkVEX0VSUk9SX0FORF9ERVRBSUxTKEludGVybmFs RXJyb3IsICJUaGUgcmVtb3RlIHNlc3Npb24gY291bGQgbm90IHJlcXVlc3QgYSBuZXcgYnJvd3Np bmcgY29udGV4dC4iKTsKKworICAgIHVpbnQxNl90IG9wdGlvbnMgPSAwOworICAgIGlmIChwcmVm ZXJOZXdUYWIgJiYgKnByZWZlck5ld1RhYikKKyAgICAgICAgb3B0aW9ucyB8PSBBUEk6OkF1dG9t YXRpb25TZXNzaW9uQnJvd3NpbmdDb250ZXh0T3B0aW9uc1ByZWZlck5ld1RhYjsKKworICAgIG1f Y2xpZW50LT5yZXF1ZXN0TmV3UGFnZVdpdGhPcHRpb25zKCp0aGlzLCBzdGF0aWNfY2FzdDxBUEk6 OkF1dG9tYXRpb25TZXNzaW9uQnJvd3NpbmdDb250ZXh0T3B0aW9ucz4ob3B0aW9ucyksIFtwcm90 ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhpcyksIGNhbGxiYWNrID0gV1RGTW92ZShjYWxsYmFjayld KFdlYlBhZ2VQcm94eSogcGFnZSkgeworICAgICAgICBpZiAocGFnZSkgeworICAgICAgICAgICAg YXV0byBoYW5kbGUgPSBwcm90ZWN0ZWRUaGlzLT5oYW5kbGVGb3JXZWJQYWdlUHJveHkoKnBhZ2Up OworICAgICAgICAgICAgcHJvdGVjdGVkVGhpcy0+bV9hY3RpdmVCcm93c2luZ0NvbnRleHRIYW5k bGUgPSBoYW5kbGU7CisgICAgICAgICAgICBjYWxsYmFjay0+c2VuZFN1Y2Nlc3MoaGFuZGxlKTsK KyAgICAgICAgfSBlbHNlCisgICAgICAgICAgICBBU1lOQ19GQUlMX1dJVEhfUFJFREVGSU5FRF9F UlJPUl9BTkRfREVUQUlMUyhJbnRlcm5hbEVycm9yLCAiVGhlIHJlbW90ZSBzZXNzaW9uIGZhaWxl ZCB0byBjcmVhdGUgYSBuZXcgYnJvd3NpbmcgY29udGV4dC4iKTsKKyAgICB9KTsKIH0KIAogdm9p ZCBXZWJBdXRvbWF0aW9uU2Vzc2lvbjo6Y2xvc2VCcm93c2luZ0NvbnRleHQoSW5zcGVjdG9yOjpF cnJvclN0cmluZyYgZXJyb3JTdHJpbmcsIGNvbnN0IFN0cmluZyYgaGFuZGxlKQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQXV0b21hdGlvbi9XZWJBdXRvbWF0aW9uU2Vzc2lv bi5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQXV0b21hdGlvbi9XZWJBdXRvbWF0aW9uU2Vz c2lvbi5oCmluZGV4IDU3NDg0NTkzNTRhY2IwOTdjZjI5NmJmYmNlOGIwYzYwZThiMTNhNDQuLjM4 YzRlMWRiZTkwZmJiOWVlNDY4N2RjMWQwZGQxNzZjZmY2OTAwMmMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL0F1dG9tYXRpb24vV2ViQXV0b21hdGlvblNlc3Npb24uaAorKysg Yi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BdXRvbWF0aW9uL1dlYkF1dG9tYXRpb25TZXNzaW9u LmgKQEAgLTExOSw5ICsxMTksOSBAQCBwdWJsaWM6CiAgICAgLy8gUGxhdGZvcm06IEdlbmVyaWMK ICAgICB2b2lkIGdldEJyb3dzaW5nQ29udGV4dHMoUmVmPEdldEJyb3dzaW5nQ29udGV4dHNDYWxs YmFjaz4mJikgZmluYWw7CiAgICAgdm9pZCBnZXRCcm93c2luZ0NvbnRleHQoY29uc3QgU3RyaW5n JiwgUmVmPEdldEJyb3dzaW5nQ29udGV4dENhbGxiYWNrPiYmKSBmaW5hbDsKLSAgICB2b2lkIGNy ZWF0ZUJyb3dzaW5nQ29udGV4dChJbnNwZWN0b3I6OkVycm9yU3RyaW5nJiwgU3RyaW5nKikgb3Zl cnJpZGU7CiAgICAgdm9pZCBjbG9zZUJyb3dzaW5nQ29udGV4dChJbnNwZWN0b3I6OkVycm9yU3Ry aW5nJiwgY29uc3QgU3RyaW5nJikgb3ZlcnJpZGU7CiAgICAgdm9pZCBzd2l0Y2hUb0Jyb3dzaW5n Q29udGV4dChJbnNwZWN0b3I6OkVycm9yU3RyaW5nJiwgY29uc3QgU3RyaW5nJiBicm93c2luZ0Nv bnRleHRIYW5kbGUsIGNvbnN0IFN0cmluZyogb3B0aW9uYWxGcmFtZUhhbmRsZSkgb3ZlcnJpZGU7 CisgICAgdm9pZCBjcmVhdGVCcm93c2luZ0NvbnRleHQoY29uc3QgYm9vbCogcHJlZmVyTmV3VGFi LCBSZWY8Q3JlYXRlQnJvd3NpbmdDb250ZXh0Q2FsbGJhY2s+JiYpIGZpbmFsOwogICAgIHZvaWQg c2V0V2luZG93RnJhbWVPZkJyb3dzaW5nQ29udGV4dChjb25zdCBTdHJpbmcmIGhhbmRsZSwgY29u c3QgSlNPTjo6T2JqZWN0KiBvcmlnaW4sIGNvbnN0IEpTT046Ok9iamVjdCogc2l6ZSwgUmVmPFNl dFdpbmRvd0ZyYW1lT2ZCcm93c2luZ0NvbnRleHRDYWxsYmFjaz4mJikgZmluYWw7CiAgICAgdm9p ZCBuYXZpZ2F0ZUJyb3dzaW5nQ29udGV4dChjb25zdCBTdHJpbmcmIGhhbmRsZSwgY29uc3QgU3Ry aW5nJiB1cmwsIGNvbnN0IFN0cmluZyogb3B0aW9uYWxQYWdlTG9hZFN0cmF0ZWd5U3RyaW5nLCBj b25zdCBpbnQqIG9wdGlvbmFsUGFnZUxvYWRUaW1lb3V0LCBSZWY8TmF2aWdhdGVCcm93c2luZ0Nv bnRleHRDYWxsYmFjaz4mJikgb3ZlcnJpZGU7CiAgICAgdm9pZCBnb0JhY2tJbkJyb3dzaW5nQ29u dGV4dChjb25zdCBTdHJpbmcmLCBjb25zdCBTdHJpbmcqIG9wdGlvbmFsUGFnZUxvYWRTdHJhdGVn eVN0cmluZywgY29uc3QgaW50KiBvcHRpb25hbFBhZ2VMb2FkVGltZW91dCwgUmVmPEdvQmFja0lu QnJvd3NpbmdDb250ZXh0Q2FsbGJhY2s+JiYpIG92ZXJyaWRlOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvQXV0b21hdGlvblNlc3Npb25DbGllbnQuaCBiL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL0F1dG9tYXRpb25TZXNzaW9uQ2xpZW50LmgKaW5kZXgg MzVlOGVjMmE2YWM1YzE5ZDBmYmFkYjZiM2VkYjEzMzgxZGQ0NmU0ZC4uN2Y2MTQ0YTIxZTk3Mjdh NDg3NmIxNTg0MmQ4Mjk1YmU5Zjc3MmMxYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvQ29jb2EvQXV0b21hdGlvblNlc3Npb25DbGllbnQuaAorKysgYi9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9Db2NvYS9BdXRvbWF0aW9uU2Vzc2lvbkNsaWVudC5oCkBAIC00Myw5ICs0Myw5 IEBAIHB1YmxpYzoKIAogcHJpdmF0ZToKICAgICAvLyBGcm9tIEFQSTo6QXV0b21hdGlvblNlc3Np b25DbGllbnQKLSAgICBXZWJQYWdlUHJveHkqIGRpZFJlcXVlc3ROZXdXaW5kb3coV2ViQXV0b21h dGlvblNlc3Npb24mKSBvdmVycmlkZTsKICAgICB2b2lkIGRpZERpc2Nvbm5lY3RGcm9tUmVtb3Rl KFdlYkF1dG9tYXRpb25TZXNzaW9uJikgb3ZlcnJpZGU7CiAKKyAgICB2b2lkIHJlcXVlc3ROZXdQ YWdlV2l0aE9wdGlvbnMoV2ViQXV0b21hdGlvblNlc3Npb24mLCBBUEk6OkF1dG9tYXRpb25TZXNz aW9uQnJvd3NpbmdDb250ZXh0T3B0aW9ucywgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChXZWJQYWdl UHJveHkqKT4mJikgb3ZlcnJpZGU7CiAgICAgYm9vbCBpc1Nob3dpbmdKYXZhU2NyaXB0RGlhbG9n T25QYWdlKFdlYkF1dG9tYXRpb25TZXNzaW9uJiwgV2ViUGFnZVByb3h5Jikgb3ZlcnJpZGU7CiAg ICAgdm9pZCBkaXNtaXNzQ3VycmVudEphdmFTY3JpcHREaWFsb2dPblBhZ2UoV2ViQXV0b21hdGlv blNlc3Npb24mLCBXZWJQYWdlUHJveHkmKSBvdmVycmlkZTsKICAgICB2b2lkIGFjY2VwdEN1cnJl bnRKYXZhU2NyaXB0RGlhbG9nT25QYWdlKFdlYkF1dG9tYXRpb25TZXNzaW9uJiwgV2ViUGFnZVBy b3h5Jikgb3ZlcnJpZGU7CkBAIC01OCw3ICs1OCw3IEBAIHByaXZhdGU6CiAgICAgc3RydWN0IHsK ICAgICAgICAgYm9vbCBkaWREaXNjb25uZWN0RnJvbVJlbW90ZSA6IDE7CiAKLSAgICAgICAgYm9v bCBkaWRSZXF1ZXN0TmV3V2ViVmlldyA6IDE7CisgICAgICAgIGJvb2wgcmVxdWVzdE5ld1dlYlZp ZXdXaXRoT3B0aW9ucyA6IDE7CiAgICAgICAgIGJvb2wgaXNTaG93aW5nSmF2YVNjcmlwdERpYWxv Z0ZvcldlYlZpZXcgOiAxOwogICAgICAgICBib29sIGRpc21pc3NDdXJyZW50SmF2YVNjcmlwdERp YWxvZ0ZvcldlYlZpZXcgOiAxOwogICAgICAgICBib29sIGFjY2VwdEN1cnJlbnRKYXZhU2NyaXB0 RGlhbG9nRm9yV2ViVmlldyA6IDE7CkBAIC02Nyw3ICs2Nyw3IEBAIHByaXZhdGU6CiAgICAgICAg IGJvb2wgdHlwZU9mQ3VycmVudEphdmFTY3JpcHREaWFsb2dGb3JXZWJWaWV3IDogMTsKIAogICAg ICAgICAvLyBGSVhNRSAzNzQwODcxODogdGhlc2UgZGVsZWdhdGUgbWV0aG9kcyBzaG91bGQgYmUg cmVtb3ZlZC4KLSAgICAgICAgYm9vbCBkaWRSZXF1ZXN0TmV3V2luZG93IDogMTsKKyAgICAgICAg Ym9vbCByZXF1ZXN0TmV3UGFnZVdpdGhPcHRpb25zIDogMTsKICAgICAgICAgYm9vbCBpc1Nob3dp bmdKYXZhU2NyaXB0RGlhbG9nT25QYWdlIDogMTsKICAgICAgICAgYm9vbCBkaXNtaXNzQ3VycmVu dEphdmFTY3JpcHREaWFsb2dPblBhZ2UgOiAxOwogICAgICAgICBib29sIGFjY2VwdEN1cnJlbnRK YXZhU2NyaXB0RGlhbG9nT25QYWdlIDogMTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL0NvY29hL0F1dG9tYXRpb25TZXNzaW9uQ2xpZW50Lm1tIGIvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvQ29jb2EvQXV0b21hdGlvblNlc3Npb25DbGllbnQubW0KaW5kZXggYTVjYjA5Yzk1 OTMyY2RhODgzNTNjYjYwOGQ3OTA1NTFmYzI2OTVmMi4uMmNmMTdhZmQyN2YzMDgxNTMxZmZkYzBi YzU1YmU3ODM3YjE0OWY4NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29j b2EvQXV0b21hdGlvblNlc3Npb25DbGllbnQubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvQ29jb2EvQXV0b21hdGlvblNlc3Npb25DbGllbnQubW0KQEAgLTM0LDYgKzM0LDcgQEAKICNp bXBvcnQgIldlYlBhZ2VQcm94eS5oIgogI2ltcG9ydCAiX1dLQXV0b21hdGlvblNlc3Npb25EZWxl Z2F0ZS5oIgogI2ltcG9ydCAiX1dLQXV0b21hdGlvblNlc3Npb25JbnRlcm5hbC5oIgorI2ltcG9y dCA8d3RmL0Jsb2NrUHRyLmg+CiAKIG5hbWVzcGFjZSBXZWJLaXQgewogCkBAIC00Miw3ICs0Myw3 IEBAIEF1dG9tYXRpb25TZXNzaW9uQ2xpZW50OjpBdXRvbWF0aW9uU2Vzc2lvbkNsaWVudChpZCA8 X1dLQXV0b21hdGlvblNlc3Npb25EZWxlZ2F0CiB7CiAgICAgbV9kZWxlZ2F0ZU1ldGhvZHMuZGlk RGlzY29ubmVjdEZyb21SZW1vdGUgPSBbZGVsZWdhdGUgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxl Y3RvcihfYXV0b21hdGlvblNlc3Npb25EaWREaXNjb25uZWN0RnJvbVJlbW90ZTopXTsKIAotICAg IG1fZGVsZWdhdGVNZXRob2RzLmRpZFJlcXVlc3ROZXdXZWJWaWV3ID0gW2RlbGVnYXRlIHJlc3Bv bmRzVG9TZWxlY3RvcjpAc2VsZWN0b3IoX2F1dG9tYXRpb25TZXNzaW9uRGlkUmVxdWVzdE5ld1dl YlZpZXc6KV07CisgICAgbV9kZWxlZ2F0ZU1ldGhvZHMucmVxdWVzdE5ld1dlYlZpZXdXaXRoT3B0 aW9ucyA9IFtkZWxlZ2F0ZSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKF9hdXRvbWF0aW9u U2Vzc2lvbjpyZXF1ZXN0TmV3V2ViVmlld1dpdGhPcHRpb25zOmNvbXBsZXRpb25IYW5kbGVyOild OwogICAgIG1fZGVsZWdhdGVNZXRob2RzLmlzU2hvd2luZ0phdmFTY3JpcHREaWFsb2dGb3JXZWJW aWV3ID0gW2RlbGVnYXRlIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3IoX2F1dG9tYXRpb25T ZXNzaW9uOmlzU2hvd2luZ0phdmFTY3JpcHREaWFsb2dGb3JXZWJWaWV3OildOwogICAgIG1fZGVs ZWdhdGVNZXRob2RzLmRpc21pc3NDdXJyZW50SmF2YVNjcmlwdERpYWxvZ0ZvcldlYlZpZXcgPSBb ZGVsZWdhdGUgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3RvcihfYXV0b21hdGlvblNlc3Npb246 ZGlzbWlzc0N1cnJlbnRKYXZhU2NyaXB0RGlhbG9nRm9yV2ViVmlldzopXTsKICAgICBtX2RlbGVn YXRlTWV0aG9kcy5hY2NlcHRDdXJyZW50SmF2YVNjcmlwdERpYWxvZ0ZvcldlYlZpZXcgPSBbZGVs ZWdhdGUgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3RvcihfYXV0b21hdGlvblNlc3Npb246YWNj ZXB0Q3VycmVudEphdmFTY3JpcHREaWFsb2dGb3JXZWJWaWV3OildOwpAQCAtNTEsNyArNTIsNyBA QCBBdXRvbWF0aW9uU2Vzc2lvbkNsaWVudDo6QXV0b21hdGlvblNlc3Npb25DbGllbnQoaWQgPF9X S0F1dG9tYXRpb25TZXNzaW9uRGVsZWdhdAogICAgIG1fZGVsZWdhdGVNZXRob2RzLnR5cGVPZkN1 cnJlbnRKYXZhU2NyaXB0RGlhbG9nRm9yV2ViVmlldyA9IFtkZWxlZ2F0ZSByZXNwb25kc1RvU2Vs ZWN0b3I6QHNlbGVjdG9yKF9hdXRvbWF0aW9uU2Vzc2lvbjp0eXBlT2ZDdXJyZW50SmF2YVNjcmlw dERpYWxvZ0ZvcldlYlZpZXc6KV07CiAKICAgICAvLyBGSVhNRSAzNzQwODcxODogdGhlc2UgZGVs ZWdhdGUgbWV0aG9kcyBzaG91bGQgYmUgcmVtb3ZlZC4KLSAgICBtX2RlbGVnYXRlTWV0aG9kcy5k aWRSZXF1ZXN0TmV3V2luZG93ID0gW2RlbGVnYXRlIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0 b3IoX2F1dG9tYXRpb25TZXNzaW9uRGlkUmVxdWVzdE5ld1dpbmRvdzopXTsKKyAgICBtX2RlbGVn YXRlTWV0aG9kcy5yZXF1ZXN0TmV3UGFnZVdpdGhPcHRpb25zID0gW2RlbGVnYXRlIHJlc3BvbmRz VG9TZWxlY3RvcjpAc2VsZWN0b3IoX2F1dG9tYXRpb25TZXNzaW9uOnJlcXVlc3ROZXdQYWdlV2l0 aE9wdGlvbnM6Y29tcGxldGlvbkhhbmRsZXI6KV07CiAgICAgbV9kZWxlZ2F0ZU1ldGhvZHMuaXNT aG93aW5nSmF2YVNjcmlwdERpYWxvZ09uUGFnZSA9IFtkZWxlZ2F0ZSByZXNwb25kc1RvU2VsZWN0 b3I6QHNlbGVjdG9yKF9hdXRvbWF0aW9uU2Vzc2lvbjppc1Nob3dpbmdKYXZhU2NyaXB0RGlhbG9n T25QYWdlOildOwogICAgIG1fZGVsZWdhdGVNZXRob2RzLmRpc21pc3NDdXJyZW50SmF2YVNjcmlw dERpYWxvZ09uUGFnZSA9IFtkZWxlZ2F0ZSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKF9h dXRvbWF0aW9uU2Vzc2lvbjpkaXNtaXNzQ3VycmVudEphdmFTY3JpcHREaWFsb2dPblBhZ2U6KV07 CiAgICAgbV9kZWxlZ2F0ZU1ldGhvZHMuYWNjZXB0Q3VycmVudEphdmFTY3JpcHREaWFsb2dPblBh Z2UgPSBbZGVsZWdhdGUgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3RvcihfYXV0b21hdGlvblNl c3Npb246YWNjZXB0Q3VycmVudEphdmFTY3JpcHREaWFsb2dPblBhZ2U6KV07CkBAIC02NiwxNyAr NjcsMzEgQEAgdm9pZCBBdXRvbWF0aW9uU2Vzc2lvbkNsaWVudDo6ZGlkRGlzY29ubmVjdEZyb21S ZW1vdGUoV2ViQXV0b21hdGlvblNlc3Npb24mIHNlc3MKICAgICAgICAgW21fZGVsZWdhdGUuZ2V0 KCkgX2F1dG9tYXRpb25TZXNzaW9uRGlkRGlzY29ubmVjdEZyb21SZW1vdGU6d3JhcHBlcihzZXNz aW9uKV07CiB9CiAKK3N0YXRpYyBpbmxpbmUgX1dLQXV0b21hdGlvblNlc3Npb25Ccm93c2luZ0Nv bnRleHRPcHRpb25zIHRvQVBJKEFQSTo6QXV0b21hdGlvblNlc3Npb25Ccm93c2luZ0NvbnRleHRP cHRpb25zIG9wdGlvbnMpCit7CisgICAgdWludDE2X3Qgd2tPcHRpb25zID0gMDsKKworICAgIGlm IChvcHRpb25zICYgQVBJOjpBdXRvbWF0aW9uU2Vzc2lvbkJyb3dzaW5nQ29udGV4dE9wdGlvbnNQ cmVmZXJOZXdUYWIpCisgICAgICAgIHdrT3B0aW9ucyB8PSBfV0tBdXRvbWF0aW9uU2Vzc2lvbkJy b3dzaW5nQ29udGV4dE9wdGlvbnNQcmVmZXJOZXdUYWI7CisKKyAgICByZXR1cm4gc3RhdGljX2Nh c3Q8X1dLQXV0b21hdGlvblNlc3Npb25Ccm93c2luZ0NvbnRleHRPcHRpb25zPih3a09wdGlvbnMp OworfQorCiAvLyBGSVhNRSAzNzQwODcxODogc3VwcG9ydCBmb3IgV0tQYWdlUmVmLWJhc2VkIGRl bGVnYXRlIG1ldGhvZHMgc2hvdWxkIGJlIHJlbW92ZWQuCiAvLyBVbnRpbCB0aGVzZSBhcmUgcmVt b3ZlZCwgcHJlZmVyIHRvIHVzZSB0aGUgV0tXZWJWaWV3IGRlbGVnYXRlIG1ldGhvZHMgaWYgaW1w bGVtZW50ZWQuCi1XZWJQYWdlUHJveHkqIEF1dG9tYXRpb25TZXNzaW9uQ2xpZW50OjpkaWRSZXF1 ZXN0TmV3V2luZG93KFdlYkF1dG9tYXRpb25TZXNzaW9uJiBzZXNzaW9uKQordm9pZCBBdXRvbWF0 aW9uU2Vzc2lvbkNsaWVudDo6cmVxdWVzdE5ld1BhZ2VXaXRoT3B0aW9ucyhXZWJBdXRvbWF0aW9u U2Vzc2lvbiYgc2Vzc2lvbiwgQVBJOjpBdXRvbWF0aW9uU2Vzc2lvbkJyb3dzaW5nQ29udGV4dE9w dGlvbnMgb3B0aW9ucywgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChXZWJLaXQ6OldlYlBhZ2VQcm94 eSopPiYmIGNvbXBsZXRpb25IYW5kbGVyKQogewotICAgIGlmIChtX2RlbGVnYXRlTWV0aG9kcy5k aWRSZXF1ZXN0TmV3V2ViVmlldykKLSAgICAgICAgcmV0dXJuIFttX2RlbGVnYXRlLmdldCgpIF9h dXRvbWF0aW9uU2Vzc2lvbkRpZFJlcXVlc3ROZXdXZWJWaWV3OndyYXBwZXIoc2Vzc2lvbildLT5f cGFnZS5nZXQoKTsKKyAgICBpZiAobV9kZWxlZ2F0ZU1ldGhvZHMucmVxdWVzdE5ld1dlYlZpZXdX aXRoT3B0aW9ucykgeworICAgICAgICBbbV9kZWxlZ2F0ZS5nZXQoKSBfYXV0b21hdGlvblNlc3Np b246d3JhcHBlcihzZXNzaW9uKSByZXF1ZXN0TmV3V2ViVmlld1dpdGhPcHRpb25zOnRvQVBJKG9w dGlvbnMpIGNvbXBsZXRpb25IYW5kbGVyOkJsb2NrUHRyPHZvaWQoV0tXZWJWaWV3ICopPjo6ZnJv bUNhbGxhYmxlKFtjb21wbGV0aW9uSGFuZGxlciA9IFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIp XShXS1dlYlZpZXcgKndlYlZpZXcpIHsKKyAgICAgICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKHdl YlZpZXctPl9wYWdlLmdldCgpKTsKKyAgICAgICAgfSkuZ2V0KCldOworICAgIH0gZWxzZSBpZiAo bV9kZWxlZ2F0ZU1ldGhvZHMucmVxdWVzdE5ld1BhZ2VXaXRoT3B0aW9ucykgeworICAgICAgICBb bV9kZWxlZ2F0ZS5nZXQoKSBfYXV0b21hdGlvblNlc3Npb246d3JhcHBlcihzZXNzaW9uKSByZXF1 ZXN0TmV3UGFnZVdpdGhPcHRpb25zOnRvQVBJKG9wdGlvbnMpIGNvbXBsZXRpb25IYW5kbGVyOkJs b2NrUHRyPHZvaWQoV0tQYWdlUmVmKT46OmZyb21DYWxsYWJsZShbY29tcGxldGlvbkhhbmRsZXIg PSBXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKV0oV0tQYWdlUmVmIHBhZ2UpIHsKKyAgICAgICAg ICAgIGNvbXBsZXRpb25IYW5kbGVyKHRvSW1wbChwYWdlKSk7CisgICAgICAgIH0pLmdldCgpXTsK KyAgICAgfQogCi0gICAgaWYgKG1fZGVsZWdhdGVNZXRob2RzLmRpZFJlcXVlc3ROZXdXaW5kb3cp Ci0gICAgICAgIHJldHVybiB0b0ltcGwoW21fZGVsZWdhdGUuZ2V0KCkgX2F1dG9tYXRpb25TZXNz aW9uRGlkUmVxdWVzdE5ld1dpbmRvdzp3cmFwcGVyKHNlc3Npb24pXSk7CiAKLSAgICByZXR1cm4g bnVsbHB0cjsKIH0KIAogYm9vbCBBdXRvbWF0aW9uU2Vzc2lvbkNsaWVudDo6aXNTaG93aW5nSmF2 YVNjcmlwdERpYWxvZ09uUGFnZShXZWJBdXRvbWF0aW9uU2Vzc2lvbiYgc2Vzc2lvbiwgV2ViUGFn ZVByb3h5JiBwYWdlKQo= 336479 2018-03-24 11:37:25 -0700 2018-03-24 14:43:30 -0700 Proposed Fix bug-183971-20180324113724.patch text/plain 7789 bburg U3VidmVyc2lvbiBSZXZpc2lvbjogMjI5OTUxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDE0ZTczMTJmYTM5Y2EzNDQ0 MjJlNzA3NjcwOWJkOGU2ZjYzOWNhMmQuLjBhM2RhNjllNTk0MWNhNDZhNDQ2NjAzMzgxMzVhNjM1 OTY4ODI3MDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzcgQEAKKzIwMTgtMDMtMjMgIEJyaWFuIEJ1 cmcgIDxiYnVyZ0BhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEF1dG9tYXRpb246IHJlbW92ZSB1 bm5lY2Vzc2FyeSBtZW1iZXIgdmFyaWFibGUgV2ViQXV0b21hdGlvblNlc3Npb24KKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4Mzk3MQorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBjb25jZXB0IG9mIHRo ZSAiYWN0aXZlIiBicm93c2luZyBjb250ZXh0IGlzIHNvbWV0aGluZyBpbiB0aGUgV2ViRHJpdmVy CisgICAgICAgIHNwZWNpZmljYXRpb24sIGJ1dCB3ZSB3ZXJlIGEgYml0IHRvbyBsaXRlcmFsIHdo ZW4gZmlyc3QgaW1wbGVtZW50aW5nIHRoaXMuCisgICAgICAgIFRoZXJlJ3Mgbm8gYWN0dWFsIG5l ZWQgZm9yIHRoaXMgb24gdGhlIGJyb3dzZXIgc2lkZSBzaW5jZSBtb3N0IGNvbW1hbmRzCisgICAg ICAgIHJlcXVpcmUgaW1wbGljaXRseSBzd2l0Y2hpbmcgdG8gdGhlIHRhcmdldCB3aW5kb3cgcGFz c2VkIGluIHdpdGggdGhlCisgICAgICAgIEF1dG9tYXRpb24gY29tbWFuZC4gVGhlIGRyaXZlciwg aG93ZXZlciwgc3RpbGwgbmVlZHMgdG8gdHJhY2sgdGhlIGN1cnJlbnQKKyAgICAgICAgYnJvd3Np bmcgY29udGV4dCBhbmQgY3VycmVudCB0b3AtbGV2ZWwgYnJvd3NpbmcgY29udGV4dC4KKworICAg ICAgICBGb3IgcmV0dXJuaW5nIHdoZXRoZXIgYSBicm93c2luZyBjb250ZXh0IGlzIGFjdGl2ZSwg IHdlIGNhbiBqdXN0IGxvb2sgYXQKKyAgICAgICAgdGhlIHBhZ2UncyBhY3Rpdml0eSBzdGF0ZSB0 byBrbm93IHdoZXRoZXIgdGhlIHBhZ2UgaXMgYWN0aXZlIG9yIG5vdC4gRm9yCisgICAgICAgIGEg bm9ybWFsIGJyb3dzZXIsIG9ubHkgb25lIHBhZ2UgaXMgZ29pbmcgdG8gYmUgdmlzaWJsZSBhbmQg Zm9jdXNlZCBhdCBhIHRpbWUuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQXV0b21hdGlvbi9XZWJB dXRvbWF0aW9uU2Vzc2lvbi5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9BdXRvbWF0aW9uL1dlYkF1 dG9tYXRpb25TZXNzaW9uLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViQXV0b21hdGlvblNlc3Np b246OmJ1aWxkQnJvd3NpbmdDb250ZXh0Rm9yUGFnZSk6CisgICAgICAgIENvbnN1bHQgdGhlIHBh Z2UncyBhY3Rpdml0eSBzdGF0ZSB0byBkZXRlcm1pbmUgd2hldGhlciBpdCdzIGFjdGl2ZS4KKwor ICAgICAgICAoV2ViS2l0OjpXZWJBdXRvbWF0aW9uU2Vzc2lvbjo6Y3JlYXRlQnJvd3NpbmdDb250 ZXh0KToKKyAgICAgICAgKFdlYktpdDo6V2ViQXV0b21hdGlvblNlc3Npb246OmNsb3NlQnJvd3Np bmdDb250ZXh0KToKKyAgICAgICAgKFdlYktpdDo6V2ViQXV0b21hdGlvblNlc3Npb246OnN3aXRj aFRvQnJvd3NpbmdDb250ZXh0KToKKyAgICAgICAgKFdlYktpdDo6V2ViQXV0b21hdGlvblNlc3Np b246OmhhbmRsZVJ1bk9wZW5QYW5lbCk6CisgICAgICAgIFN0b3AgcmVhZGluZyBhbmQgd3JpdGlu ZyB0aGUgY3VycmVudCBicm93c2luZyBjb250ZXh0IGhhbmRsZS4KKworICAgICAgICAqIFVJUHJv Y2Vzcy9XZWJQYWdlUHJveHkuaDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5Ojppc1Zp ZXdGb2N1c2VkIGNvbnN0KToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5Ojppc1ZpZXdX aW5kb3dBY3RpdmUgY29uc3QpOgorICAgICAgICBBZGQgbmV3IGFjY2Vzc29yLgorCiAyMDE4LTAz LTI0ICBUaW0gSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgogCiAgICAgICAgIEZp eCB0aGUgIUVOQUJMRShNRURJQV9TVFJFQU0pIGJ1aWxkCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9BdXRvbWF0aW9uL1dlYkF1dG9tYXRpb25TZXNzaW9uLmNwcCBiL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL0F1dG9tYXRpb24vV2ViQXV0b21hdGlvblNlc3Npb24uY3BwCmlu ZGV4IGQyYTkzOWUxNTNiNmQ0OGYyNDJhYTg4NjAxYzk2NDY2NWRjMjk1N2IuLjllMmU0ZDlkOTU2 NjQ4MzIwMTU3ODE0NWI1ZDljMDRhMGQyMjRmYWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL0F1dG9tYXRpb24vV2ViQXV0b21hdGlvblNlc3Npb24uY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL0F1dG9tYXRpb24vV2ViQXV0b21hdGlvblNlc3Npb24uY3BwCkBA IC0yMTgsMTEgKzIxOCwxMiBAQCBSZWY8SW5zcGVjdG9yOjpQcm90b2NvbDo6QXV0b21hdGlvbjo6 QnJvd3NpbmdDb250ZXh0PiBXZWJBdXRvbWF0aW9uU2Vzc2lvbjo6YnVpbAogICAgICAgICAuc2V0 SGVpZ2h0KHdpbmRvd0ZyYW1lLmhlaWdodCgpKQogICAgICAgICAucmVsZWFzZSgpOwogCisgICAg Ym9vbCBpc0FjdGl2ZSA9IHBhZ2UuaXNWaWV3VmlzaWJsZSgpICYmIHBhZ2UuaXNWaWV3Rm9jdXNl ZCgpICYmIHBhZ2UuaXNWaWV3V2luZG93QWN0aXZlKCk7CiAgICAgU3RyaW5nIGhhbmRsZSA9IGhh bmRsZUZvcldlYlBhZ2VQcm94eShwYWdlKTsKIAogICAgIHJldHVybiBJbnNwZWN0b3I6OlByb3Rv Y29sOjpBdXRvbWF0aW9uOjpCcm93c2luZ0NvbnRleHQ6OmNyZWF0ZSgpCiAgICAgICAgIC5zZXRI YW5kbGUoaGFuZGxlKQotICAgICAgICAuc2V0QWN0aXZlKG1fYWN0aXZlQnJvd3NpbmdDb250ZXh0 SGFuZGxlID09IGhhbmRsZSkKKyAgICAgICAgLnNldEFjdGl2ZShpc0FjdGl2ZSkKICAgICAgICAg LnNldFVybChwYWdlLnBhZ2VMb2FkU3RhdGUoKS5hY3RpdmVVUkwoKSkKICAgICAgICAgLnNldFdp bmRvd09yaWdpbihXVEZNb3ZlKG9yaWdpbk9iamVjdCkpCiAgICAgICAgIC5zZXRXaW5kb3dTaXpl KFdURk1vdmUoc2l6ZU9iamVjdCkpCkBAIC0yODAsOCArMjgxLDYgQEAgdm9pZCBXZWJBdXRvbWF0 aW9uU2Vzc2lvbjo6Y3JlYXRlQnJvd3NpbmdDb250ZXh0KEluc3BlY3Rvcjo6RXJyb3JTdHJpbmcm IGVycm9yU3QKICAgICBXZWJQYWdlUHJveHkqIHBhZ2UgPSBtX2NsaWVudC0+ZGlkUmVxdWVzdE5l d1dpbmRvdygqdGhpcyk7CiAgICAgaWYgKCFwYWdlKQogICAgICAgICBTWU5DX0ZBSUxfV0lUSF9Q UkVERUZJTkVEX0VSUk9SX0FORF9ERVRBSUxTKEludGVybmFsRXJyb3IsICJUaGUgcmVtb3RlIHNl c3Npb24gZmFpbGVkIHRvIGNyZWF0ZSBhIG5ldyBicm93c2luZyBjb250ZXh0LiIpOwotCi0gICAg bV9hY3RpdmVCcm93c2luZ0NvbnRleHRIYW5kbGUgPSAqaGFuZGxlID0gaGFuZGxlRm9yV2ViUGFn ZVByb3h5KCpwYWdlKTsKIH0KIAogdm9pZCBXZWJBdXRvbWF0aW9uU2Vzc2lvbjo6Y2xvc2VCcm93 c2luZ0NvbnRleHQoSW5zcGVjdG9yOjpFcnJvclN0cmluZyYgZXJyb3JTdHJpbmcsIGNvbnN0IFN0 cmluZyYgaGFuZGxlKQpAQCAtMjkwLDkgKzI4OSw2IEBAIHZvaWQgV2ViQXV0b21hdGlvblNlc3Np b246OmNsb3NlQnJvd3NpbmdDb250ZXh0KEluc3BlY3Rvcjo6RXJyb3JTdHJpbmcmIGVycm9yU3Ry CiAgICAgaWYgKCFwYWdlKQogICAgICAgICBTWU5DX0ZBSUxfV0lUSF9QUkVERUZJTkVEX0VSUk9S KFdpbmRvd05vdEZvdW5kKTsKIAotICAgIGlmIChoYW5kbGUgPT0gbV9hY3RpdmVCcm93c2luZ0Nv bnRleHRIYW5kbGUpCi0gICAgICAgIG1fYWN0aXZlQnJvd3NpbmdDb250ZXh0SGFuZGxlID0gZW1w dHlTdHJpbmcoKTsKLQogICAgIHBhZ2UtPmNsb3NlUGFnZShmYWxzZSk7CiB9CiAKQEAgLTMwNiw5 ICszMDIsNiBAQCB2b2lkIFdlYkF1dG9tYXRpb25TZXNzaW9uOjpzd2l0Y2hUb0Jyb3dzaW5nQ29u dGV4dChJbnNwZWN0b3I6OkVycm9yU3RyaW5nJiBlcnJvcgogICAgIGlmICghZnJhbWVJRCkKICAg ICAgICAgU1lOQ19GQUlMX1dJVEhfUFJFREVGSU5FRF9FUlJPUihGcmFtZU5vdEZvdW5kKTsKIAot ICAgIC8vIEZJWE1FOiBXZSBkb24ndCBuZWVkIHRvIHRyYWNrIHRoaXMgaW4gV0syLiBSZW1vdmUg aW4gYSBmb2xsb3cgdXAuCi0gICAgbV9hY3RpdmVCcm93c2luZ0NvbnRleHRIYW5kbGUgPSBicm93 c2luZ0NvbnRleHRIYW5kbGU7Ci0KICAgICBwYWdlLT5zZXRGb2N1cyh0cnVlKTsKICAgICBwYWdl LT5wcm9jZXNzKCkuc2VuZChNZXNzYWdlczo6V2ViQXV0b21hdGlvblNlc3Npb25Qcm94eTo6Rm9j dXNGcmFtZShwYWdlLT5wYWdlSUQoKSwgZnJhbWVJRC52YWx1ZSgpKSwgMCk7CiB9CkBAIC02OTIs MTUgKzY4NSwxNiBAQCBzdGF0aWMgYm9vbCBmaWxlQ2FuQmVBY2NlcHRlZEZvclVwbG9hZChjb25z dCBTdHJpbmcmIGZpbGVuYW1lLCBjb25zdCBIYXNoU2V0PFN0cgogCiB2b2lkIFdlYkF1dG9tYXRp b25TZXNzaW9uOjpoYW5kbGVSdW5PcGVuUGFuZWwoY29uc3QgV2ViUGFnZVByb3h5JiBwYWdlLCBj b25zdCBXZWJGcmFtZVByb3h5JiwgY29uc3QgQVBJOjpPcGVuUGFuZWxQYXJhbWV0ZXJzJiBwYXJh bWV0ZXJzLCBXZWJPcGVuUGFuZWxSZXN1bHRMaXN0ZW5lclByb3h5JiByZXN1bHRMaXN0ZW5lcikK IHsKKyAgICBTdHJpbmcgYnJvd3NpbmdDb250ZXh0SGFuZGxlID0gaGFuZGxlRm9yV2ViUGFnZVBy b3h5KHBhZ2UpOwogICAgIGlmICghbV9maWxlc1RvU2VsZWN0Rm9yRmlsZVVwbG9hZC5zaXplKCkp IHsKICAgICAgICAgcmVzdWx0TGlzdGVuZXIuY2FuY2VsKCk7Ci0gICAgICAgIG1fZG9tYWluTm90 aWZpZXItPmZpbGVDaG9vc2VyRGlzbWlzc2VkKG1fYWN0aXZlQnJvd3NpbmdDb250ZXh0SGFuZGxl LCB0cnVlKTsKKyAgICAgICAgbV9kb21haW5Ob3RpZmllci0+ZmlsZUNob29zZXJEaXNtaXNzZWQo YnJvd3NpbmdDb250ZXh0SGFuZGxlLCB0cnVlKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAog ICAgIGlmIChtX2ZpbGVzVG9TZWxlY3RGb3JGaWxlVXBsb2FkLnNpemUoKSA+IDEgJiYgIXBhcmFt ZXRlcnMuYWxsb3dNdWx0aXBsZUZpbGVzKCkpIHsKICAgICAgICAgcmVzdWx0TGlzdGVuZXIuY2Fu Y2VsKCk7Ci0gICAgICAgIG1fZG9tYWluTm90aWZpZXItPmZpbGVDaG9vc2VyRGlzbWlzc2VkKG1f YWN0aXZlQnJvd3NpbmdDb250ZXh0SGFuZGxlLCB0cnVlKTsKKyAgICAgICAgbV9kb21haW5Ob3Rp Zmllci0+ZmlsZUNob29zZXJEaXNtaXNzZWQoYnJvd3NpbmdDb250ZXh0SGFuZGxlLCB0cnVlKTsK ICAgICAgICAgcmV0dXJuOwogICAgIH0KIApAQCAtNzIzLDEzICs3MTcsMTMgQEAgdm9pZCBXZWJB dXRvbWF0aW9uU2Vzc2lvbjo6aGFuZGxlUnVuT3BlblBhbmVsKGNvbnN0IFdlYlBhZ2VQcm94eSYg cGFnZSwgY29uc3QgV2UKICAgICBmb3IgKGNvbnN0IFN0cmluZyYgZmlsZW5hbWUgOiBtX2ZpbGVz VG9TZWxlY3RGb3JGaWxlVXBsb2FkKSB7CiAgICAgICAgIGlmICghZmlsZUNhbkJlQWNjZXB0ZWRG b3JVcGxvYWQoZmlsZW5hbWUsIGFsbG93ZWRNSU1FVHlwZXMsIGFsbG93ZWRGaWxlRXh0ZW5zaW9u cykpIHsKICAgICAgICAgICAgIHJlc3VsdExpc3RlbmVyLmNhbmNlbCgpOwotICAgICAgICAgICAg bV9kb21haW5Ob3RpZmllci0+ZmlsZUNob29zZXJEaXNtaXNzZWQobV9hY3RpdmVCcm93c2luZ0Nv bnRleHRIYW5kbGUsIHRydWUpOworICAgICAgICAgICAgbV9kb21haW5Ob3RpZmllci0+ZmlsZUNo b29zZXJEaXNtaXNzZWQoYnJvd3NpbmdDb250ZXh0SGFuZGxlLCB0cnVlKTsKICAgICAgICAgICAg IHJldHVybjsKICAgICAgICAgfQogICAgIH0KIAogICAgIHJlc3VsdExpc3RlbmVyLmNob29zZUZp bGVzKG1fZmlsZXNUb1NlbGVjdEZvckZpbGVVcGxvYWQpOwotICAgIG1fZG9tYWluTm90aWZpZXIt PmZpbGVDaG9vc2VyRGlzbWlzc2VkKG1fYWN0aXZlQnJvd3NpbmdDb250ZXh0SGFuZGxlLCBmYWxz ZSk7CisgICAgbV9kb21haW5Ob3RpZmllci0+ZmlsZUNob29zZXJEaXNtaXNzZWQoYnJvd3NpbmdD b250ZXh0SGFuZGxlLCBmYWxzZSk7CiB9CiAKIHZvaWQgV2ViQXV0b21hdGlvblNlc3Npb246OmV2 YWx1YXRlSmF2YVNjcmlwdEZ1bmN0aW9uKGNvbnN0IFN0cmluZyYgYnJvd3NpbmdDb250ZXh0SGFu ZGxlLCBjb25zdCBTdHJpbmcqIG9wdGlvbmFsRnJhbWVIYW5kbGUsIGNvbnN0IFN0cmluZyYgZnVu Y3Rpb24sIGNvbnN0IEpTT046OkFycmF5JiBhcmd1bWVudHMsIGNvbnN0IGJvb2wqIG9wdGlvbmFs RXhwZWN0c0ltcGxpY2l0Q2FsbGJhY2tBcmd1bWVudCwgY29uc3QgaW50KiBvcHRpb25hbENhbGxi YWNrVGltZW91dCwgUmVmPEV2YWx1YXRlSmF2YVNjcmlwdEZ1bmN0aW9uQ2FsbGJhY2s+JiYgY2Fs bGJhY2spCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BdXRvbWF0aW9uL1dl YkF1dG9tYXRpb25TZXNzaW9uLmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BdXRvbWF0aW9u L1dlYkF1dG9tYXRpb25TZXNzaW9uLmgKaW5kZXggNTc0ODQ1OTM1NGFjYjA5N2NmMjk2YmZiY2U4 YjBjNjBlOGIxM2E0NC4uMzZjNGM3Yjg4ZjAwMjg3OTk1ZGZmM2M2Y2RjODM0YmEzNjZjM2VmYiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQXV0b21hdGlvbi9XZWJBdXRvbWF0 aW9uU2Vzc2lvbi5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0F1dG9tYXRpb24vV2Vi QXV0b21hdGlvblNlc3Npb24uaApAQCAtMjE4LDcgKzIxOCw2IEBAIHByaXZhdGU6CiAKICAgICBI YXNoTWFwPHVpbnQ2NF90LCBTdHJpbmc+IG1fd2ViUGFnZUhhbmRsZU1hcDsKICAgICBIYXNoTWFw PFN0cmluZywgdWludDY0X3Q+IG1faGFuZGxlV2ViUGFnZU1hcDsKLSAgICBTdHJpbmcgbV9hY3Rp dmVCcm93c2luZ0NvbnRleHRIYW5kbGU7CiAKICAgICBIYXNoTWFwPHVpbnQ2NF90LCBTdHJpbmc+ IG1fd2ViRnJhbWVIYW5kbGVNYXA7CiAgICAgSGFzaE1hcDxTdHJpbmcsIHVpbnQ2NF90PiBtX2hh bmRsZVdlYkZyYW1lTWFwOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vi UGFnZVByb3h5LmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAppbmRl eCA0NDVjYTc3NWNlZmU5ZjgyODliZjJjZTVhNmVjNjZjODZjMzU4YTY1Li4wNGU1ODg5YjEzODYw OGFlOWJkOTFhZDk1OGM4ZGY3MGUyMjQ5NDE2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9XZWJQYWdlUHJveHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQ YWdlUHJveHkuaApAQCAtNDk2LDcgKzQ5Niw4IEBAIHB1YmxpYzoKIAogICAgIFdlYkNvcmU6Oklu dFNpemUgdmlld1NpemUoKSBjb25zdDsKICAgICBib29sIGlzVmlld1Zpc2libGUoKSBjb25zdCB7 IHJldHVybiBtX2FjdGl2aXR5U3RhdGUgJiBXZWJDb3JlOjpBY3Rpdml0eVN0YXRlOjpJc1Zpc2li bGU7IH0KLSAgICBib29sIGlzVmlld1dpbmRvd0FjdGl2ZSgpIGNvbnN0OworICAgIGJvb2wgaXNW aWV3Rm9jdXNlZCgpIGNvbnN0IHsgcmV0dXJuIG1fYWN0aXZpdHlTdGF0ZSAmIFdlYkNvcmU6OkFj dGl2aXR5U3RhdGU6OklzRm9jdXNlZDsgfQorICAgIGJvb2wgaXNWaWV3V2luZG93QWN0aXZlKCkg Y29uc3QgeyByZXR1cm4gbV9hY3Rpdml0eVN0YXRlICYgV2ViQ29yZTo6QWN0aXZpdHlTdGF0ZTo6 V2luZG93SXNBY3RpdmU7IH0KIAogICAgIHZvaWQgYWRkTUlNRVR5cGVXaXRoQ3VzdG9tQ29udGVu dFByb3ZpZGVyKGNvbnN0IFN0cmluZyYgbWltZVR5cGUpOwogCg==