189765 2018-09-19 14:04:32 -0700 Don't crash if we get a null navigation 2018-09-19 14:33:22 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED DUPLICATE 189763 InRadar P2 Normal --- 1 achristensen achristensen cdumez webkit-bug-importer oldest_to_newest 1461115 0 achristensen 2018-09-19 14:04:32 -0700 Don't crash if we get a null navigation 1461116 1 350149 achristensen 2018-09-19 14:05:51 -0700 Created attachment 350149 Patch 1461117 2 achristensen 2018-09-19 14:05:54 -0700 <rdar://problem/19373509> 1461122 3 achristensen 2018-09-19 14:09:26 -0700 *** This bug has been marked as a duplicate of bug 189763 *** 1461128 4 350149 cdumez 2018-09-19 14:33:22 -0700 Comment on attachment 350149 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=350149&action=review > Source/WebKit/UIProcess/WebNavigationState.cpp:59 > return navigation; The navigation you're returning here has been moved above. Same comment below. 350149 2018-09-19 14:05:51 -0700 2018-09-19 14:09:10 -0700 Patch bug-189765-20180919140550.patch text/plain 10486 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMzYyMjMpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMyIEBACisyMDE4LTA5LTE5ICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgRG9uJ3QgY3Jhc2gg aWYgd2UgZ2V0IGEgbnVsbCBuYXZpZ2F0aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xODk3NjUKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzE5Mzcz NTA5PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEl0 IGhhcHBlbnMgc29tZXRpbWVzLiAgVGhhdCdzIHVuZm9ydHVuYXRlLCBidXQgd2Ugc2hvdWxkbid0 IGNyYXNoLgorCisgICAgICAgICogVUlQcm9jZXNzL1dlYk5hdmlnYXRpb25TdGF0ZS5jcHA6Cisg ICAgICAgIChXZWJLaXQ6OldlYk5hdmlnYXRpb25TdGF0ZTo6Y3JlYXRlTG9hZFJlcXVlc3ROYXZp Z2F0aW9uKToKKyAgICAgICAgKFdlYktpdDo6V2ViTmF2aWdhdGlvblN0YXRlOjpjcmVhdGVCYWNr Rm9yd2FyZE5hdmlnYXRpb24pOgorICAgICAgICAoV2ViS2l0OjpXZWJOYXZpZ2F0aW9uU3RhdGU6 OmNyZWF0ZVJlbG9hZE5hdmlnYXRpb24pOgorICAgICAgICAoV2ViS2l0OjpXZWJOYXZpZ2F0aW9u U3RhdGU6OmNyZWF0ZUxvYWREYXRhTmF2aWdhdGlvbik6CisgICAgICAgIChXZWJLaXQ6OldlYk5h dmlnYXRpb25TdGF0ZTo6bmF2aWdhdGlvbik6CisgICAgICAgIChXZWJLaXQ6OldlYk5hdmlnYXRp b25TdGF0ZTo6dGFrZU5hdmlnYXRpb24pOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJOYXZpZ2F0 aW9uU3RhdGUuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcDoKKyAgICAg ICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpkaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1l KToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpkaWRSZWNlaXZlU2VydmVyUmVkaXJl Y3RGb3JQcm92aXNpb25hbExvYWRGb3JGcmFtZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQ cm94eTo6ZGlkQ29tbWl0TG9hZEZvckZyYW1lKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVBy b3h5OjpkaWRGaW5pc2hEb2N1bWVudExvYWRGb3JGcmFtZSk6CisgICAgICAgIChXZWJLaXQ6Oldl YlBhZ2VQcm94eTo6ZGlkRmluaXNoTG9hZEZvckZyYW1lKToKKyAgICAgICAgKFdlYktpdDo6V2Vi UGFnZVByb3h5OjpkaWRGYWlsTG9hZEZvckZyYW1lKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFn ZVByb3h5OjpkaWRTYW1lRG9jdW1lbnROYXZpZ2F0aW9uRm9yRnJhbWUpOgorICAgICAgICAoV2Vi S2l0OjpXZWJQYWdlUHJveHk6OmRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb24pOgorICAg ICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmRlY2lkZVBvbGljeUZvclJlc3BvbnNlKToKKwog MjAxOC0wOS0xOSAgSm9obiBXaWxhbmRlciAgPHdpbGFuZGVyQGFwcGxlLmNvbT4KIAogICAgICAg ICBSZXNvdXJjZSBMb2FkIFN0YXRpc3RpY3M6IEFkZCBvcHRpb25hbCBjYXAgb24gcGFydGl0aW9u ZWQgY2FjaGUgbWF4IGFnZQpJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViTmF2aWdh dGlvblN0YXRlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJO YXZpZ2F0aW9uU3RhdGUuY3BwCShyZXZpc2lvbiAyMzYxNTApCisrKyBTb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9XZWJOYXZpZ2F0aW9uU3RhdGUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00NSw3ICs0 NSw3IEBAIFJlZjxBUEk6Ok5hdmlnYXRpb24+IFdlYk5hdmlnYXRpb25TdGF0ZToKIHsKICAgICBh dXRvIG5hdmlnYXRpb24gPSBBUEk6Ok5hdmlnYXRpb246OmNyZWF0ZSgqdGhpcywgV1RGTW92ZShy ZXF1ZXN0KSwgY3VycmVudEl0ZW0pOwogCi0gICAgbV9uYXZpZ2F0aW9ucy5zZXQobmF2aWdhdGlv bi0+bmF2aWdhdGlvbklEKCksIG5hdmlnYXRpb24ucHRyKCkpOworICAgIG1fbmF2aWdhdGlvbnMu c2V0KG5hdmlnYXRpb24tPm5hdmlnYXRpb25JRCgpLCBXVEZNb3ZlKG5hdmlnYXRpb24pKTsKIAog ICAgIHJldHVybiBuYXZpZ2F0aW9uOwogfQpAQCAtNTQsNyArNTQsNyBAQCBSZWY8QVBJOjpOYXZp Z2F0aW9uPiBXZWJOYXZpZ2F0aW9uU3RhdGU6CiB7CiAgICAgYXV0byBuYXZpZ2F0aW9uID0gQVBJ OjpOYXZpZ2F0aW9uOjpjcmVhdGUoKnRoaXMsIHRhcmdldEl0ZW0sIGN1cnJlbnRJdGVtLCBmcmFt ZUxvYWRUeXBlKTsKIAotICAgIG1fbmF2aWdhdGlvbnMuc2V0KG5hdmlnYXRpb24tPm5hdmlnYXRp b25JRCgpLCBuYXZpZ2F0aW9uLnB0cigpKTsKKyAgICBtX25hdmlnYXRpb25zLnNldChuYXZpZ2F0 aW9uLT5uYXZpZ2F0aW9uSUQoKSwgV1RGTW92ZShuYXZpZ2F0aW9uKSk7CiAKICAgICByZXR1cm4g bmF2aWdhdGlvbjsKIH0KQEAgLTYzLDcgKzYzLDcgQEAgUmVmPEFQSTo6TmF2aWdhdGlvbj4gV2Vi TmF2aWdhdGlvblN0YXRlOgogewogICAgIGF1dG8gbmF2aWdhdGlvbiA9IEFQSTo6TmF2aWdhdGlv bjo6Y3JlYXRlKCp0aGlzKTsKIAotICAgIG1fbmF2aWdhdGlvbnMuc2V0KG5hdmlnYXRpb24tPm5h dmlnYXRpb25JRCgpLCBuYXZpZ2F0aW9uLnB0cigpKTsKKyAgICBtX25hdmlnYXRpb25zLnNldChu YXZpZ2F0aW9uLT5uYXZpZ2F0aW9uSUQoKSwgV1RGTW92ZShuYXZpZ2F0aW9uKSk7CiAKICAgICBy ZXR1cm4gbmF2aWdhdGlvbjsKIH0KQEAgLTcyLDI1ICs3MiwyNSBAQCBSZWY8QVBJOjpOYXZpZ2F0 aW9uPiBXZWJOYXZpZ2F0aW9uU3RhdGU6CiB7CiAgICAgYXV0byBuYXZpZ2F0aW9uID0gQVBJOjpO YXZpZ2F0aW9uOjpjcmVhdGUoKnRoaXMpOwogCi0gICAgbV9uYXZpZ2F0aW9ucy5zZXQobmF2aWdh dGlvbi0+bmF2aWdhdGlvbklEKCksIG5hdmlnYXRpb24ucHRyKCkpOworICAgIG1fbmF2aWdhdGlv bnMuc2V0KG5hdmlnYXRpb24tPm5hdmlnYXRpb25JRCgpLCBXVEZNb3ZlKG5hdmlnYXRpb24pKTsK IAogICAgIHJldHVybiBuYXZpZ2F0aW9uOwogfQogCi1BUEk6Ok5hdmlnYXRpb24mIFdlYk5hdmln YXRpb25TdGF0ZTo6bmF2aWdhdGlvbih1aW50NjRfdCBuYXZpZ2F0aW9uSUQpCitBUEk6Ok5hdmln YXRpb24qIFdlYk5hdmlnYXRpb25TdGF0ZTo6bmF2aWdhdGlvbih1aW50NjRfdCBuYXZpZ2F0aW9u SUQpCiB7CiAgICAgQVNTRVJUKG5hdmlnYXRpb25JRCk7CiAgICAgQVNTRVJUKG1fbmF2aWdhdGlv bnMuY29udGFpbnMobmF2aWdhdGlvbklEKSk7CiAKLSAgICByZXR1cm4gKm1fbmF2aWdhdGlvbnMu Z2V0KG5hdmlnYXRpb25JRCk7CisgICAgcmV0dXJuIG1fbmF2aWdhdGlvbnMuZ2V0KG5hdmlnYXRp b25JRCk7CiB9CiAKLVJlZjxBUEk6Ok5hdmlnYXRpb24+IFdlYk5hdmlnYXRpb25TdGF0ZTo6dGFr ZU5hdmlnYXRpb24odWludDY0X3QgbmF2aWdhdGlvbklEKQorUmVmUHRyPEFQSTo6TmF2aWdhdGlv bj4gV2ViTmF2aWdhdGlvblN0YXRlOjp0YWtlTmF2aWdhdGlvbih1aW50NjRfdCBuYXZpZ2F0aW9u SUQpCiB7CiAgICAgQVNTRVJUKG5hdmlnYXRpb25JRCk7CiAgICAgQVNTRVJUKG1fbmF2aWdhdGlv bnMuY29udGFpbnMobmF2aWdhdGlvbklEKSk7CiAgICAgCi0gICAgcmV0dXJuIG1fbmF2aWdhdGlv bnMudGFrZShuYXZpZ2F0aW9uSUQpLnJlbGVhc2VOb25OdWxsKCk7CisgICAgcmV0dXJuIG1fbmF2 aWdhdGlvbnMudGFrZShuYXZpZ2F0aW9uSUQpOwogfQogCiB2b2lkIFdlYk5hdmlnYXRpb25TdGF0 ZTo6ZGlkRGVzdHJveU5hdmlnYXRpb24odWludDY0X3QgbmF2aWdhdGlvbklEKQpJbmRleDogU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViTmF2aWdhdGlvblN0YXRlLmgKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViTmF2aWdhdGlvblN0YXRlLmgJKHJldmlzaW9uIDIz NjE1MCkKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYk5hdmlnYXRpb25TdGF0ZS5oCSh3 b3JraW5nIGNvcHkpCkBAIC01Myw4ICs1Myw4IEBAIHB1YmxpYzoKICAgICBSZWY8QVBJOjpOYXZp Z2F0aW9uPiBjcmVhdGVSZWxvYWROYXZpZ2F0aW9uKCk7CiAgICAgUmVmPEFQSTo6TmF2aWdhdGlv bj4gY3JlYXRlTG9hZERhdGFOYXZpZ2F0aW9uKCk7CiAKLSAgICBBUEk6Ok5hdmlnYXRpb24mIG5h dmlnYXRpb24odWludDY0X3QgbmF2aWdhdGlvbklEKTsKLSAgICBSZWY8QVBJOjpOYXZpZ2F0aW9u PiB0YWtlTmF2aWdhdGlvbih1aW50NjRfdCBuYXZpZ2F0aW9uSUQpOworICAgIEFQSTo6TmF2aWdh dGlvbiogbmF2aWdhdGlvbih1aW50NjRfdCBuYXZpZ2F0aW9uSUQpOworICAgIFJlZlB0cjxBUEk6 Ok5hdmlnYXRpb24+IHRha2VOYXZpZ2F0aW9uKHVpbnQ2NF90IG5hdmlnYXRpb25JRCk7CiAgICAg dm9pZCBkaWREZXN0cm95TmF2aWdhdGlvbih1aW50NjRfdCBuYXZpZ2F0aW9uSUQpOwogICAgIHZv aWQgY2xlYXJBbGxOYXZpZ2F0aW9ucygpOwogCkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9XZWJQYWdlUHJveHkuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L1dlYlBhZ2VQcm94eS5jcHAJKHJldmlzaW9uIDIzNjE1NCkKKysrIFNvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM0NjAsNyArMzQ2MCw3 IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpkaWRTdGFydFByb3Zpc2lvbmFsTG8KICAgICAvLyBGSVhN RTogV2Ugc2hvdWxkIG1lc3NhZ2UgY2hlY2sgdGhhdCBuYXZpZ2F0aW9uSUQgaXMgbm90IHplcm8g aGVyZSwgYnV0IGl0J3MgY3VycmVudGx5IHplcm8gZm9yIHNvbWUgbmF2aWdhdGlvbnMgdGhyb3Vn aCB0aGUgcGFnZSBjYWNoZS4KICAgICBSZWZQdHI8QVBJOjpOYXZpZ2F0aW9uPiBuYXZpZ2F0aW9u OwogICAgIGlmIChmcmFtZS0+aXNNYWluRnJhbWUoKSAmJiBuYXZpZ2F0aW9uSUQpCi0gICAgICAg IG5hdmlnYXRpb24gPSAmbmF2aWdhdGlvblN0YXRlKCkubmF2aWdhdGlvbihuYXZpZ2F0aW9uSUQp OworICAgICAgICBuYXZpZ2F0aW9uID0gbmF2aWdhdGlvblN0YXRlKCkubmF2aWdhdGlvbihuYXZp Z2F0aW9uSUQpOwogCiAgICAgLy8gSWYgdGhpcyBzZWVtaW5nbHkgbmV3IGxvYWQgaXMgYWN0dWFs bHkgY29udGludWluZyBhIHNlcnZlciByZWRpcmVjdCBmb3IgYSBwcmV2aW91cyBuYXZpZ2F0aW9u IGluIGEgbmV3IHByb2Nlc3MsCiAgICAgLy8gdGhlbiB3ZSBpZ25vcmUgdGhpcyBub3RpZmljYXRp b24uCkBAIC0zNTA3LDcgKzM1MDcsNyBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkUmVjZWl2ZVNl cnZlclJlZGlyCiAgICAgLy8gRklYTUU6IFdlIHNob3VsZCBtZXNzYWdlIGNoZWNrIHRoYXQgbmF2 aWdhdGlvbklEIGlzIG5vdCB6ZXJvIGhlcmUsIGJ1dCBpdCdzIGN1cnJlbnRseSB6ZXJvIGZvciBz b21lIG5hdmlnYXRpb25zIHRocm91Z2ggdGhlIHBhZ2UgY2FjaGUuCiAgICAgUmVmUHRyPEFQSTo6 TmF2aWdhdGlvbj4gbmF2aWdhdGlvbjsKICAgICBpZiAobmF2aWdhdGlvbklEKSB7Ci0gICAgICAg IG5hdmlnYXRpb24gPSAmbmF2aWdhdGlvblN0YXRlKCkubmF2aWdhdGlvbihuYXZpZ2F0aW9uSUQp OworICAgICAgICBuYXZpZ2F0aW9uID0gbmF2aWdhdGlvblN0YXRlKCkubmF2aWdhdGlvbihuYXZp Z2F0aW9uSUQpOwogICAgICAgICBuYXZpZ2F0aW9uLT5hcHBlbmRSZWRpcmVjdGlvblVSTChyZXF1 ZXN0LnVybCgpKTsKICAgICB9CiAKQEAgLTM2MzQsNyArMzYzNCw3IEBAIHZvaWQgV2ViUGFnZVBy b3h5OjpkaWRDb21taXRMb2FkRm9yRnJhbWUKICAgICAvLyBGSVhNRTogV2Ugc2hvdWxkIG1lc3Nh Z2UgY2hlY2sgdGhhdCBuYXZpZ2F0aW9uSUQgaXMgbm90IHplcm8gaGVyZSwgYnV0IGl0J3MgY3Vy cmVudGx5IHplcm8gZm9yIHNvbWUgbmF2aWdhdGlvbnMgdGhyb3VnaCB0aGUgcGFnZSBjYWNoZS4K ICAgICBSZWZQdHI8QVBJOjpOYXZpZ2F0aW9uPiBuYXZpZ2F0aW9uOwogICAgIGlmIChmcmFtZS0+ aXNNYWluRnJhbWUoKSAmJiBuYXZpZ2F0aW9uSUQpCi0gICAgICAgIG5hdmlnYXRpb24gPSAmbmF2 aWdhdGlvblN0YXRlKCkubmF2aWdhdGlvbihuYXZpZ2F0aW9uSUQpOworICAgICAgICBuYXZpZ2F0 aW9uID0gbmF2aWdhdGlvblN0YXRlKCkubmF2aWdhdGlvbihuYXZpZ2F0aW9uSUQpOwogCiAgICAg bV9oYXNDb21taXR0ZWRBbnlQcm92aXNpb25hbExvYWRzID0gdHJ1ZTsKICAgICBtX3Byb2Nlc3Mt PmRpZENvbW1pdFByb3Zpc2lvbmFsTG9hZCgpOwpAQCAtMzcyNiw3ICszNzI2LDcgQEAgdm9pZCBX ZWJQYWdlUHJveHk6OmRpZEZpbmlzaERvY3VtZW50TG9hZAogICAgIC8vIEZJWE1FOiBXZSBzaG91 bGQgbWVzc2FnZSBjaGVjayB0aGF0IG5hdmlnYXRpb25JRCBpcyBub3QgemVybyBoZXJlLCBidXQg aXQncyBjdXJyZW50bHkgemVybyBmb3Igc29tZSBuYXZpZ2F0aW9ucyB0aHJvdWdoIHRoZSBwYWdl IGNhY2hlLgogICAgIFJlZlB0cjxBUEk6Ok5hdmlnYXRpb24+IG5hdmlnYXRpb247CiAgICAgaWYg KGZyYW1lLT5pc01haW5GcmFtZSgpICYmIG5hdmlnYXRpb25JRCkKLSAgICAgICAgbmF2aWdhdGlv biA9ICZuYXZpZ2F0aW9uU3RhdGUoKS5uYXZpZ2F0aW9uKG5hdmlnYXRpb25JRCk7CisgICAgICAg IG5hdmlnYXRpb24gPSBuYXZpZ2F0aW9uU3RhdGUoKS5uYXZpZ2F0aW9uKG5hdmlnYXRpb25JRCk7 CiAKICAgICBpZiAoZnJhbWUtPmlzTWFpbkZyYW1lKCkpCiAgICAgICAgIG1fbmF2aWdhdGlvbkNs aWVudC0+ZGlkRmluaXNoRG9jdW1lbnRMb2FkKCp0aGlzLCBuYXZpZ2F0aW9uLmdldCgpLCBtX3By b2Nlc3MtPnRyYW5zZm9ybUhhbmRsZXNUb09iamVjdHModXNlckRhdGEub2JqZWN0KCkpLmdldCgp KTsKQEAgLTM3NDQsNyArMzc0NCw3IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpkaWRGaW5pc2hMb2Fk Rm9yRnJhbWUKICAgICAvLyBGSVhNRTogV2Ugc2hvdWxkIG1lc3NhZ2UgY2hlY2sgdGhhdCBuYXZp Z2F0aW9uSUQgaXMgbm90IHplcm8gaGVyZSwgYnV0IGl0J3MgY3VycmVudGx5IHplcm8gZm9yIHNv bWUgbmF2aWdhdGlvbnMgdGhyb3VnaCB0aGUgcGFnZSBjYWNoZS4KICAgICBSZWZQdHI8QVBJOjpO YXZpZ2F0aW9uPiBuYXZpZ2F0aW9uOwogICAgIGlmIChmcmFtZS0+aXNNYWluRnJhbWUoKSAmJiBu YXZpZ2F0aW9uSUQpCi0gICAgICAgIG5hdmlnYXRpb24gPSAmbmF2aWdhdGlvblN0YXRlKCkubmF2 aWdhdGlvbihuYXZpZ2F0aW9uSUQpOworICAgICAgICBuYXZpZ2F0aW9uID0gbmF2aWdhdGlvblN0 YXRlKCkubmF2aWdhdGlvbihuYXZpZ2F0aW9uSUQpOwogCiAgICAgYXV0byB0cmFuc2FjdGlvbiA9 IG1fcGFnZUxvYWRTdGF0ZS50cmFuc2FjdGlvbigpOwogCkBAIC0zNzg3LDcgKzM3ODcsNyBAQCB2 b2lkIFdlYlBhZ2VQcm94eTo6ZGlkRmFpbExvYWRGb3JGcmFtZSh1CiAgICAgLy8gRklYTUU6IFdl IHNob3VsZCBtZXNzYWdlIGNoZWNrIHRoYXQgbmF2aWdhdGlvbklEIGlzIG5vdCB6ZXJvIGhlcmUs IGJ1dCBpdCdzIGN1cnJlbnRseSB6ZXJvIGZvciBzb21lIG5hdmlnYXRpb25zIHRocm91Z2ggdGhl IHBhZ2UgY2FjaGUuCiAgICAgUmVmUHRyPEFQSTo6TmF2aWdhdGlvbj4gbmF2aWdhdGlvbjsKICAg ICBpZiAoZnJhbWUtPmlzTWFpbkZyYW1lKCkgJiYgbmF2aWdhdGlvbklEKQotICAgICAgICBuYXZp Z2F0aW9uID0gJm5hdmlnYXRpb25TdGF0ZSgpLm5hdmlnYXRpb24obmF2aWdhdGlvbklEKTsKKyAg ICAgICAgbmF2aWdhdGlvbiA9IG5hdmlnYXRpb25TdGF0ZSgpLm5hdmlnYXRpb24obmF2aWdhdGlv bklEKTsKIAogICAgIGNsZWFyTG9hZERlcGVuZGVudENhbGxiYWNrcygpOwogCkBAIC0zODI4LDcg KzM4MjgsNyBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkU2FtZURvY3VtZW50TmF2aWdhCiAgICAg Ly8gRklYTUU6IFdlIHNob3VsZCBtZXNzYWdlIGNoZWNrIHRoYXQgbmF2aWdhdGlvbklEIGlzIG5v dCB6ZXJvIGhlcmUsIGJ1dCBpdCdzIGN1cnJlbnRseSB6ZXJvIGZvciBzb21lIG5hdmlnYXRpb25z IHRocm91Z2ggdGhlIHBhZ2UgY2FjaGUuCiAgICAgUmVmUHRyPEFQSTo6TmF2aWdhdGlvbj4gbmF2 aWdhdGlvbjsKICAgICBpZiAoZnJhbWUtPmlzTWFpbkZyYW1lKCkgJiYgbmF2aWdhdGlvbklEKQot ICAgICAgICBuYXZpZ2F0aW9uID0gJm5hdmlnYXRpb25TdGF0ZSgpLm5hdmlnYXRpb24obmF2aWdh dGlvbklEKTsKKyAgICAgICAgbmF2aWdhdGlvbiA9IG5hdmlnYXRpb25TdGF0ZSgpLm5hdmlnYXRp b24obmF2aWdhdGlvbklEKTsKIAogICAgIGF1dG8gdHJhbnNhY3Rpb24gPSBtX3BhZ2VMb2FkU3Rh dGUudHJhbnNhY3Rpb24oKTsKIApAQCAtNDAwMiw3ICs0MDAyLDcgQEAgdm9pZCBXZWJQYWdlUHJv eHk6OmRlY2lkZVBvbGljeUZvck5hdmlnYQogCiAgICAgUmVmUHRyPEFQSTo6TmF2aWdhdGlvbj4g bmF2aWdhdGlvbjsKICAgICBpZiAobmF2aWdhdGlvbklEKQotICAgICAgICBuYXZpZ2F0aW9uID0g bWFrZVJlZihtX25hdmlnYXRpb25TdGF0ZS0+bmF2aWdhdGlvbihuYXZpZ2F0aW9uSUQpKTsKKyAg ICAgICAgbmF2aWdhdGlvbiA9IG1fbmF2aWdhdGlvblN0YXRlLT5uYXZpZ2F0aW9uKG5hdmlnYXRp b25JRCk7CiAKICAgICBpZiAoYXV0byB0YXJnZXRCYWNrRm9yd2FyZEl0ZW1JZGVudGlmaWVyID0g bmF2aWdhdGlvbkFjdGlvbkRhdGEudGFyZ2V0QmFja0ZvcndhcmRJdGVtSWRlbnRpZmllcikgewog ICAgICAgICBpZiAoYXV0byogaXRlbSA9IG1fYmFja0ZvcndhcmRMaXN0LT5pdGVtRm9ySUQoKm5h dmlnYXRpb25BY3Rpb25EYXRhLnRhcmdldEJhY2tGb3J3YXJkSXRlbUlkZW50aWZpZXIpKSB7CkBA IC00MDM0LDcgKzQwMzQsNyBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZGVjaWRlUG9saWN5Rm9yTmF2 aWdhCiAKICNpZiBFTkFCTEUoQ09OVEVOVF9GSUxURVJJTkcpCiAgICAgaWYgKGZyYW1lLT5kaWRI YW5kbGVDb250ZW50RmlsdGVyVW5ibG9ja05hdmlnYXRpb24ocmVxdWVzdCkpCi0gICAgICAgIHJl dHVybiByZWNlaXZlZFBvbGljeURlY2lzaW9uKFBvbGljeUFjdGlvbjo6SWdub3JlLCAmbV9uYXZp Z2F0aW9uU3RhdGUtPm5hdmlnYXRpb24obmV3TmF2aWdhdGlvbklEKSwgc3RkOjpudWxsb3B0LCBX VEZNb3ZlKHNlbmRlcikpOworICAgICAgICByZXR1cm4gcmVjZWl2ZWRQb2xpY3lEZWNpc2lvbihQ b2xpY3lBY3Rpb246Oklnbm9yZSwgbV9uYXZpZ2F0aW9uU3RhdGUtPm5hdmlnYXRpb24obmV3TmF2 aWdhdGlvbklEKSwgc3RkOjpudWxsb3B0LCBXVEZNb3ZlKHNlbmRlcikpOwogI2Vsc2UKICAgICBV TlVTRURfUEFSQU0obmV3TmF2aWdhdGlvbklEKTsKICNlbmRpZgpAQCAtNDEyOCw3ICs0MTI4LDcg QEAgdm9pZCBXZWJQYWdlUHJveHk6OmRlY2lkZVBvbGljeUZvclJlc3BvbgogICAgIE1FU1NBR0Vf Q0hFQ0tfVVJMKHJlcXVlc3QudXJsKCkpOwogICAgIE1FU1NBR0VfQ0hFQ0tfVVJMKHJlc3BvbnNl LnVybCgpKTsKIAotICAgIFJlZlB0cjxBUEk6Ok5hdmlnYXRpb24+IG5hdmlnYXRpb24gPSBuYXZp Z2F0aW9uSUQgPyAmbV9uYXZpZ2F0aW9uU3RhdGUtPm5hdmlnYXRpb24obmF2aWdhdGlvbklEKSA6 IG51bGxwdHI7CisgICAgUmVmUHRyPEFQSTo6TmF2aWdhdGlvbj4gbmF2aWdhdGlvbiA9IG5hdmln YXRpb25JRCA/IG1fbmF2aWdhdGlvblN0YXRlLT5uYXZpZ2F0aW9uKG5hdmlnYXRpb25JRCkgOiBu dWxscHRyOwogICAgIGF1dG8gbGlzdGVuZXIgPSBtYWtlUmVmKGZyYW1lLT5zZXRVcFBvbGljeUxp c3RlbmVyUHJveHkoW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlzKSwgZnJhbWVJ RCwgbGlzdGVuZXJJRCwgbmF2aWdhdGlvbiA9IFdURk1vdmUobmF2aWdhdGlvbildIChXZWJDb3Jl OjpQb2xpY3lBY3Rpb24gcG9saWN5QWN0aW9uLCBBUEk6OldlYnNpdGVQb2xpY2llcyosIFByb2Nl c3NTd2FwUmVxdWVzdGVkQnlDbGllbnQgcHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCwgVmVj dG9yPFJlZjxTYWZlQnJvd3NpbmdSZXN1bHQ+PiYmIHNhZmVCcm93c2luZ1Jlc3VsdHMpIG11dGFi bGUgewogICAgICAgICAvLyBGSVhNRTogQXNzZXJ0IHRoZSBBUEk6OldlYnNpdGVQb2xpY2llcyog aXMgbnVsbHB0ciBoZXJlIG9uY2UgY2xpZW50cyBvZiBXS0ZyYW1lUG9saWN5TGlzdGVuZXJVc2VX aXRoUG9saWNpZXMgZ28gYXdheS4KICAgICAgICAgUkVMRUFTRV9BU1NFUlQocHJvY2Vzc1N3YXBS ZXF1ZXN0ZWRCeUNsaWVudCA9PSBQcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50OjpObyk7Cg==