187967 2018-07-24 12:06:12 -0700 Remove WebFramePolicyListenerProxy::changeWebsiteDataStore 2018-07-24 13:13:54 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen aestes berto cgarcia ews-watchlist gustavo mcatanzaro webkit-bug-importer oldest_to_newest 1444774 0 achristensen 2018-07-24 12:06:12 -0700 Remove WebFramePolicyListenerProxy::changeWebsiteDataStore 1444778 1 345700 achristensen 2018-07-24 12:12:13 -0700 Created attachment 345700 Patch 1444779 2 345701 achristensen 2018-07-24 12:23:33 -0700 Created attachment 345701 Patch 1444781 3 ews-watchlist 2018-07-24 12:25:26 -0700 Thanks for the patch. If this patch contains new public API please make sure it follows the guidelines for new WebKit2 GTK+ API. See http://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API 1444803 4 achristensen 2018-07-24 13:11:57 -0700 http://trac.webkit.org/r234168 1444804 5 webkit-bug-importer 2018-07-24 13:13:54 -0700 <rdar://problem/42553216> 345700 2018-07-24 12:12:13 -0700 2018-07-24 12:23:31 -0700 Patch bug-187967-20180724121213.patch text/plain 18472 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMzQxNjApCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQxIEBACisyMDE4LTA3LTI0ICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmVtb3ZlIFdlYkZy YW1lUG9saWN5TGlzdGVuZXJQcm94eTo6Y2hhbmdlV2Vic2l0ZURhdGFTdG9yZQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg3OTY3CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2UgbmVlZCB0byBjYWxsIFdl YkZyYW1lUHJveHk6OmNoYW5nZVdlYnNpdGVEYXRhU3RvcmUgaWYgdGhlIF9XS1dlYnNpdGVQb2xp Y2llcyBoYXMgYSBXS1dlYnNpdGVEYXRhU3RvcmUuCisgICAgICAgIFdlJ3JlIGRvaW5nIHRoYXQg aW4gYSB3ZWlyZCB3YXkgdGhhdCBpcyBub3QgaW4gdGhlIHJpZ2h0IGxheWVyLiAgSW5zaWRlIHRo ZSBjYWxsIHRvIFdlYkZyYW1lUG9saWN5TGlzdGVuZXJQcm94eTo6dXNlCisgICAgICAgIHdlIGNh biBpbmZvcm0gdGhlIGZyYW1lIGlmIHRoZXJlJ3MgYSBuZXcgV2Vic2l0ZURhdGFTdG9yZS4KKyAg ICAgICAgCisgICAgICAgIE5vIGNoYW5nZSBpbiBiZWhhdmlvciwgYXMgdmVyaWZpZWQgYnkgdGhl IFdlYktpdC5XZWJzaXRlUG9saWNpZXNEYXRhU3RvcmUgQVBJIHRlc3QuCisgICAgICAgIFRoaXMg aXMgYSBzdGVwIHRvd2FyZHMgdXNpbmcgbGFtYmRhcyBpbiBXZWJGcmFtZVBvbGljeUxpc3RlbmVy UHJveHkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0FQSU5hdmlnYXRpb25DbGllbnQuaDoK KyAgICAgICAgKEFQSTo6TmF2aWdhdGlvbkNsaWVudDo6ZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlv bkFjdGlvbik6CisgICAgICAgIChBUEk6Ok5hdmlnYXRpb25DbGllbnQ6OmRlY2lkZVBvbGljeUZv ck5hdmlnYXRpb25SZXNwb25zZSk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9BUElQb2xpY3lD bGllbnQuaDoKKyAgICAgICAgKEFQSTo6UG9saWN5Q2xpZW50OjpkZWNpZGVQb2xpY3lGb3JOYXZp Z2F0aW9uQWN0aW9uKToKKyAgICAgICAgKEFQSTo6UG9saWN5Q2xpZW50OjpkZWNpZGVQb2xpY3lG b3JOZXdXaW5kb3dBY3Rpb24pOgorICAgICAgICAoQVBJOjpQb2xpY3lDbGllbnQ6OmRlY2lkZVBv bGljeUZvclJlc3BvbnNlKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0MvV0tGcmFtZVBvbGlj eUxpc3RlbmVyLmNwcDoKKyAgICAgICAgKFdLRnJhbWVQb2xpY3lMaXN0ZW5lclVzZSk6CisgICAg ICAgIChXS0ZyYW1lUG9saWN5TGlzdGVuZXJVc2VJbk5ld1Byb2Nlc3MpOgorICAgICAgICAodXNl V2l0aFBvbGljaWVzKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0MvV0tQYWdlLmNwcDoKKyAg ICAgICAgKFdLUGFnZVNldFBhZ2VQb2xpY3lDbGllbnQpOgorICAgICAgICAoV0tQYWdlU2V0UGFn ZU5hdmlnYXRpb25DbGllbnQpOgorICAgICAgICAqIFVJUHJvY2Vzcy9Db2NvYS9OYXZpZ2F0aW9u U3RhdGUubW06CisgICAgICAgIChXZWJLaXQ6Ok5hdmlnYXRpb25TdGF0ZTo6TmF2aWdhdGlvbkNs aWVudDo6ZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbik6CisgICAgICAgIChXZWJLaXQ6 Ok5hdmlnYXRpb25TdGF0ZTo6TmF2aWdhdGlvbkNsaWVudDo6ZGVjaWRlUG9saWN5Rm9yTmF2aWdh dGlvblJlc3BvbnNlKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViRnJhbWVQb2xpY3lMaXN0ZW5l clByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViRnJhbWVQb2xpY3lMaXN0ZW5lclByb3h5 Ojp1c2UpOgorICAgICAgICAoV2ViS2l0OjpXZWJGcmFtZVBvbGljeUxpc3RlbmVyUHJveHk6OmNo YW5nZVdlYnNpdGVEYXRhU3RvcmUpOiBEZWxldGVkLgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJG cmFtZVBvbGljeUxpc3RlbmVyUHJveHkuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVBy b3h5LmNwcDoKKyAgICAgICAgKiBVSVByb2Nlc3MvbWFjL1BhZ2VDbGllbnRJbXBsTWFjLm1tOgor CiAyMDE4LTA3LTI0ICBKZWZmIE1pbGxlciAgPGplZmZtQGFwcGxlLmNvbT4KIAogICAgICAgICBX S1VJRGVsZWdhdGUgbmVlZHMgYW4gYWx0ZXJuYXRlIGRlY2lkZURhdGFiYXNlUXVvdGFGb3JTZWN1 cml0eU9yaWdpbiBtZXRob2QgdGhhdCBwcm92aWRlcyB0aGUgZGF0YWJhc2UgbmFtZSBhbmQgZGlz cGxheSBuYW1lCkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJGcmFtZVBvbGljeUxp c3RlbmVyUHJveHkuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dl YkZyYW1lUG9saWN5TGlzdGVuZXJQcm94eS5jcHAJKHJldmlzaW9uIDIzNDE1NCkKKysrIFNvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkZyYW1lUG9saWN5TGlzdGVuZXJQcm94eS5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTI3LDYgKzI3LDggQEAKICNpbmNsdWRlICJXZWJGcmFtZVBvbGljeUxpc3Rl bmVyUHJveHkuaCIKIAogI2luY2x1ZGUgIkFQSU5hdmlnYXRpb24uaCIKKyNpbmNsdWRlICJBUElX ZWJzaXRlRGF0YVN0b3JlLmgiCisjaW5jbHVkZSAiQVBJV2Vic2l0ZVBvbGljaWVzLmgiCiAjaW5j bHVkZSAiV2ViRnJhbWVQcm94eS5oIgogI2luY2x1ZGUgIldlYnNpdGVEYXRhU3RvcmUuaCIKICNp bmNsdWRlICJXZWJzaXRlUG9saWNpZXNEYXRhLmgiCkBAIC00OSwyMSArNTEsMjAgQEAgdm9pZCBX ZWJGcmFtZVBvbGljeUxpc3RlbmVyUHJveHk6OnJlY2VpdgogICAgIG1fZnJhbWUgPSBudWxscHRy OwogfQogCi12b2lkIFdlYkZyYW1lUG9saWN5TGlzdGVuZXJQcm94eTo6Y2hhbmdlV2Vic2l0ZURh dGFTdG9yZShXZWJzaXRlRGF0YVN0b3JlJiB3ZWJzaXRlRGF0YVN0b3JlKQotewotICAgIGlmICgh bV9mcmFtZSkKLSAgICAgICAgcmV0dXJuOwotICAgIAotICAgIG1fZnJhbWUtPmNoYW5nZVdlYnNp dGVEYXRhU3RvcmUod2Vic2l0ZURhdGFTdG9yZSk7Ci19Ci0KIHZvaWQgV2ViRnJhbWVQb2xpY3lM aXN0ZW5lclByb3h5OjpzZXROYXZpZ2F0aW9uKFJlZjxBUEk6Ok5hdmlnYXRpb24+JiYgbmF2aWdh dGlvbikKIHsKICAgICBtX25hdmlnYXRpb24gPSBXVEZNb3ZlKG5hdmlnYXRpb24pOwogfQogICAg IAotdm9pZCBXZWJGcmFtZVBvbGljeUxpc3RlbmVyUHJveHk6OnVzZShzdGQ6Om9wdGlvbmFsPFdl YnNpdGVQb2xpY2llc0RhdGE+JiYgZGF0YSwgU2hvdWxkUHJvY2Vzc1N3YXBJZlBvc3NpYmxlIHN3 YXApCit2b2lkIFdlYkZyYW1lUG9saWN5TGlzdGVuZXJQcm94eTo6dXNlKFJlZlB0cjxBUEk6Oldl YnNpdGVQb2xpY2llcz4mJiBwb2xpY2llcywgU2hvdWxkUHJvY2Vzc1N3YXBJZlBvc3NpYmxlIHN3 YXApCiB7CisgICAgc3RkOjpvcHRpb25hbDxXZWJzaXRlUG9saWNpZXNEYXRhPiBkYXRhOworICAg IGlmIChwb2xpY2llcykgeworICAgICAgICBkYXRhID0gcG9saWNpZXMtPmRhdGEoKTsKKyAgICAg ICAgaWYgKG1fZnJhbWUgJiYgcG9saWNpZXMtPndlYnNpdGVEYXRhU3RvcmUoKSkKKyAgICAgICAg ICAgIG1fZnJhbWUtPmNoYW5nZVdlYnNpdGVEYXRhU3RvcmUocG9saWNpZXMtPndlYnNpdGVEYXRh U3RvcmUoKS0+d2Vic2l0ZURhdGFTdG9yZSgpKTsKKyAgICB9CisKICAgICByZWNlaXZlZFBvbGlj eURlY2lzaW9uKFdlYkNvcmU6OlBvbGljeUFjdGlvbjo6VXNlLCBXVEZNb3ZlKGRhdGEpLCBzd2Fw KTsKIH0KIApJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViRnJhbWVQb2xpY3lMaXN0 ZW5lclByb3h5LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViRnJh bWVQb2xpY3lMaXN0ZW5lclByb3h5LmgJKHJldmlzaW9uIDIzNDE1NCkKKysrIFNvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL1dlYkZyYW1lUG9saWN5TGlzdGVuZXJQcm94eS5oCSh3b3JraW5nIGNvcHkp CkBAIC0zMyw2ICszMyw3IEBACiAKIG5hbWVzcGFjZSBBUEkgewogY2xhc3MgTmF2aWdhdGlvbjsK K2NsYXNzIFdlYnNpdGVQb2xpY2llczsKIH0KIAogbmFtZXNwYWNlIFdlYkNvcmUgewpAQCAtNDEs OCArNDIsOCBAQCBlbnVtIGNsYXNzIFBvbGljeUFjdGlvbjsKIAogbmFtZXNwYWNlIFdlYktpdCB7 CiAKLWNsYXNzIFdlYnNpdGVEYXRhU3RvcmU7CiBjbGFzcyBXZWJGcmFtZVByb3h5OworY2xhc3Mg V2Vic2l0ZURhdGFTdG9yZTsKIHN0cnVjdCBXZWJzaXRlUG9saWNpZXNEYXRhOwogCiBlbnVtIGNs YXNzIFBvbGljeUxpc3RlbmVyVHlwZSB7CkBAIC02MSw3ICs2Miw3IEBAIHB1YmxpYzoKICAgICAg ICAgcmV0dXJuIGFkb3B0UmVmKCpuZXcgV2ViRnJhbWVQb2xpY3lMaXN0ZW5lclByb3h5KGZyYW1l LCBsaXN0ZW5lcklELCBwb2xpY3lUeXBlKSk7CiAgICAgfQogCi0gICAgdm9pZCB1c2Uoc3RkOjpv cHRpb25hbDxXZWJzaXRlUG9saWNpZXNEYXRhPiYmLCBTaG91bGRQcm9jZXNzU3dhcElmUG9zc2li bGUgPSBTaG91bGRQcm9jZXNzU3dhcElmUG9zc2libGU6Ok5vKTsKKyAgICB2b2lkIHVzZShSZWZQ dHI8QVBJOjpXZWJzaXRlUG9saWNpZXM+JiYsIFNob3VsZFByb2Nlc3NTd2FwSWZQb3NzaWJsZSA9 IFNob3VsZFByb2Nlc3NTd2FwSWZQb3NzaWJsZTo6Tm8pOwogICAgIHZvaWQgZG93bmxvYWQoKTsK ICAgICB2b2lkIGlnbm9yZSgpOwogCkBAIC03MCw4ICs3MSw2IEBAIHB1YmxpYzoKICAgICB1aW50 NjRfdCBsaXN0ZW5lcklEKCkgY29uc3QgeyByZXR1cm4gbV9saXN0ZW5lcklEOyB9CiAgICAgCiAg ICAgdm9pZCBzZXROYXZpZ2F0aW9uKFJlZjxBUEk6Ok5hdmlnYXRpb24+JiYpOwotICAgIAotICAg IHZvaWQgY2hhbmdlV2Vic2l0ZURhdGFTdG9yZShXZWJzaXRlRGF0YVN0b3JlJik7CiAKIHByaXZh dGU6CiAgICAgV2ViRnJhbWVQb2xpY3lMaXN0ZW5lclByb3h5KFdlYkZyYW1lUHJveHkqLCB1aW50 NjRfdCBsaXN0ZW5lcklELCBQb2xpY3lMaXN0ZW5lclR5cGUpOwpJbmRleDogU291cmNlL1dlYktp dC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCShyZXZpc2lvbiAyMzQxNTQpCisrKyBTb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01MSw2 ICs1MSw3IEBACiAjaW5jbHVkZSAiQVBJU2VjdXJpdHlPcmlnaW4uaCIKICNpbmNsdWRlICJBUElV SUNsaWVudC5oIgogI2luY2x1ZGUgIkFQSVVSTFJlcXVlc3QuaCIKKyNpbmNsdWRlICJBUElXZWJz aXRlUG9saWNpZXMuaCIKICNpbmNsdWRlICJBdXRoZW50aWNhdGlvbkNoYWxsZW5nZVByb3h5Lmgi CiAjaW5jbHVkZSAiQXV0aGVudGljYXRpb25EZWNpc2lvbkxpc3RlbmVyLmgiCiAjaW5jbHVkZSAi RGF0YVJlZmVyZW5jZS5oIgpJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0FQSU5h dmlnYXRpb25DbGllbnQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9B UEkvQVBJTmF2aWdhdGlvbkNsaWVudC5oCShyZXZpc2lvbiAyMzQxNTQpCisrKyBTb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9BUEkvQVBJTmF2aWdhdGlvbkNsaWVudC5oCSh3b3JraW5nIGNvcHkpCkBA IC0xMDQsMTIgKzEwNCwxMiBAQCBwdWJsaWM6CiAKICAgICB2aXJ0dWFsIHZvaWQgZGVjaWRlUG9s aWN5Rm9yTmF2aWdhdGlvbkFjdGlvbihXZWJLaXQ6OldlYlBhZ2VQcm94eSYsIFJlZjxOYXZpZ2F0 aW9uQWN0aW9uPiYmLCBSZWY8V2ViS2l0OjpXZWJGcmFtZVBvbGljeUxpc3RlbmVyUHJveHk+JiYg bGlzdGVuZXIsIE9iamVjdCopCiAgICAgewotICAgICAgICBsaXN0ZW5lci0+dXNlKHN0ZDo6bnVs bG9wdCk7CisgICAgICAgIGxpc3RlbmVyLT51c2UobnVsbHB0cik7CiAgICAgfQogCiAgICAgdmly dHVhbCB2b2lkIGRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25SZXNwb25zZShXZWJLaXQ6OldlYlBh Z2VQcm94eSYsIFJlZjxOYXZpZ2F0aW9uUmVzcG9uc2U+JiYsIFJlZjxXZWJLaXQ6OldlYkZyYW1l UG9saWN5TGlzdGVuZXJQcm94eT4mJiBsaXN0ZW5lciwgT2JqZWN0KikKICAgICB7Ci0gICAgICAg IGxpc3RlbmVyLT51c2Uoc3RkOjpudWxsb3B0KTsKKyAgICAgICAgbGlzdGVuZXItPnVzZShudWxs cHRyKTsKICAgICB9CiAgICAgCiAgICAgdmlydHVhbCB2b2lkIGNvbnRlbnRSdWxlTGlzdE5vdGlm aWNhdGlvbihXZWJLaXQ6OldlYlBhZ2VQcm94eSYsIFdlYkNvcmU6OlVSTCYmLCBWZWN0b3I8V1RG OjpTdHJpbmc+JiYsIFZlY3RvcjxXVEY6OlN0cmluZz4mJikgeyB9OwpJbmRleDogU291cmNlL1dl YktpdC9VSVByb2Nlc3MvQVBJL0FQSVBvbGljeUNsaWVudC5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9BUElQb2xpY3lDbGllbnQuaAkocmV2aXNpb24gMjM0MTU0 KQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0FQSVBvbGljeUNsaWVudC5oCSh3b3Jr aW5nIGNvcHkpCkBAIC01MiwxNSArNTIsMTUgQEAgcHVibGljOgogCiAgICAgdmlydHVhbCB2b2lk IGRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb24oV2ViS2l0OjpXZWJQYWdlUHJveHkmLCBX ZWJLaXQ6OldlYkZyYW1lUHJveHkqLCBjb25zdCBXZWJLaXQ6Ok5hdmlnYXRpb25BY3Rpb25EYXRh JiwgV2ViS2l0OjpXZWJGcmFtZVByb3h5KiwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0 JiwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiwgUmVmPFdlYktpdDo6V2ViRnJhbWVQ b2xpY3lMaXN0ZW5lclByb3h5PiYmIGxpc3RlbmVyLCBBUEk6Ok9iamVjdCopCiAgICAgewotICAg ICAgICBsaXN0ZW5lci0+dXNlKHN0ZDo6bnVsbG9wdCk7CisgICAgICAgIGxpc3RlbmVyLT51c2Uo bnVsbHB0cik7CiAgICAgfQogICAgIHZpcnR1YWwgdm9pZCBkZWNpZGVQb2xpY3lGb3JOZXdXaW5k b3dBY3Rpb24oV2ViS2l0OjpXZWJQYWdlUHJveHkmLCBXZWJLaXQ6OldlYkZyYW1lUHJveHkmLCBj b25zdCBXZWJLaXQ6Ok5hdmlnYXRpb25BY3Rpb25EYXRhJiwgY29uc3QgV2ViQ29yZTo6UmVzb3Vy Y2VSZXF1ZXN0JiwgY29uc3QgV1RGOjpTdHJpbmcmLCBSZWY8V2ViS2l0OjpXZWJGcmFtZVBvbGlj eUxpc3RlbmVyUHJveHk+JiYgbGlzdGVuZXIsIEFQSTo6T2JqZWN0KikKICAgICB7Ci0gICAgICAg IGxpc3RlbmVyLT51c2Uoc3RkOjpudWxsb3B0KTsKKyAgICAgICAgbGlzdGVuZXItPnVzZShudWxs cHRyKTsKICAgICB9CiAgICAgdmlydHVhbCB2b2lkIGRlY2lkZVBvbGljeUZvclJlc3BvbnNlKFdl YktpdDo6V2ViUGFnZVByb3h5JiwgV2ViS2l0OjpXZWJGcmFtZVByb3h5JiwgY29uc3QgV2ViQ29y ZTo6UmVzb3VyY2VSZXNwb25zZSYsIGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYsIGJv b2wsIFJlZjxXZWJLaXQ6OldlYkZyYW1lUG9saWN5TGlzdGVuZXJQcm94eT4mJiBsaXN0ZW5lciwg QVBJOjpPYmplY3QqKQogICAgIHsKLSAgICAgICAgbGlzdGVuZXItPnVzZShzdGQ6Om51bGxvcHQp OworICAgICAgICBsaXN0ZW5lci0+dXNlKG51bGxwdHIpOwogICAgIH0KICAgICB2aXJ0dWFsIHZv aWQgdW5hYmxlVG9JbXBsZW1lbnRQb2xpY3koV2ViS2l0OjpXZWJQYWdlUHJveHkmLCBXZWJLaXQ6 OldlYkZyYW1lUHJveHkmLCBjb25zdCBXZWJDb3JlOjpSZXNvdXJjZUVycm9yJiwgQVBJOjpPYmpl Y3QqKSB7IH0KIH07CkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQy9XS0ZyYW1l UG9saWN5TGlzdGVuZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L0FQSS9DL1dLRnJhbWVQb2xpY3lMaXN0ZW5lci5jcHAJKHJldmlzaW9uIDIzNDE1NCkKKysrIFNv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9DL1dLRnJhbWVQb2xpY3lMaXN0ZW5lci5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTQzLDI2ICs0MywyMiBAQCBXS1R5cGVJRCBXS0ZyYW1lUG9saWN5TGlz dGVuZXJHZXRUeXBlSUQoCiAKIHZvaWQgV0tGcmFtZVBvbGljeUxpc3RlbmVyVXNlKFdLRnJhbWVQ b2xpY3lMaXN0ZW5lclJlZiBwb2xpY3lMaXN0ZW5lclJlZikKIHsKLSAgICB0b0ltcGwocG9saWN5 TGlzdGVuZXJSZWYpLT51c2Uoc3RkOjpudWxsb3B0KTsKKyAgICB0b0ltcGwocG9saWN5TGlzdGVu ZXJSZWYpLT51c2UobnVsbHB0cik7CiB9CiAKIHZvaWQgV0tGcmFtZVBvbGljeUxpc3RlbmVyVXNl SW5OZXdQcm9jZXNzKFdLRnJhbWVQb2xpY3lMaXN0ZW5lclJlZiBwb2xpY3lMaXN0ZW5lclJlZikK IHsKLSAgICB0b0ltcGwocG9saWN5TGlzdGVuZXJSZWYpLT51c2Uoc3RkOjpudWxsb3B0LCBTaG91 bGRQcm9jZXNzU3dhcElmUG9zc2libGU6Olllcyk7CisgICAgdG9JbXBsKHBvbGljeUxpc3RlbmVy UmVmKS0+dXNlKG51bGxwdHIsIFNob3VsZFByb2Nlc3NTd2FwSWZQb3NzaWJsZTo6WWVzKTsKIH0K IAogc3RhdGljIHZvaWQgdXNlV2l0aFBvbGljaWVzKFdLRnJhbWVQb2xpY3lMaXN0ZW5lclJlZiBw b2xpY3lMaXN0ZW5lclJlZiwgV0tXZWJzaXRlUG9saWNpZXNSZWYgd2Vic2l0ZVBvbGljaWVzLCBT aG91bGRQcm9jZXNzU3dhcElmUG9zc2libGUgc2hvdWxkUHJvY2Vzc1N3YXBJZlBvc3NpYmxlKQog ewotICAgIGF1dG8gZGF0YSA9IHRvSW1wbCh3ZWJzaXRlUG9saWNpZXMpLT5kYXRhKCk7Ci0KLSAg ICBpZiAoZGF0YS53ZWJzaXRlRGF0YVN0b3JlUGFyYW1ldGVycykgewotICAgICAgICBhdXRvJiBz ZXNzaW9uSUQgPSBkYXRhLndlYnNpdGVEYXRhU3RvcmVQYXJhbWV0ZXJzLT5uZXR3b3JrU2Vzc2lv blBhcmFtZXRlcnMuc2Vzc2lvbklEOworICAgIGlmIChhdXRvKiB3ZWJzaXRlRGF0YVN0b3JlID0g dG9JbXBsKHdlYnNpdGVQb2xpY2llcyktPndlYnNpdGVEYXRhU3RvcmUoKSkgeworICAgICAgICBh dXRvIHNlc3Npb25JRCA9IHdlYnNpdGVEYXRhU3RvcmUtPndlYnNpdGVEYXRhU3RvcmUoKS5zZXNz aW9uSUQoKTsKICAgICAgICAgUkVMRUFTRV9BU1NFUlRfV0lUSF9NRVNTQUdFKHNlc3Npb25JRC5p c0VwaGVtZXJhbCgpIHx8IHNlc3Npb25JRCA9PSBQQUw6OlNlc3Npb25JRDo6ZGVmYXVsdFNlc3Np b25JRCgpLCAiSWYgV2Vic2l0ZVBvbGljaWVzIHNwZWNpZmllcyBhIFdlYnNpdGVEYXRhU3RvcmUs IHRoZSBkYXRhIHN0b3JlJ3Mgc2Vzc2lvbiBtdXN0IGJlIGRlZmF1bHQgb3Igbm9uLXBlcnNpc3Rl bnQuIik7Ci0KLSAgICAgICAgdG9JbXBsKHBvbGljeUxpc3RlbmVyUmVmKS0+Y2hhbmdlV2Vic2l0 ZURhdGFTdG9yZSh0b0ltcGwod2Vic2l0ZVBvbGljaWVzKS0+d2Vic2l0ZURhdGFTdG9yZSgpLT53 ZWJzaXRlRGF0YVN0b3JlKCkpOwogICAgIH0KIAotICAgIHRvSW1wbChwb2xpY3lMaXN0ZW5lclJl ZiktPnVzZShXVEZNb3ZlKGRhdGEpLCBzaG91bGRQcm9jZXNzU3dhcElmUG9zc2libGUpOworICAg IHRvSW1wbChwb2xpY3lMaXN0ZW5lclJlZiktPnVzZSh0b0ltcGwod2Vic2l0ZVBvbGljaWVzKSwg c2hvdWxkUHJvY2Vzc1N3YXBJZlBvc3NpYmxlKTsKIH0KIAogdm9pZCBXS0ZyYW1lUG9saWN5TGlz dGVuZXJVc2VXaXRoUG9saWNpZXMoV0tGcmFtZVBvbGljeUxpc3RlbmVyUmVmIHBvbGljeUxpc3Rl bmVyUmVmLCBXS1dlYnNpdGVQb2xpY2llc1JlZiB3ZWJzaXRlUG9saWNpZXMpCkluZGV4OiBTb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQy9XS1BhZ2UuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5jcHAJKHJldmlzaW9uIDIzNDE1NCkKKysr IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTEzNTYsNyArMTM1Niw3IEBAIHZvaWQgV0tQYWdlU2V0UGFnZVBvbGljeUNsaWVudChXS1Bh Z2VSZWYKICAgICAgICAgdm9pZCBkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uKFdlYlBh Z2VQcm94eSYgcGFnZSwgV2ViRnJhbWVQcm94eSogZnJhbWUsIGNvbnN0IE5hdmlnYXRpb25BY3Rp b25EYXRhJiBuYXZpZ2F0aW9uQWN0aW9uRGF0YSwgV2ViRnJhbWVQcm94eSogb3JpZ2luYXRpbmdG cmFtZSwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiBvcmlnaW5hbFJlc291cmNlUmVx dWVzdCwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiByZXNvdXJjZVJlcXVlc3QsIFJl ZjxXZWJGcmFtZVBvbGljeUxpc3RlbmVyUHJveHk+JiYgbGlzdGVuZXIsIEFQSTo6T2JqZWN0KiB1 c2VyRGF0YSkgb3ZlcnJpZGUKICAgICAgICAgewogICAgICAgICAgICAgaWYgKCFtX2NsaWVudC5k ZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uX2RlcHJlY2F0ZWRGb3JVc2VXaXRoVjAgJiYg IW1fY2xpZW50LmRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb25fZGVwcmVjYXRlZEZvclVz ZVdpdGhWMSAmJiAhbV9jbGllbnQuZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbikgewot ICAgICAgICAgICAgICAgIGxpc3RlbmVyLT51c2Uoc3RkOjpudWxsb3B0KTsKKyAgICAgICAgICAg ICAgICBsaXN0ZW5lci0+dXNlKG51bGxwdHIpOwogICAgICAgICAgICAgICAgIHJldHVybjsKICAg ICAgICAgICAgIH0KIApAQCAtMTM3NCw3ICsxMzc0LDcgQEAgdm9pZCBXS1BhZ2VTZXRQYWdlUG9s aWN5Q2xpZW50KFdLUGFnZVJlZgogICAgICAgICB2b2lkIGRlY2lkZVBvbGljeUZvck5ld1dpbmRv d0FjdGlvbihXZWJQYWdlUHJveHkmIHBhZ2UsIFdlYkZyYW1lUHJveHkmIGZyYW1lLCBjb25zdCBO YXZpZ2F0aW9uQWN0aW9uRGF0YSYgbmF2aWdhdGlvbkFjdGlvbkRhdGEsIGNvbnN0IFJlc291cmNl UmVxdWVzdCYgcmVzb3VyY2VSZXF1ZXN0LCBjb25zdCBTdHJpbmcmIGZyYW1lTmFtZSwgUmVmPFdl YkZyYW1lUG9saWN5TGlzdGVuZXJQcm94eT4mJiBsaXN0ZW5lciwgQVBJOjpPYmplY3QqIHVzZXJE YXRhKSBvdmVycmlkZQogICAgICAgICB7CiAgICAgICAgICAgICBpZiAoIW1fY2xpZW50LmRlY2lk ZVBvbGljeUZvck5ld1dpbmRvd0FjdGlvbikgewotICAgICAgICAgICAgICAgIGxpc3RlbmVyLT51 c2Uoc3RkOjpudWxsb3B0KTsKKyAgICAgICAgICAgICAgICBsaXN0ZW5lci0+dXNlKG51bGxwdHIp OwogICAgICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgICAgIH0KIApAQCAtMTM4Niw3ICsx Mzg2LDcgQEAgdm9pZCBXS1BhZ2VTZXRQYWdlUG9saWN5Q2xpZW50KFdLUGFnZVJlZgogICAgICAg ICB2b2lkIGRlY2lkZVBvbGljeUZvclJlc3BvbnNlKFdlYlBhZ2VQcm94eSYgcGFnZSwgV2ViRnJh bWVQcm94eSYgZnJhbWUsIGNvbnN0IFJlc291cmNlUmVzcG9uc2UmIHJlc291cmNlUmVzcG9uc2Us IGNvbnN0IFJlc291cmNlUmVxdWVzdCYgcmVzb3VyY2VSZXF1ZXN0LCBib29sIGNhblNob3dNSU1F VHlwZSwgUmVmPFdlYkZyYW1lUG9saWN5TGlzdGVuZXJQcm94eT4mJiBsaXN0ZW5lciwgQVBJOjpP YmplY3QqIHVzZXJEYXRhKSBvdmVycmlkZQogICAgICAgICB7CiAgICAgICAgICAgICBpZiAoIW1f Y2xpZW50LmRlY2lkZVBvbGljeUZvclJlc3BvbnNlX2RlcHJlY2F0ZWRGb3JVc2VXaXRoVjAgJiYg IW1fY2xpZW50LmRlY2lkZVBvbGljeUZvclJlc3BvbnNlKSB7Ci0gICAgICAgICAgICAgICAgbGlz dGVuZXItPnVzZShzdGQ6Om51bGxvcHQpOworICAgICAgICAgICAgICAgIGxpc3RlbmVyLT51c2Uo bnVsbHB0cik7CiAgICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAgICAgfQogCkBAIC0y MjAzLDcgKzIyMDMsNyBAQCB2b2lkIFdLUGFnZVNldFBhZ2VOYXZpZ2F0aW9uQ2xpZW50KFdLUGFn CiAgICAgICAgIHZvaWQgZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbihXZWJQYWdlUHJv eHkmIHBhZ2UsIFJlZjxBUEk6Ok5hdmlnYXRpb25BY3Rpb24+JiYgbmF2aWdhdGlvbkFjdGlvbiwg UmVmPFdlYktpdDo6V2ViRnJhbWVQb2xpY3lMaXN0ZW5lclByb3h5PiYmIGxpc3RlbmVyLCBBUEk6 Ok9iamVjdCogdXNlckRhdGEpIGZpbmFsCiAgICAgICAgIHsKICAgICAgICAgICAgIGlmICghbV9j bGllbnQuZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbikgewotICAgICAgICAgICAgICAg IGxpc3RlbmVyLT51c2Uoc3RkOjpudWxsb3B0KTsKKyAgICAgICAgICAgICAgICBsaXN0ZW5lci0+ dXNlKG51bGxwdHIpOwogICAgICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgICAgIH0KICAg ICAgICAgICAgIG1fY2xpZW50LmRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb24odG9BUEko JnBhZ2UpLCB0b0FQSShuYXZpZ2F0aW9uQWN0aW9uLnB0cigpKSwgdG9BUEkobGlzdGVuZXIucHRy KCkpLCB0b0FQSSh1c2VyRGF0YSksIG1fY2xpZW50LmJhc2UuY2xpZW50SW5mbyk7CkBAIC0yMjEy LDcgKzIyMTIsNyBAQCB2b2lkIFdLUGFnZVNldFBhZ2VOYXZpZ2F0aW9uQ2xpZW50KFdLUGFnCiAg ICAgICAgIHZvaWQgZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvblJlc3BvbnNlKFdlYlBhZ2VQcm94 eSYgcGFnZSwgUmVmPEFQSTo6TmF2aWdhdGlvblJlc3BvbnNlPiYmIG5hdmlnYXRpb25SZXNwb25z ZSwgUmVmPFdlYktpdDo6V2ViRnJhbWVQb2xpY3lMaXN0ZW5lclByb3h5PiYmIGxpc3RlbmVyLCBB UEk6Ok9iamVjdCogdXNlckRhdGEpIG92ZXJyaWRlCiAgICAgICAgIHsKICAgICAgICAgICAgIGlm ICghbV9jbGllbnQuZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvblJlc3BvbnNlKSB7Ci0gICAgICAg ICAgICAgICAgbGlzdGVuZXItPnVzZShzdGQ6Om51bGxvcHQpOworICAgICAgICAgICAgICAgIGxp c3RlbmVyLT51c2UobnVsbHB0cik7CiAgICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAg ICAgfQogICAgICAgICAgICAgbV9jbGllbnQuZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvblJlc3Bv bnNlKHRvQVBJKCZwYWdlKSwgdG9BUEkobmF2aWdhdGlvblJlc3BvbnNlLnB0cigpKSwgdG9BUEko bGlzdGVuZXIucHRyKCkpLCB0b0FQSSh1c2VyRGF0YSksIG1fY2xpZW50LmJhc2UuY2xpZW50SW5m byk7CkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9OYXZpZ2F0aW9uU3RhdGUu bW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvTmF2aWdhdGlv blN0YXRlLm1tCShyZXZpc2lvbiAyMzQxNTQpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9D b2NvYS9OYXZpZ2F0aW9uU3RhdGUubW0JKHdvcmtpbmcgY29weSkKQEAgLTQ5MSw3ICs0OTEsNyBA QCB2b2lkIE5hdmlnYXRpb25TdGF0ZTo6TmF2aWdhdGlvbkNsaWVudDo6CiAgICAgICAgICAgICB9 CiAKICAgICAgICAgICAgIGlmICghbmF2aWdhdGlvbkFjdGlvbi0+dGFyZ2V0RnJhbWUoKSkgewot ICAgICAgICAgICAgICAgIGxpc3RlbmVyLT51c2Uoc3RkOjpudWxsb3B0KTsKKyAgICAgICAgICAg ICAgICBsaXN0ZW5lci0+dXNlKG51bGxwdHIpOwogICAgICAgICAgICAgICAgIHJldHVybjsKICAg ICAgICAgICAgIH0KIApAQCAtNTAwLDcgKzUwMCw3IEBAIHZvaWQgTmF2aWdhdGlvblN0YXRlOjpO YXZpZ2F0aW9uQ2xpZW50OjoKICAgICAgICAgICAgICAgICBpZiAobmF2aWdhdGlvbkFjdGlvbi0+ c2hvdWxkUGVyZm9ybURvd25sb2FkKCkpCiAgICAgICAgICAgICAgICAgICAgIGxpc3RlbmVyLT5k b3dubG9hZCgpOwogICAgICAgICAgICAgICAgIGVsc2UKLSAgICAgICAgICAgICAgICAgICAgbGlz dGVuZXItPnVzZShzdGQ6Om51bGxvcHQpOworICAgICAgICAgICAgICAgICAgICBsaXN0ZW5lci0+ dXNlKG51bGxwdHIpOwogICAgICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgICAgIH0KIApA QCAtNTI5LDE3ICs1MjksMTQgQEAgdm9pZCBOYXZpZ2F0aW9uU3RhdGU6Ok5hdmlnYXRpb25DbGll bnQ6OgogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICBjaGVja2VyLT5kaWRDYWxsQ29tcGxl dGlvbkhhbmRsZXIoKTsKIAotICAgICAgICBzdGQ6Om9wdGlvbmFsPFdlYnNpdGVQb2xpY2llc0Rh dGE+IGRhdGE7Ci0gICAgICAgIGlmICh3ZWJzaXRlUG9saWNpZXMpIHsKLSAgICAgICAgICAgIGRh dGEgPSB3ZWJzaXRlUG9saWNpZXMtPl93ZWJzaXRlUG9saWNpZXMtPmRhdGEoKTsKLSAgICAgICAg ICAgIGlmIChkYXRhLT53ZWJzaXRlRGF0YVN0b3JlUGFyYW1ldGVycykgewotICAgICAgICAgICAg ICAgIGF1dG8mIHNlc3Npb25JRCA9IGRhdGEtPndlYnNpdGVEYXRhU3RvcmVQYXJhbWV0ZXJzLT5u ZXR3b3JrU2Vzc2lvblBhcmFtZXRlcnMuc2Vzc2lvbklEOworICAgICAgICBSZWZQdHI8QVBJOjpX ZWJzaXRlUG9saWNpZXM+IGFwaVdlYnNpdGVQb2xpY2llcyA9IHdlYnNpdGVQb2xpY2llcyA/IHdl YnNpdGVQb2xpY2llcy0+X3dlYnNpdGVQb2xpY2llcy5nZXQoKSA6IG51bGxwdHI7CisgICAgICAg IGlmIChhcGlXZWJzaXRlUG9saWNpZXMpIHsKKyAgICAgICAgICAgIGlmIChhdXRvKiB3ZWJzaXRl RGF0YVN0b3JlID0gYXBpV2Vic2l0ZVBvbGljaWVzLT53ZWJzaXRlRGF0YVN0b3JlKCkpIHsKKyAg ICAgICAgICAgICAgICBhdXRvIHNlc3Npb25JRCA9IHdlYnNpdGVEYXRhU3RvcmUtPndlYnNpdGVE YXRhU3RvcmUoKS5zZXNzaW9uSUQoKTsKICAgICAgICAgICAgICAgICBpZiAoIXNlc3Npb25JRC5p c0VwaGVtZXJhbCgpICYmIHNlc3Npb25JRCAhPSBQQUw6OlNlc3Npb25JRDo6ZGVmYXVsdFNlc3Np b25JRCgpKQogICAgICAgICAgICAgICAgICAgICBbTlNFeGNlcHRpb24gcmFpc2U6TlNJbnZhbGlk QXJndW1lbnRFeGNlcHRpb24gZm9ybWF0OkAiX1dLV2Vic2l0ZVBvbGljaWVzLndlYnNpdGVEYXRh U3RvcmUgbXVzdCBiZSBuaWwsIGRlZmF1bHQsIG9yIG5vbi1wZXJzaXN0ZW50LiJdOwogICAgICAg ICAgICAgICAgIGlmIChzdWJmcmFtZU5hdmlnYXRpb24pCiAgICAgICAgICAgICAgICAgICAgIFtO U0V4Y2VwdGlvbiByYWlzZTpOU0ludmFsaWRBcmd1bWVudEV4Y2VwdGlvbiBmb3JtYXQ6QCJfV0tX ZWJzaXRlUG9saWNpZXMud2Vic2l0ZURhdGFTdG9yZSBtdXN0IGJlIG5pbCBmb3Igc3ViZnJhbWUg bmF2aWdhdGlvbnMuIl07Ci0KLSAgICAgICAgICAgICAgICB3ZWJQYWdlUHJveHktPmNoYW5nZVdl YnNpdGVEYXRhU3RvcmUod2Vic2l0ZVBvbGljaWVzLT5fd2Vic2l0ZVBvbGljaWVzLT53ZWJzaXRl RGF0YVN0b3JlKCktPndlYnNpdGVEYXRhU3RvcmUoKSk7CiAgICAgICAgICAgICB9CiAgICAgICAg IH0KIApAQCAtNTUwLDEzICs1NDcsMTMgQEAgdm9pZCBOYXZpZ2F0aW9uU3RhdGU6Ok5hdmlnYXRp b25DbGllbnQ6OgogI3ByYWdtYSBjbGFuZyBkaWFnbm9zdGljIGlnbm9yZWQgIi1Xc3dpdGNoIgog ICAgICAgICBjYXNlIF9XS05hdmlnYXRpb25BY3Rpb25Qb2xpY3lBbGxvd0luTmV3UHJvY2VzczoK ICNwcmFnbWEgY2xhbmcgZGlhZ25vc3RpYyBwb3AKLSAgICAgICAgICAgIHRyeUFwcExpbmsoV1RG TW92ZShuYXZpZ2F0aW9uQWN0aW9uKSwgbWFpbkZyYW1lVVJMU3RyaW5nLCBbYWN0aW9uUG9saWN5 LCBsb2NhbExpc3RlbmVyID0gV1RGTW92ZShsb2NhbExpc3RlbmVyKSwgZGF0YSA9IFdURk1vdmUo ZGF0YSldKGJvb2wgZm9sbG93ZWRMaW5rVG9BcHApIG11dGFibGUgeworICAgICAgICAgICAgdHJ5 QXBwTGluayhXVEZNb3ZlKG5hdmlnYXRpb25BY3Rpb24pLCBtYWluRnJhbWVVUkxTdHJpbmcsIFth Y3Rpb25Qb2xpY3ksIGxvY2FsTGlzdGVuZXIgPSBXVEZNb3ZlKGxvY2FsTGlzdGVuZXIpLCB3ZWJz aXRlUG9saWNpZXMgPSBXVEZNb3ZlKGFwaVdlYnNpdGVQb2xpY2llcyldKGJvb2wgZm9sbG93ZWRM aW5rVG9BcHApIG11dGFibGUgewogICAgICAgICAgICAgICAgIGlmIChmb2xsb3dlZExpbmtUb0Fw cCkgewogICAgICAgICAgICAgICAgICAgICBsb2NhbExpc3RlbmVyLT5pZ25vcmUoKTsKICAgICAg ICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAgICAgICAgIH0KIAotICAgICAgICAgICAg ICAgIGxvY2FsTGlzdGVuZXItPnVzZShXVEZNb3ZlKGRhdGEpLCBhY3Rpb25Qb2xpY3kgPT0gX1dL TmF2aWdhdGlvbkFjdGlvblBvbGljeUFsbG93SW5OZXdQcm9jZXNzID8gU2hvdWxkUHJvY2Vzc1N3 YXBJZlBvc3NpYmxlOjpZZXMgOiBTaG91bGRQcm9jZXNzU3dhcElmUG9zc2libGU6Ok5vKTsKKyAg ICAgICAgICAgICAgICBsb2NhbExpc3RlbmVyLT51c2UoV1RGTW92ZSh3ZWJzaXRlUG9saWNpZXMp LCBhY3Rpb25Qb2xpY3kgPT0gX1dLTmF2aWdhdGlvbkFjdGlvblBvbGljeUFsbG93SW5OZXdQcm9j ZXNzID8gU2hvdWxkUHJvY2Vzc1N3YXBJZlBvc3NpYmxlOjpZZXMgOiBTaG91bGRQcm9jZXNzU3dh cElmUG9zc2libGU6Ok5vKTsKICAgICAgICAgICAgIH0pOwogICAgICAgICAKICAgICAgICAgICAg IGJyZWFrOwpAQCAtNTczLDcgKzU3MCw3IEBAIHZvaWQgTmF2aWdhdGlvblN0YXRlOjpOYXZpZ2F0 aW9uQ2xpZW50OjoKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICBjYXNlIF9XS05hdmlnYXRp b25BY3Rpb25Qb2xpY3lBbGxvd1dpdGhvdXRUcnlpbmdBcHBMaW5rOgogI3ByYWdtYSBjbGFuZyBk aWFnbm9zdGljIHBvcAotICAgICAgICAgICAgbG9jYWxMaXN0ZW5lci0+dXNlKFdURk1vdmUoZGF0 YSkpOworICAgICAgICAgICAgbG9jYWxMaXN0ZW5lci0+dXNlKFdURk1vdmUoYXBpV2Vic2l0ZVBv bGljaWVzKSk7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQogICAgIH07CkBAIC02MjMs MTQgKzYyMCwxNCBAQCB2b2lkIE5hdmlnYXRpb25TdGF0ZTo6TmF2aWdhdGlvbkNsaWVudDo6CiAg ICAgICAgICAgICBCT09MIGV4aXN0cyA9IFtbTlNGaWxlTWFuYWdlciBkZWZhdWx0TWFuYWdlcl0g ZmlsZUV4aXN0c0F0UGF0aDp1cmwucGF0aCBpc0RpcmVjdG9yeTomaXNEaXJlY3RvcnldOwogCiAg ICAgICAgICAgICBpZiAoZXhpc3RzICYmICFpc0RpcmVjdG9yeSAmJiBuYXZpZ2F0aW9uUmVzcG9u c2UtPmNhblNob3dNSU1FVHlwZSgpKQotICAgICAgICAgICAgICAgIGxpc3RlbmVyLT51c2Uoc3Rk OjpudWxsb3B0KTsKKyAgICAgICAgICAgICAgICBsaXN0ZW5lci0+dXNlKG51bGxwdHIpOwogICAg ICAgICAgICAgZWxzZQogICAgICAgICAgICAgICAgIGxpc3RlbmVyLT5pZ25vcmUoKTsKICAgICAg ICAgICAgIHJldHVybjsKICAgICAgICAgfQogCiAgICAgICAgIGlmIChuYXZpZ2F0aW9uUmVzcG9u c2UtPmNhblNob3dNSU1FVHlwZSgpKQotICAgICAgICAgICAgbGlzdGVuZXItPnVzZShzdGQ6Om51 bGxvcHQpOworICAgICAgICAgICAgbGlzdGVuZXItPnVzZShudWxscHRyKTsKICAgICAgICAgZWxz ZQogICAgICAgICAgICAgbGlzdGVuZXItPmlnbm9yZSgpOwogICAgICAgICByZXR1cm47CkBAIC02 NTAsNyArNjQ3LDcgQEAgdm9pZCBOYXZpZ2F0aW9uU3RhdGU6Ok5hdmlnYXRpb25DbGllbnQ6Ogog CiAgICAgICAgIHN3aXRjaCAocmVzcG9uc2VQb2xpY3kpIHsKICAgICAgICAgY2FzZSBXS05hdmln YXRpb25SZXNwb25zZVBvbGljeUFsbG93OgotICAgICAgICAgICAgbG9jYWxMaXN0ZW5lci0+dXNl KHN0ZDo6bnVsbG9wdCk7CisgICAgICAgICAgICBsb2NhbExpc3RlbmVyLT51c2UobnVsbHB0cik7 CiAgICAgICAgICAgICBicmVhazsKIAogICAgICAgICBjYXNlIFdLTmF2aWdhdGlvblJlc3BvbnNl UG9saWN5Q2FuY2VsOgpJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvbWFjL1BhZ2VDbGll bnRJbXBsTWFjLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL21hYy9Q YWdlQ2xpZW50SW1wbE1hYy5tbQkocmV2aXNpb24gMjM0MTU0KQorKysgU291cmNlL1dlYktpdC9V SVByb2Nlc3MvbWFjL1BhZ2VDbGllbnRJbXBsTWFjLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0yOSw2 ICsyOSw3IEBACiAjaWYgUExBVEZPUk0oTUFDKQogCiAjaW1wb3J0ICJBUElIaXRUZXN0UmVzdWx0 LmgiCisjaW1wb3J0ICJBUElXZWJzaXRlUG9saWNpZXMuaCIKICNpbXBvcnQgIkNvbG9yU3BhY2VE YXRhLmgiCiAjaW1wb3J0ICJEYXRhUmVmZXJlbmNlLmgiCiAjaW1wb3J0ICJEb3dubG9hZFByb3h5 LmgiCg== 345701 2018-07-24 12:23:33 -0700 2018-07-24 12:57:10 -0700 Patch bug-187967-20180724122332.patch text/plain 17913 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMzQxNjApCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQxIEBACisyMDE4LTA3LTI0ICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmVtb3ZlIFdlYkZy YW1lUG9saWN5TGlzdGVuZXJQcm94eTo6Y2hhbmdlV2Vic2l0ZURhdGFTdG9yZQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg3OTY3CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2UgbmVlZCB0byBjYWxsIFdl YkZyYW1lUHJveHk6OmNoYW5nZVdlYnNpdGVEYXRhU3RvcmUgaWYgdGhlIF9XS1dlYnNpdGVQb2xp Y2llcyBoYXMgYSBXS1dlYnNpdGVEYXRhU3RvcmUuCisgICAgICAgIFdlJ3JlIGRvaW5nIHRoYXQg aW4gYSB3ZWlyZCB3YXkgdGhhdCBpcyBub3QgaW4gdGhlIHJpZ2h0IGxheWVyLiAgSW5zaWRlIHRo ZSBjYWxsIHRvIFdlYkZyYW1lUG9saWN5TGlzdGVuZXJQcm94eTo6dXNlCisgICAgICAgIHdlIGNh biBpbmZvcm0gdGhlIGZyYW1lIGlmIHRoZXJlJ3MgYSBuZXcgV2Vic2l0ZURhdGFTdG9yZS4KKyAg ICAgICAgCisgICAgICAgIE5vIGNoYW5nZSBpbiBiZWhhdmlvciwgYXMgdmVyaWZpZWQgYnkgdGhl IFdlYktpdC5XZWJzaXRlUG9saWNpZXNEYXRhU3RvcmUgQVBJIHRlc3QuCisgICAgICAgIFRoaXMg aXMgYSBzdGVwIHRvd2FyZHMgdXNpbmcgbGFtYmRhcyBpbiBXZWJGcmFtZVBvbGljeUxpc3RlbmVy UHJveHkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0FQSU5hdmlnYXRpb25DbGllbnQuaDoK KyAgICAgICAgKEFQSTo6TmF2aWdhdGlvbkNsaWVudDo6ZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlv bkFjdGlvbik6CisgICAgICAgIChBUEk6Ok5hdmlnYXRpb25DbGllbnQ6OmRlY2lkZVBvbGljeUZv ck5hdmlnYXRpb25SZXNwb25zZSk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9BUElQb2xpY3lD bGllbnQuaDoKKyAgICAgICAgKEFQSTo6UG9saWN5Q2xpZW50OjpkZWNpZGVQb2xpY3lGb3JOYXZp Z2F0aW9uQWN0aW9uKToKKyAgICAgICAgKEFQSTo6UG9saWN5Q2xpZW50OjpkZWNpZGVQb2xpY3lG b3JOZXdXaW5kb3dBY3Rpb24pOgorICAgICAgICAoQVBJOjpQb2xpY3lDbGllbnQ6OmRlY2lkZVBv bGljeUZvclJlc3BvbnNlKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0MvV0tGcmFtZVBvbGlj eUxpc3RlbmVyLmNwcDoKKyAgICAgICAgKFdLRnJhbWVQb2xpY3lMaXN0ZW5lclVzZSk6CisgICAg ICAgIChXS0ZyYW1lUG9saWN5TGlzdGVuZXJVc2VJbk5ld1Byb2Nlc3MpOgorICAgICAgICAodXNl V2l0aFBvbGljaWVzKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0MvV0tQYWdlLmNwcDoKKyAg ICAgICAgKFdLUGFnZVNldFBhZ2VQb2xpY3lDbGllbnQpOgorICAgICAgICAoV0tQYWdlU2V0UGFn ZU5hdmlnYXRpb25DbGllbnQpOgorICAgICAgICAqIFVJUHJvY2Vzcy9Db2NvYS9OYXZpZ2F0aW9u U3RhdGUubW06CisgICAgICAgIChXZWJLaXQ6Ok5hdmlnYXRpb25TdGF0ZTo6TmF2aWdhdGlvbkNs aWVudDo6ZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbik6CisgICAgICAgIChXZWJLaXQ6 Ok5hdmlnYXRpb25TdGF0ZTo6TmF2aWdhdGlvbkNsaWVudDo6ZGVjaWRlUG9saWN5Rm9yTmF2aWdh dGlvblJlc3BvbnNlKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViRnJhbWVQb2xpY3lMaXN0ZW5l clByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViRnJhbWVQb2xpY3lMaXN0ZW5lclByb3h5 Ojp1c2UpOgorICAgICAgICAoV2ViS2l0OjpXZWJGcmFtZVBvbGljeUxpc3RlbmVyUHJveHk6OmNo YW5nZVdlYnNpdGVEYXRhU3RvcmUpOiBEZWxldGVkLgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJG cmFtZVBvbGljeUxpc3RlbmVyUHJveHkuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVBy b3h5LmNwcDoKKyAgICAgICAgKiBVSVByb2Nlc3MvbWFjL1BhZ2VDbGllbnRJbXBsTWFjLm1tOgor CiAyMDE4LTA3LTI0ICBKZWZmIE1pbGxlciAgPGplZmZtQGFwcGxlLmNvbT4KIAogICAgICAgICBX S1VJRGVsZWdhdGUgbmVlZHMgYW4gYWx0ZXJuYXRlIGRlY2lkZURhdGFiYXNlUXVvdGFGb3JTZWN1 cml0eU9yaWdpbiBtZXRob2QgdGhhdCBwcm92aWRlcyB0aGUgZGF0YWJhc2UgbmFtZSBhbmQgZGlz cGxheSBuYW1lCkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJGcmFtZVBvbGljeUxp c3RlbmVyUHJveHkuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dl YkZyYW1lUG9saWN5TGlzdGVuZXJQcm94eS5jcHAJKHJldmlzaW9uIDIzNDE1NCkKKysrIFNvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkZyYW1lUG9saWN5TGlzdGVuZXJQcm94eS5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTI3LDYgKzI3LDggQEAKICNpbmNsdWRlICJXZWJGcmFtZVBvbGljeUxpc3Rl bmVyUHJveHkuaCIKIAogI2luY2x1ZGUgIkFQSU5hdmlnYXRpb24uaCIKKyNpbmNsdWRlICJBUElX ZWJzaXRlRGF0YVN0b3JlLmgiCisjaW5jbHVkZSAiQVBJV2Vic2l0ZVBvbGljaWVzLmgiCiAjaW5j bHVkZSAiV2ViRnJhbWVQcm94eS5oIgogI2luY2x1ZGUgIldlYnNpdGVEYXRhU3RvcmUuaCIKICNp bmNsdWRlICJXZWJzaXRlUG9saWNpZXNEYXRhLmgiCkBAIC00OSwyMSArNTEsMjAgQEAgdm9pZCBX ZWJGcmFtZVBvbGljeUxpc3RlbmVyUHJveHk6OnJlY2VpdgogICAgIG1fZnJhbWUgPSBudWxscHRy OwogfQogCi12b2lkIFdlYkZyYW1lUG9saWN5TGlzdGVuZXJQcm94eTo6Y2hhbmdlV2Vic2l0ZURh dGFTdG9yZShXZWJzaXRlRGF0YVN0b3JlJiB3ZWJzaXRlRGF0YVN0b3JlKQotewotICAgIGlmICgh bV9mcmFtZSkKLSAgICAgICAgcmV0dXJuOwotICAgIAotICAgIG1fZnJhbWUtPmNoYW5nZVdlYnNp dGVEYXRhU3RvcmUod2Vic2l0ZURhdGFTdG9yZSk7Ci19Ci0KIHZvaWQgV2ViRnJhbWVQb2xpY3lM aXN0ZW5lclByb3h5OjpzZXROYXZpZ2F0aW9uKFJlZjxBUEk6Ok5hdmlnYXRpb24+JiYgbmF2aWdh dGlvbikKIHsKICAgICBtX25hdmlnYXRpb24gPSBXVEZNb3ZlKG5hdmlnYXRpb24pOwogfQogICAg IAotdm9pZCBXZWJGcmFtZVBvbGljeUxpc3RlbmVyUHJveHk6OnVzZShzdGQ6Om9wdGlvbmFsPFdl YnNpdGVQb2xpY2llc0RhdGE+JiYgZGF0YSwgU2hvdWxkUHJvY2Vzc1N3YXBJZlBvc3NpYmxlIHN3 YXApCit2b2lkIFdlYkZyYW1lUG9saWN5TGlzdGVuZXJQcm94eTo6dXNlKEFQSTo6V2Vic2l0ZVBv bGljaWVzKiBwb2xpY2llcywgU2hvdWxkUHJvY2Vzc1N3YXBJZlBvc3NpYmxlIHN3YXApCiB7Cisg ICAgc3RkOjpvcHRpb25hbDxXZWJzaXRlUG9saWNpZXNEYXRhPiBkYXRhOworICAgIGlmIChwb2xp Y2llcykgeworICAgICAgICBkYXRhID0gcG9saWNpZXMtPmRhdGEoKTsKKyAgICAgICAgaWYgKG1f ZnJhbWUgJiYgcG9saWNpZXMtPndlYnNpdGVEYXRhU3RvcmUoKSkKKyAgICAgICAgICAgIG1fZnJh bWUtPmNoYW5nZVdlYnNpdGVEYXRhU3RvcmUocG9saWNpZXMtPndlYnNpdGVEYXRhU3RvcmUoKS0+ d2Vic2l0ZURhdGFTdG9yZSgpKTsKKyAgICB9CisKICAgICByZWNlaXZlZFBvbGljeURlY2lzaW9u KFdlYkNvcmU6OlBvbGljeUFjdGlvbjo6VXNlLCBXVEZNb3ZlKGRhdGEpLCBzd2FwKTsKIH0KIApJ bmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViRnJhbWVQb2xpY3lMaXN0ZW5lclByb3h5 LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViRnJhbWVQb2xpY3lM aXN0ZW5lclByb3h5LmgJKHJldmlzaW9uIDIzNDE1NCkKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL1dlYkZyYW1lUG9saWN5TGlzdGVuZXJQcm94eS5oCSh3b3JraW5nIGNvcHkpCkBAIC0zMyw2 ICszMyw3IEBACiAKIG5hbWVzcGFjZSBBUEkgewogY2xhc3MgTmF2aWdhdGlvbjsKK2NsYXNzIFdl YnNpdGVQb2xpY2llczsKIH0KIAogbmFtZXNwYWNlIFdlYkNvcmUgewpAQCAtNDEsOCArNDIsOCBA QCBlbnVtIGNsYXNzIFBvbGljeUFjdGlvbjsKIAogbmFtZXNwYWNlIFdlYktpdCB7CiAKLWNsYXNz IFdlYnNpdGVEYXRhU3RvcmU7CiBjbGFzcyBXZWJGcmFtZVByb3h5OworY2xhc3MgV2Vic2l0ZURh dGFTdG9yZTsKIHN0cnVjdCBXZWJzaXRlUG9saWNpZXNEYXRhOwogCiBlbnVtIGNsYXNzIFBvbGlj eUxpc3RlbmVyVHlwZSB7CkBAIC02MSw3ICs2Miw3IEBAIHB1YmxpYzoKICAgICAgICAgcmV0dXJu IGFkb3B0UmVmKCpuZXcgV2ViRnJhbWVQb2xpY3lMaXN0ZW5lclByb3h5KGZyYW1lLCBsaXN0ZW5l cklELCBwb2xpY3lUeXBlKSk7CiAgICAgfQogCi0gICAgdm9pZCB1c2Uoc3RkOjpvcHRpb25hbDxX ZWJzaXRlUG9saWNpZXNEYXRhPiYmLCBTaG91bGRQcm9jZXNzU3dhcElmUG9zc2libGUgPSBTaG91 bGRQcm9jZXNzU3dhcElmUG9zc2libGU6Ok5vKTsKKyAgICB2b2lkIHVzZShBUEk6OldlYnNpdGVQ b2xpY2llcyogPSBudWxscHRyLCBTaG91bGRQcm9jZXNzU3dhcElmUG9zc2libGUgPSBTaG91bGRQ cm9jZXNzU3dhcElmUG9zc2libGU6Ok5vKTsKICAgICB2b2lkIGRvd25sb2FkKCk7CiAgICAgdm9p ZCBpZ25vcmUoKTsKIApAQCAtNzAsOCArNzEsNiBAQCBwdWJsaWM6CiAgICAgdWludDY0X3QgbGlz dGVuZXJJRCgpIGNvbnN0IHsgcmV0dXJuIG1fbGlzdGVuZXJJRDsgfQogICAgIAogICAgIHZvaWQg c2V0TmF2aWdhdGlvbihSZWY8QVBJOjpOYXZpZ2F0aW9uPiYmKTsKLSAgICAKLSAgICB2b2lkIGNo YW5nZVdlYnNpdGVEYXRhU3RvcmUoV2Vic2l0ZURhdGFTdG9yZSYpOwogCiBwcml2YXRlOgogICAg IFdlYkZyYW1lUG9saWN5TGlzdGVuZXJQcm94eShXZWJGcmFtZVByb3h5KiwgdWludDY0X3QgbGlz dGVuZXJJRCwgUG9saWN5TGlzdGVuZXJUeXBlKTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL0FQSS9BUElOYXZpZ2F0aW9uQ2xpZW50LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktp dC9VSVByb2Nlc3MvQVBJL0FQSU5hdmlnYXRpb25DbGllbnQuaAkocmV2aXNpb24gMjM0MTU0KQor KysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0FQSU5hdmlnYXRpb25DbGllbnQuaAkod29y a2luZyBjb3B5KQpAQCAtMTA0LDEyICsxMDQsMTIgQEAgcHVibGljOgogCiAgICAgdmlydHVhbCB2 b2lkIGRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb24oV2ViS2l0OjpXZWJQYWdlUHJveHkm LCBSZWY8TmF2aWdhdGlvbkFjdGlvbj4mJiwgUmVmPFdlYktpdDo6V2ViRnJhbWVQb2xpY3lMaXN0 ZW5lclByb3h5PiYmIGxpc3RlbmVyLCBPYmplY3QqKQogICAgIHsKLSAgICAgICAgbGlzdGVuZXIt PnVzZShzdGQ6Om51bGxvcHQpOworICAgICAgICBsaXN0ZW5lci0+dXNlKCk7CiAgICAgfQogCiAg ICAgdmlydHVhbCB2b2lkIGRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25SZXNwb25zZShXZWJLaXQ6 OldlYlBhZ2VQcm94eSYsIFJlZjxOYXZpZ2F0aW9uUmVzcG9uc2U+JiYsIFJlZjxXZWJLaXQ6Oldl YkZyYW1lUG9saWN5TGlzdGVuZXJQcm94eT4mJiBsaXN0ZW5lciwgT2JqZWN0KikKICAgICB7Ci0g ICAgICAgIGxpc3RlbmVyLT51c2Uoc3RkOjpudWxsb3B0KTsKKyAgICAgICAgbGlzdGVuZXItPnVz ZSgpOwogICAgIH0KICAgICAKICAgICB2aXJ0dWFsIHZvaWQgY29udGVudFJ1bGVMaXN0Tm90aWZp Y2F0aW9uKFdlYktpdDo6V2ViUGFnZVByb3h5JiwgV2ViQ29yZTo6VVJMJiYsIFZlY3RvcjxXVEY6 OlN0cmluZz4mJiwgVmVjdG9yPFdURjo6U3RyaW5nPiYmKSB7IH07CkluZGV4OiBTb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9BUEkvQVBJUG9saWN5Q2xpZW50LmgKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYktpdC9VSVByb2Nlc3MvQVBJL0FQSVBvbGljeUNsaWVudC5oCShyZXZpc2lvbiAyMzQxNTQp CisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQVBJUG9saWN5Q2xpZW50LmgJKHdvcmtp bmcgY29weSkKQEAgLTUyLDE1ICs1MiwxNSBAQCBwdWJsaWM6CiAKICAgICB2aXJ0dWFsIHZvaWQg ZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbihXZWJLaXQ6OldlYlBhZ2VQcm94eSYsIFdl YktpdDo6V2ViRnJhbWVQcm94eSosIGNvbnN0IFdlYktpdDo6TmF2aWdhdGlvbkFjdGlvbkRhdGEm LCBXZWJLaXQ6OldlYkZyYW1lUHJveHkqLCBjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3Qm LCBjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmLCBSZWY8V2ViS2l0OjpXZWJGcmFtZVBv bGljeUxpc3RlbmVyUHJveHk+JiYgbGlzdGVuZXIsIEFQSTo6T2JqZWN0KikKICAgICB7Ci0gICAg ICAgIGxpc3RlbmVyLT51c2Uoc3RkOjpudWxsb3B0KTsKKyAgICAgICAgbGlzdGVuZXItPnVzZSgp OwogICAgIH0KICAgICB2aXJ0dWFsIHZvaWQgZGVjaWRlUG9saWN5Rm9yTmV3V2luZG93QWN0aW9u KFdlYktpdDo6V2ViUGFnZVByb3h5JiwgV2ViS2l0OjpXZWJGcmFtZVByb3h5JiwgY29uc3QgV2Vi S2l0OjpOYXZpZ2F0aW9uQWN0aW9uRGF0YSYsIGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVxdWVz dCYsIGNvbnN0IFdURjo6U3RyaW5nJiwgUmVmPFdlYktpdDo6V2ViRnJhbWVQb2xpY3lMaXN0ZW5l clByb3h5PiYmIGxpc3RlbmVyLCBBUEk6Ok9iamVjdCopCiAgICAgewotICAgICAgICBsaXN0ZW5l ci0+dXNlKHN0ZDo6bnVsbG9wdCk7CisgICAgICAgIGxpc3RlbmVyLT51c2UoKTsKICAgICB9CiAg ICAgdmlydHVhbCB2b2lkIGRlY2lkZVBvbGljeUZvclJlc3BvbnNlKFdlYktpdDo6V2ViUGFnZVBy b3h5JiwgV2ViS2l0OjpXZWJGcmFtZVByb3h5JiwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXNw b25zZSYsIGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYsIGJvb2wsIFJlZjxXZWJLaXQ6 OldlYkZyYW1lUG9saWN5TGlzdGVuZXJQcm94eT4mJiBsaXN0ZW5lciwgQVBJOjpPYmplY3QqKQog ICAgIHsKLSAgICAgICAgbGlzdGVuZXItPnVzZShzdGQ6Om51bGxvcHQpOworICAgICAgICBsaXN0 ZW5lci0+dXNlKCk7CiAgICAgfQogICAgIHZpcnR1YWwgdm9pZCB1bmFibGVUb0ltcGxlbWVudFBv bGljeShXZWJLaXQ6OldlYlBhZ2VQcm94eSYsIFdlYktpdDo6V2ViRnJhbWVQcm94eSYsIGNvbnN0 IFdlYkNvcmU6OlJlc291cmNlRXJyb3ImLCBBUEk6Ok9iamVjdCopIHsgfQogfTsKSW5kZXg6IFNv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9DL1dLRnJhbWVQb2xpY3lMaXN0ZW5lci5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0MvV0tGcmFtZVBvbGljeUxp c3RlbmVyLmNwcAkocmV2aXNpb24gMjM0MTU0KQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv QVBJL0MvV0tGcmFtZVBvbGljeUxpc3RlbmVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDMsMjYg KzQzLDIyIEBAIFdLVHlwZUlEIFdLRnJhbWVQb2xpY3lMaXN0ZW5lckdldFR5cGVJRCgKIAogdm9p ZCBXS0ZyYW1lUG9saWN5TGlzdGVuZXJVc2UoV0tGcmFtZVBvbGljeUxpc3RlbmVyUmVmIHBvbGlj eUxpc3RlbmVyUmVmKQogewotICAgIHRvSW1wbChwb2xpY3lMaXN0ZW5lclJlZiktPnVzZShzdGQ6 Om51bGxvcHQpOworICAgIHRvSW1wbChwb2xpY3lMaXN0ZW5lclJlZiktPnVzZSgpOwogfQogCiB2 b2lkIFdLRnJhbWVQb2xpY3lMaXN0ZW5lclVzZUluTmV3UHJvY2VzcyhXS0ZyYW1lUG9saWN5TGlz dGVuZXJSZWYgcG9saWN5TGlzdGVuZXJSZWYpCiB7Ci0gICAgdG9JbXBsKHBvbGljeUxpc3RlbmVy UmVmKS0+dXNlKHN0ZDo6bnVsbG9wdCwgU2hvdWxkUHJvY2Vzc1N3YXBJZlBvc3NpYmxlOjpZZXMp OworICAgIHRvSW1wbChwb2xpY3lMaXN0ZW5lclJlZiktPnVzZShudWxscHRyLCBTaG91bGRQcm9j ZXNzU3dhcElmUG9zc2libGU6Olllcyk7CiB9CiAKIHN0YXRpYyB2b2lkIHVzZVdpdGhQb2xpY2ll cyhXS0ZyYW1lUG9saWN5TGlzdGVuZXJSZWYgcG9saWN5TGlzdGVuZXJSZWYsIFdLV2Vic2l0ZVBv bGljaWVzUmVmIHdlYnNpdGVQb2xpY2llcywgU2hvdWxkUHJvY2Vzc1N3YXBJZlBvc3NpYmxlIHNo b3VsZFByb2Nlc3NTd2FwSWZQb3NzaWJsZSkKIHsKLSAgICBhdXRvIGRhdGEgPSB0b0ltcGwod2Vi c2l0ZVBvbGljaWVzKS0+ZGF0YSgpOwotCi0gICAgaWYgKGRhdGEud2Vic2l0ZURhdGFTdG9yZVBh cmFtZXRlcnMpIHsKLSAgICAgICAgYXV0byYgc2Vzc2lvbklEID0gZGF0YS53ZWJzaXRlRGF0YVN0 b3JlUGFyYW1ldGVycy0+bmV0d29ya1Nlc3Npb25QYXJhbWV0ZXJzLnNlc3Npb25JRDsKKyAgICBp ZiAoYXV0byogd2Vic2l0ZURhdGFTdG9yZSA9IHRvSW1wbCh3ZWJzaXRlUG9saWNpZXMpLT53ZWJz aXRlRGF0YVN0b3JlKCkpIHsKKyAgICAgICAgYXV0byBzZXNzaW9uSUQgPSB3ZWJzaXRlRGF0YVN0 b3JlLT53ZWJzaXRlRGF0YVN0b3JlKCkuc2Vzc2lvbklEKCk7CiAgICAgICAgIFJFTEVBU0VfQVNT RVJUX1dJVEhfTUVTU0FHRShzZXNzaW9uSUQuaXNFcGhlbWVyYWwoKSB8fCBzZXNzaW9uSUQgPT0g UEFMOjpTZXNzaW9uSUQ6OmRlZmF1bHRTZXNzaW9uSUQoKSwgIklmIFdlYnNpdGVQb2xpY2llcyBz cGVjaWZpZXMgYSBXZWJzaXRlRGF0YVN0b3JlLCB0aGUgZGF0YSBzdG9yZSdzIHNlc3Npb24gbXVz dCBiZSBkZWZhdWx0IG9yIG5vbi1wZXJzaXN0ZW50LiIpOwotCi0gICAgICAgIHRvSW1wbChwb2xp Y3lMaXN0ZW5lclJlZiktPmNoYW5nZVdlYnNpdGVEYXRhU3RvcmUodG9JbXBsKHdlYnNpdGVQb2xp Y2llcyktPndlYnNpdGVEYXRhU3RvcmUoKS0+d2Vic2l0ZURhdGFTdG9yZSgpKTsKICAgICB9CiAK LSAgICB0b0ltcGwocG9saWN5TGlzdGVuZXJSZWYpLT51c2UoV1RGTW92ZShkYXRhKSwgc2hvdWxk UHJvY2Vzc1N3YXBJZlBvc3NpYmxlKTsKKyAgICB0b0ltcGwocG9saWN5TGlzdGVuZXJSZWYpLT51 c2UodG9JbXBsKHdlYnNpdGVQb2xpY2llcyksIHNob3VsZFByb2Nlc3NTd2FwSWZQb3NzaWJsZSk7 CiB9CiAKIHZvaWQgV0tGcmFtZVBvbGljeUxpc3RlbmVyVXNlV2l0aFBvbGljaWVzKFdLRnJhbWVQ b2xpY3lMaXN0ZW5lclJlZiBwb2xpY3lMaXN0ZW5lclJlZiwgV0tXZWJzaXRlUG9saWNpZXNSZWYg d2Vic2l0ZVBvbGljaWVzKQpJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0MvV0tQ YWdlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQy9XS1Bh Z2UuY3BwCShyZXZpc2lvbiAyMzQxNTQpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkv Qy9XS1BhZ2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMzU2LDcgKzEzNTYsNyBAQCB2b2lkIFdL UGFnZVNldFBhZ2VQb2xpY3lDbGllbnQoV0tQYWdlUmVmCiAgICAgICAgIHZvaWQgZGVjaWRlUG9s aWN5Rm9yTmF2aWdhdGlvbkFjdGlvbihXZWJQYWdlUHJveHkmIHBhZ2UsIFdlYkZyYW1lUHJveHkq IGZyYW1lLCBjb25zdCBOYXZpZ2F0aW9uQWN0aW9uRGF0YSYgbmF2aWdhdGlvbkFjdGlvbkRhdGEs IFdlYkZyYW1lUHJveHkqIG9yaWdpbmF0aW5nRnJhbWUsIGNvbnN0IFdlYkNvcmU6OlJlc291cmNl UmVxdWVzdCYgb3JpZ2luYWxSZXNvdXJjZVJlcXVlc3QsIGNvbnN0IFdlYkNvcmU6OlJlc291cmNl UmVxdWVzdCYgcmVzb3VyY2VSZXF1ZXN0LCBSZWY8V2ViRnJhbWVQb2xpY3lMaXN0ZW5lclByb3h5 PiYmIGxpc3RlbmVyLCBBUEk6Ok9iamVjdCogdXNlckRhdGEpIG92ZXJyaWRlCiAgICAgICAgIHsK ICAgICAgICAgICAgIGlmICghbV9jbGllbnQuZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlv bl9kZXByZWNhdGVkRm9yVXNlV2l0aFYwICYmICFtX2NsaWVudC5kZWNpZGVQb2xpY3lGb3JOYXZp Z2F0aW9uQWN0aW9uX2RlcHJlY2F0ZWRGb3JVc2VXaXRoVjEgJiYgIW1fY2xpZW50LmRlY2lkZVBv bGljeUZvck5hdmlnYXRpb25BY3Rpb24pIHsKLSAgICAgICAgICAgICAgICBsaXN0ZW5lci0+dXNl KHN0ZDo6bnVsbG9wdCk7CisgICAgICAgICAgICAgICAgbGlzdGVuZXItPnVzZSgpOwogICAgICAg ICAgICAgICAgIHJldHVybjsKICAgICAgICAgICAgIH0KIApAQCAtMTM3NCw3ICsxMzc0LDcgQEAg dm9pZCBXS1BhZ2VTZXRQYWdlUG9saWN5Q2xpZW50KFdLUGFnZVJlZgogICAgICAgICB2b2lkIGRl Y2lkZVBvbGljeUZvck5ld1dpbmRvd0FjdGlvbihXZWJQYWdlUHJveHkmIHBhZ2UsIFdlYkZyYW1l UHJveHkmIGZyYW1lLCBjb25zdCBOYXZpZ2F0aW9uQWN0aW9uRGF0YSYgbmF2aWdhdGlvbkFjdGlv bkRhdGEsIGNvbnN0IFJlc291cmNlUmVxdWVzdCYgcmVzb3VyY2VSZXF1ZXN0LCBjb25zdCBTdHJp bmcmIGZyYW1lTmFtZSwgUmVmPFdlYkZyYW1lUG9saWN5TGlzdGVuZXJQcm94eT4mJiBsaXN0ZW5l ciwgQVBJOjpPYmplY3QqIHVzZXJEYXRhKSBvdmVycmlkZQogICAgICAgICB7CiAgICAgICAgICAg ICBpZiAoIW1fY2xpZW50LmRlY2lkZVBvbGljeUZvck5ld1dpbmRvd0FjdGlvbikgewotICAgICAg ICAgICAgICAgIGxpc3RlbmVyLT51c2Uoc3RkOjpudWxsb3B0KTsKKyAgICAgICAgICAgICAgICBs aXN0ZW5lci0+dXNlKCk7CiAgICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAgICAgfQog CkBAIC0xMzg2LDcgKzEzODYsNyBAQCB2b2lkIFdLUGFnZVNldFBhZ2VQb2xpY3lDbGllbnQoV0tQ YWdlUmVmCiAgICAgICAgIHZvaWQgZGVjaWRlUG9saWN5Rm9yUmVzcG9uc2UoV2ViUGFnZVByb3h5 JiBwYWdlLCBXZWJGcmFtZVByb3h5JiBmcmFtZSwgY29uc3QgUmVzb3VyY2VSZXNwb25zZSYgcmVz b3VyY2VSZXNwb25zZSwgY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXNvdXJjZVJlcXVlc3QsIGJv b2wgY2FuU2hvd01JTUVUeXBlLCBSZWY8V2ViRnJhbWVQb2xpY3lMaXN0ZW5lclByb3h5PiYmIGxp c3RlbmVyLCBBUEk6Ok9iamVjdCogdXNlckRhdGEpIG92ZXJyaWRlCiAgICAgICAgIHsKICAgICAg ICAgICAgIGlmICghbV9jbGllbnQuZGVjaWRlUG9saWN5Rm9yUmVzcG9uc2VfZGVwcmVjYXRlZEZv clVzZVdpdGhWMCAmJiAhbV9jbGllbnQuZGVjaWRlUG9saWN5Rm9yUmVzcG9uc2UpIHsKLSAgICAg ICAgICAgICAgICBsaXN0ZW5lci0+dXNlKHN0ZDo6bnVsbG9wdCk7CisgICAgICAgICAgICAgICAg bGlzdGVuZXItPnVzZSgpOwogICAgICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgICAgIH0K IApAQCAtMjIwMyw3ICsyMjAzLDcgQEAgdm9pZCBXS1BhZ2VTZXRQYWdlTmF2aWdhdGlvbkNsaWVu dChXS1BhZwogICAgICAgICB2b2lkIGRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb24oV2Vi UGFnZVByb3h5JiBwYWdlLCBSZWY8QVBJOjpOYXZpZ2F0aW9uQWN0aW9uPiYmIG5hdmlnYXRpb25B Y3Rpb24sIFJlZjxXZWJLaXQ6OldlYkZyYW1lUG9saWN5TGlzdGVuZXJQcm94eT4mJiBsaXN0ZW5l ciwgQVBJOjpPYmplY3QqIHVzZXJEYXRhKSBmaW5hbAogICAgICAgICB7CiAgICAgICAgICAgICBp ZiAoIW1fY2xpZW50LmRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb24pIHsKLSAgICAgICAg ICAgICAgICBsaXN0ZW5lci0+dXNlKHN0ZDo6bnVsbG9wdCk7CisgICAgICAgICAgICAgICAgbGlz dGVuZXItPnVzZSgpOwogICAgICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgICAgIH0KICAg ICAgICAgICAgIG1fY2xpZW50LmRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb24odG9BUEko JnBhZ2UpLCB0b0FQSShuYXZpZ2F0aW9uQWN0aW9uLnB0cigpKSwgdG9BUEkobGlzdGVuZXIucHRy KCkpLCB0b0FQSSh1c2VyRGF0YSksIG1fY2xpZW50LmJhc2UuY2xpZW50SW5mbyk7CkBAIC0yMjEy LDcgKzIyMTIsNyBAQCB2b2lkIFdLUGFnZVNldFBhZ2VOYXZpZ2F0aW9uQ2xpZW50KFdLUGFnCiAg ICAgICAgIHZvaWQgZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvblJlc3BvbnNlKFdlYlBhZ2VQcm94 eSYgcGFnZSwgUmVmPEFQSTo6TmF2aWdhdGlvblJlc3BvbnNlPiYmIG5hdmlnYXRpb25SZXNwb25z ZSwgUmVmPFdlYktpdDo6V2ViRnJhbWVQb2xpY3lMaXN0ZW5lclByb3h5PiYmIGxpc3RlbmVyLCBB UEk6Ok9iamVjdCogdXNlckRhdGEpIG92ZXJyaWRlCiAgICAgICAgIHsKICAgICAgICAgICAgIGlm ICghbV9jbGllbnQuZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvblJlc3BvbnNlKSB7Ci0gICAgICAg ICAgICAgICAgbGlzdGVuZXItPnVzZShzdGQ6Om51bGxvcHQpOworICAgICAgICAgICAgICAgIGxp c3RlbmVyLT51c2UoKTsKICAgICAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgICAgICB9CiAg ICAgICAgICAgICBtX2NsaWVudC5kZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uUmVzcG9uc2UodG9B UEkoJnBhZ2UpLCB0b0FQSShuYXZpZ2F0aW9uUmVzcG9uc2UucHRyKCkpLCB0b0FQSShsaXN0ZW5l ci5wdHIoKSksIHRvQVBJKHVzZXJEYXRhKSwgbV9jbGllbnQuYmFzZS5jbGllbnRJbmZvKTsKSW5k ZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9nbGliL1dlYktpdFBvbGljeURlY2lzaW9u LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ2xpYi9XZWJL aXRQb2xpY3lEZWNpc2lvbi5jcHAJKHJldmlzaW9uIDIzNDE1NCkKKysrIFNvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL0FQSS9nbGliL1dlYktpdFBvbGljeURlY2lzaW9uLmNwcAkod29ya2luZyBjb3B5 KQpAQCAtODEsNyArODEsNyBAQCB2b2lkIHdlYmtpdF9wb2xpY3lfZGVjaXNpb25fdXNlKFdlYktp dFBvCiAgICAgICAgIHJldHVybjsKIAogICAgIGF1dG8gbGlzdGVuZXIgPSBzdGQ6OmV4Y2hhbmdl KGRlY2lzaW9uLT5wcml2LT5saXN0ZW5lciwgbnVsbHB0cik7Ci0gICAgbGlzdGVuZXItPnVzZShz dGQ6Om51bGxvcHQpOworICAgIGxpc3RlbmVyLT51c2UoKTsKIH0KIAogLyoqCkluZGV4OiBTb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9OYXZpZ2F0aW9uU3RhdGUubW0KPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvTmF2aWdhdGlvblN0YXRlLm1tCShyZXZp c2lvbiAyMzQxNTQpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9OYXZpZ2F0aW9u U3RhdGUubW0JKHdvcmtpbmcgY29weSkKQEAgLTQ5MSw3ICs0OTEsNyBAQCB2b2lkIE5hdmlnYXRp b25TdGF0ZTo6TmF2aWdhdGlvbkNsaWVudDo6CiAgICAgICAgICAgICB9CiAKICAgICAgICAgICAg IGlmICghbmF2aWdhdGlvbkFjdGlvbi0+dGFyZ2V0RnJhbWUoKSkgewotICAgICAgICAgICAgICAg IGxpc3RlbmVyLT51c2Uoc3RkOjpudWxsb3B0KTsKKyAgICAgICAgICAgICAgICBsaXN0ZW5lci0+ dXNlKCk7CiAgICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAgICAgfQogCkBAIC01MDAs NyArNTAwLDcgQEAgdm9pZCBOYXZpZ2F0aW9uU3RhdGU6Ok5hdmlnYXRpb25DbGllbnQ6OgogICAg ICAgICAgICAgICAgIGlmIChuYXZpZ2F0aW9uQWN0aW9uLT5zaG91bGRQZXJmb3JtRG93bmxvYWQo KSkKICAgICAgICAgICAgICAgICAgICAgbGlzdGVuZXItPmRvd25sb2FkKCk7CiAgICAgICAgICAg ICAgICAgZWxzZQotICAgICAgICAgICAgICAgICAgICBsaXN0ZW5lci0+dXNlKHN0ZDo6bnVsbG9w dCk7CisgICAgICAgICAgICAgICAgICAgIGxpc3RlbmVyLT51c2UoKTsKICAgICAgICAgICAgICAg ICByZXR1cm47CiAgICAgICAgICAgICB9CiAKQEAgLTUyOSwxNyArNTI5LDE0IEBAIHZvaWQgTmF2 aWdhdGlvblN0YXRlOjpOYXZpZ2F0aW9uQ2xpZW50OjoKICAgICAgICAgICAgIHJldHVybjsKICAg ICAgICAgY2hlY2tlci0+ZGlkQ2FsbENvbXBsZXRpb25IYW5kbGVyKCk7CiAKLSAgICAgICAgc3Rk OjpvcHRpb25hbDxXZWJzaXRlUG9saWNpZXNEYXRhPiBkYXRhOwotICAgICAgICBpZiAod2Vic2l0 ZVBvbGljaWVzKSB7Ci0gICAgICAgICAgICBkYXRhID0gd2Vic2l0ZVBvbGljaWVzLT5fd2Vic2l0 ZVBvbGljaWVzLT5kYXRhKCk7Ci0gICAgICAgICAgICBpZiAoZGF0YS0+d2Vic2l0ZURhdGFTdG9y ZVBhcmFtZXRlcnMpIHsKLSAgICAgICAgICAgICAgICBhdXRvJiBzZXNzaW9uSUQgPSBkYXRhLT53 ZWJzaXRlRGF0YVN0b3JlUGFyYW1ldGVycy0+bmV0d29ya1Nlc3Npb25QYXJhbWV0ZXJzLnNlc3Np b25JRDsKKyAgICAgICAgUmVmUHRyPEFQSTo6V2Vic2l0ZVBvbGljaWVzPiBhcGlXZWJzaXRlUG9s aWNpZXMgPSB3ZWJzaXRlUG9saWNpZXMgPyB3ZWJzaXRlUG9saWNpZXMtPl93ZWJzaXRlUG9saWNp ZXMuZ2V0KCkgOiBudWxscHRyOworICAgICAgICBpZiAoYXBpV2Vic2l0ZVBvbGljaWVzKSB7Cisg ICAgICAgICAgICBpZiAoYXV0byogd2Vic2l0ZURhdGFTdG9yZSA9IGFwaVdlYnNpdGVQb2xpY2ll cy0+d2Vic2l0ZURhdGFTdG9yZSgpKSB7CisgICAgICAgICAgICAgICAgYXV0byBzZXNzaW9uSUQg PSB3ZWJzaXRlRGF0YVN0b3JlLT53ZWJzaXRlRGF0YVN0b3JlKCkuc2Vzc2lvbklEKCk7CiAgICAg ICAgICAgICAgICAgaWYgKCFzZXNzaW9uSUQuaXNFcGhlbWVyYWwoKSAmJiBzZXNzaW9uSUQgIT0g UEFMOjpTZXNzaW9uSUQ6OmRlZmF1bHRTZXNzaW9uSUQoKSkKICAgICAgICAgICAgICAgICAgICAg W05TRXhjZXB0aW9uIHJhaXNlOk5TSW52YWxpZEFyZ3VtZW50RXhjZXB0aW9uIGZvcm1hdDpAIl9X S1dlYnNpdGVQb2xpY2llcy53ZWJzaXRlRGF0YVN0b3JlIG11c3QgYmUgbmlsLCBkZWZhdWx0LCBv ciBub24tcGVyc2lzdGVudC4iXTsKICAgICAgICAgICAgICAgICBpZiAoc3ViZnJhbWVOYXZpZ2F0 aW9uKQogICAgICAgICAgICAgICAgICAgICBbTlNFeGNlcHRpb24gcmFpc2U6TlNJbnZhbGlkQXJn dW1lbnRFeGNlcHRpb24gZm9ybWF0OkAiX1dLV2Vic2l0ZVBvbGljaWVzLndlYnNpdGVEYXRhU3Rv cmUgbXVzdCBiZSBuaWwgZm9yIHN1YmZyYW1lIG5hdmlnYXRpb25zLiJdOwotCi0gICAgICAgICAg ICAgICAgd2ViUGFnZVByb3h5LT5jaGFuZ2VXZWJzaXRlRGF0YVN0b3JlKHdlYnNpdGVQb2xpY2ll cy0+X3dlYnNpdGVQb2xpY2llcy0+d2Vic2l0ZURhdGFTdG9yZSgpLT53ZWJzaXRlRGF0YVN0b3Jl KCkpOwogICAgICAgICAgICAgfQogICAgICAgICB9CiAKQEAgLTU1MCwxMyArNTQ3LDEzIEBAIHZv aWQgTmF2aWdhdGlvblN0YXRlOjpOYXZpZ2F0aW9uQ2xpZW50OjoKICNwcmFnbWEgY2xhbmcgZGlh Z25vc3RpYyBpZ25vcmVkICItV3N3aXRjaCIKICAgICAgICAgY2FzZSBfV0tOYXZpZ2F0aW9uQWN0 aW9uUG9saWN5QWxsb3dJbk5ld1Byb2Nlc3M6CiAjcHJhZ21hIGNsYW5nIGRpYWdub3N0aWMgcG9w Ci0gICAgICAgICAgICB0cnlBcHBMaW5rKFdURk1vdmUobmF2aWdhdGlvbkFjdGlvbiksIG1haW5G cmFtZVVSTFN0cmluZywgW2FjdGlvblBvbGljeSwgbG9jYWxMaXN0ZW5lciA9IFdURk1vdmUobG9j YWxMaXN0ZW5lciksIGRhdGEgPSBXVEZNb3ZlKGRhdGEpXShib29sIGZvbGxvd2VkTGlua1RvQXBw KSBtdXRhYmxlIHsKKyAgICAgICAgICAgIHRyeUFwcExpbmsoV1RGTW92ZShuYXZpZ2F0aW9uQWN0 aW9uKSwgbWFpbkZyYW1lVVJMU3RyaW5nLCBbYWN0aW9uUG9saWN5LCBsb2NhbExpc3RlbmVyID0g V1RGTW92ZShsb2NhbExpc3RlbmVyKSwgd2Vic2l0ZVBvbGljaWVzID0gV1RGTW92ZShhcGlXZWJz aXRlUG9saWNpZXMpXShib29sIGZvbGxvd2VkTGlua1RvQXBwKSBtdXRhYmxlIHsKICAgICAgICAg ICAgICAgICBpZiAoZm9sbG93ZWRMaW5rVG9BcHApIHsKICAgICAgICAgICAgICAgICAgICAgbG9j YWxMaXN0ZW5lci0+aWdub3JlKCk7CiAgICAgICAgICAgICAgICAgICAgIHJldHVybjsKICAgICAg ICAgICAgICAgICB9CiAKLSAgICAgICAgICAgICAgICBsb2NhbExpc3RlbmVyLT51c2UoV1RGTW92 ZShkYXRhKSwgYWN0aW9uUG9saWN5ID09IF9XS05hdmlnYXRpb25BY3Rpb25Qb2xpY3lBbGxvd0lu TmV3UHJvY2VzcyA/IFNob3VsZFByb2Nlc3NTd2FwSWZQb3NzaWJsZTo6WWVzIDogU2hvdWxkUHJv Y2Vzc1N3YXBJZlBvc3NpYmxlOjpObyk7CisgICAgICAgICAgICAgICAgbG9jYWxMaXN0ZW5lci0+ dXNlKHdlYnNpdGVQb2xpY2llcy5nZXQoKSwgYWN0aW9uUG9saWN5ID09IF9XS05hdmlnYXRpb25B Y3Rpb25Qb2xpY3lBbGxvd0luTmV3UHJvY2VzcyA/IFNob3VsZFByb2Nlc3NTd2FwSWZQb3NzaWJs ZTo6WWVzIDogU2hvdWxkUHJvY2Vzc1N3YXBJZlBvc3NpYmxlOjpObyk7CiAgICAgICAgICAgICB9 KTsKICAgICAgICAgCiAgICAgICAgICAgICBicmVhazsKQEAgLTU3Myw3ICs1NzAsNyBAQCB2b2lk IE5hdmlnYXRpb25TdGF0ZTo6TmF2aWdhdGlvbkNsaWVudDo6CiAgICAgICAgICAgICBicmVhazsK ICAgICAgICAgY2FzZSBfV0tOYXZpZ2F0aW9uQWN0aW9uUG9saWN5QWxsb3dXaXRob3V0VHJ5aW5n QXBwTGluazoKICNwcmFnbWEgY2xhbmcgZGlhZ25vc3RpYyBwb3AKLSAgICAgICAgICAgIGxvY2Fs TGlzdGVuZXItPnVzZShXVEZNb3ZlKGRhdGEpKTsKKyAgICAgICAgICAgIGxvY2FsTGlzdGVuZXIt PnVzZShhcGlXZWJzaXRlUG9saWNpZXMuZ2V0KCkpOwogICAgICAgICAgICAgYnJlYWs7CiAgICAg ICAgIH0KICAgICB9OwpAQCAtNjIzLDE0ICs2MjAsMTQgQEAgdm9pZCBOYXZpZ2F0aW9uU3RhdGU6 Ok5hdmlnYXRpb25DbGllbnQ6OgogICAgICAgICAgICAgQk9PTCBleGlzdHMgPSBbW05TRmlsZU1h bmFnZXIgZGVmYXVsdE1hbmFnZXJdIGZpbGVFeGlzdHNBdFBhdGg6dXJsLnBhdGggaXNEaXJlY3Rv cnk6JmlzRGlyZWN0b3J5XTsKIAogICAgICAgICAgICAgaWYgKGV4aXN0cyAmJiAhaXNEaXJlY3Rv cnkgJiYgbmF2aWdhdGlvblJlc3BvbnNlLT5jYW5TaG93TUlNRVR5cGUoKSkKLSAgICAgICAgICAg ICAgICBsaXN0ZW5lci0+dXNlKHN0ZDo6bnVsbG9wdCk7CisgICAgICAgICAgICAgICAgbGlzdGVu ZXItPnVzZSgpOwogICAgICAgICAgICAgZWxzZQogICAgICAgICAgICAgICAgIGxpc3RlbmVyLT5p Z25vcmUoKTsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQogCiAgICAgICAgIGlmIChu YXZpZ2F0aW9uUmVzcG9uc2UtPmNhblNob3dNSU1FVHlwZSgpKQotICAgICAgICAgICAgbGlzdGVu ZXItPnVzZShzdGQ6Om51bGxvcHQpOworICAgICAgICAgICAgbGlzdGVuZXItPnVzZSgpOwogICAg ICAgICBlbHNlCiAgICAgICAgICAgICBsaXN0ZW5lci0+aWdub3JlKCk7CiAgICAgICAgIHJldHVy bjsKQEAgLTY1MCw3ICs2NDcsNyBAQCB2b2lkIE5hdmlnYXRpb25TdGF0ZTo6TmF2aWdhdGlvbkNs aWVudDo6CiAKICAgICAgICAgc3dpdGNoIChyZXNwb25zZVBvbGljeSkgewogICAgICAgICBjYXNl IFdLTmF2aWdhdGlvblJlc3BvbnNlUG9saWN5QWxsb3c6Ci0gICAgICAgICAgICBsb2NhbExpc3Rl bmVyLT51c2Uoc3RkOjpudWxsb3B0KTsKKyAgICAgICAgICAgIGxvY2FsTGlzdGVuZXItPnVzZSgp OwogICAgICAgICAgICAgYnJlYWs7CiAKICAgICAgICAgY2FzZSBXS05hdmlnYXRpb25SZXNwb25z ZVBvbGljeUNhbmNlbDoK