181270 2018-01-03 18:44:14 -0800 Storage Access API: Refactor XPC for access removal to go straight from the web process to the network process 2018-01-03 20:22:04 -0800 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 wilander wilander achristensen bfulgham commit-queue webkit-bug-importer wilander youennf oldest_to_newest 1385647 0 wilander 2018-01-03 18:44:14 -0800 As pointed out by Youenn Fablet in his review of https://bugs.webkit.org/show_bug.cgi?id=180728, removal of storage access should go straight from the web process to the network process instead of over the UI process. 1385648 1 webkit-bug-importer 2018-01-03 18:46:16 -0800 <rdar://problem/36289544> 1385651 2 330430 wilander 2018-01-03 19:00:08 -0800 Created attachment 330430 Patch 1385661 3 330435 wilander 2018-01-03 19:40:22 -0800 Created attachment 330435 Patch 1385663 4 wilander 2018-01-03 19:59:51 -0800 Thanks for the review, Alex! Landing this unblocks further work so I really appreciate it. I'll just wait for EWS to finish the mac-wk2 run before I put it on the queue. 1385672 5 330435 commit-queue 2018-01-03 20:22:02 -0800 Comment on attachment 330435 Patch Clearing flags on attachment: 330435 Committed r226389: <https://trac.webkit.org/changeset/226389> 1385673 6 commit-queue 2018-01-03 20:22:04 -0800 All reviewed patches have been landed. Closing bug. 330430 2018-01-03 19:00:08 -0800 2018-01-03 19:40:21 -0800 Patch bug-181270-20180103190007.patch text/plain 19663 wilander SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIyNjM2NSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMwIEBACisyMDE4LTAxLTAzICBKb2huIFdp bGFuZGVyICA8d2lsYW5kZXJAYXBwbGUuY29tPgorCisgICAgICAgIFN0b3JhZ2UgQWNjZXNzIEFQ STogUmVmYWN0b3IgWFBDIGZvciBhY2Nlc3MgcmVtb3ZhbCB0byBnbyBzdHJhaWdodCBmcm9tIHRo ZSB3ZWIgcHJvY2VzcyB0byB0aGUgbmV0d29yayBwcm9jZXNzCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODEyNzAKKyAgICAgICAgPHJkYXI6Ly9wcm9i bGVtLzM2Mjg5NTQ0PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIE5vIG5ldyB0ZXN0cy4gRXhpc3RpbmcgdGVzdCByZS1lbmFibGVkLgorCisgICAgICAg IFRoaXMgY2hhbmdlIHJlZmFjdG9ycyBob3cgdGhlIHdlYiBwcm9jZXNzIHRlbGxzIHRoZSBuZXR3 b3JrIHByb2Nlc3MKKyAgICAgICAgdG8gcmVtb3ZlIHN0b3JhZ2UgYWNjZXNzLiBQcmV2aW91c2x5 LCB0aGlzIHdhcyBkb25lIG92ZXIgdGhlIFVJIHByb2Nlc3MKKyAgICAgICAganVzdCBsaWtlIHJl cXVlc3RzIGZvciBzdG9yYWdlIGFjY2Vzcy4gQnV0IHNpbmNlIG5vIGZ1cnRoZXIgcmVhc29uaW5n CisgICAgICAgIGlzIG5lZWRlZCwgdGhlIG1lc3NhZ2Ugc2hvdWxkIGdvIHN0cmFpZ2h0IGZyb20g dGhlIHdlYiBwcm9jZXNzIHRvIHRoZQorICAgICAgICBuZXR3b3JrIHByb2Nlc3MgZm9yIHBlcmZv cm1hbmNlIHJlYXNvbnMgYW5kIHRvIG1pbmltaXplIHRoZSByaXNrIG9mIGEKKyAgICAgICAgcmFj ZS4KKworICAgICAgICBBcyBhIGNvbnNlcXVlbmNlLCB0aGUgWFBDIGNvZGUgZm9yIHN0b3JhZ2Ug YWNjZXNzIHJlbW92YWwgaW4gdGhlIFVJCisgICAgICAgIHByb2Nlc3MgaXMgZGVsZXRlZC4KKwor ICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvY2YvTmV0d29ya1N0b3JhZ2VTZXNzaW9uQ0ZOZXQu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6TmV0d29ya1N0b3JhZ2VTZXNzaW9uOjpjb29raWVTdG9y YWdlUGFydGl0aW9uIGNvbnN0KToKKyAgICAgICAgICAgIFJlbW92ZXMgdGhlIHN0b3JhZ2VBY2Nl c3NBUElFbmFibGVkIGNoZWNrIHNpbmNlIHRoZSBmbGFnCisgICAgICAgICAgICBkb2Vzbid0IGdl dCBwcm9wYWdhdGVkIHdoZW4gdGhlIG5ldHdvcmsgcHJvY2VzcyBpcyBjcmVhdGVkLgorICAgICAg ICAgICAgRmlndXJpbmcgdGhpcyBvdXQgd2lsbCB0YWtlIHNvbWUgd29yayB3aGljaCBpcyB1bm5l Y2Vzc2FyeQorICAgICAgICAgICAgd2hlbiB3ZSBhbHJlYWR5IGdhdGUgYWNjZXNzIHRvIHRoZSBm ZWF0dXJlIGluIERvY3VtZW50LmlkbC4KKwogMjAxOC0wMS0wMyAgU2ltb24gRnJhc2VyICA8c2lt b24uZnJhc2VyQGFwcGxlLmNvbT4KIAogICAgICAgICBTVkcgbGlnaHRpbmcgZmlsdGVyIGxpZ2h0 cyBhcmUgaW4gdGhlIHdyb25nIGNvb3JkaW5hdGUgc3lzdGVtCkluZGV4OiBTb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9uZXR3b3JrL2NmL05ldHdvcmtTdG9yYWdlU2Vzc2lvbkNGTmV0LmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2NmL05ldHdvcmtTdG9y YWdlU2Vzc2lvbkNGTmV0LmNwcAkocmV2aXNpb24gMjI2MzY1KQorKysgU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vbmV0d29yay9jZi9OZXR3b3JrU3RvcmFnZVNlc3Npb25DRk5ldC5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTE5Niw3ICsxOTYsNyBAQCBTdHJpbmcgTmV0d29ya1N0b3JhZ2VTZXNzaW9u Ojpjb29raWVTdG9yCiAgICAgaWYgKGZpcnN0UGFydHlEb21haW4gPT0gcmVzb3VyY2VEb21haW4p CiAgICAgICAgIHJldHVybiBlbXB0eVN0cmluZygpOwogCi0gICAgaWYgKHN0b3JhZ2VBY2Nlc3NB UElFbmFibGVkICYmIGZyYW1lSUQgJiYgcGFnZUlEICYmIGlzU3RvcmFnZUFjY2Vzc0dyYW50ZWQo cmVzb3VyY2VEb21haW4sIGZpcnN0UGFydHlEb21haW4sIGZyYW1lSUQudmFsdWUoKSwgcGFnZUlE LnZhbHVlKCkpKQorICAgIGlmIChmcmFtZUlEICYmIHBhZ2VJRCAmJiBpc1N0b3JhZ2VBY2Nlc3NH cmFudGVkKHJlc291cmNlRG9tYWluLCBmaXJzdFBhcnR5RG9tYWluLCBmcmFtZUlELnZhbHVlKCks IHBhZ2VJRC52YWx1ZSgpKSkKICAgICAgICAgcmV0dXJuIGVtcHR5U3RyaW5nKCk7CiAKICAgICBy ZXR1cm4gZmlyc3RQYXJ0eURvbWFpbjsKSW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMjYzODYpCisr KyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQ1IEBA CisyMDE4LTAxLTAzICBKb2huIFdpbGFuZGVyICA8d2lsYW5kZXJAYXBwbGUuY29tPgorCisgICAg ICAgIFN0b3JhZ2UgQWNjZXNzIEFQSTogUmVmYWN0b3IgWFBDIGZvciBhY2Nlc3MgcmVtb3ZhbCB0 byBnbyBzdHJhaWdodCBmcm9tIHRoZSB3ZWIgcHJvY2VzcyB0byB0aGUgbmV0d29yayBwcm9jZXNz CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODEyNzAK KyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzM2Mjg5NTQ0PgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgY2hhbmdlIHJlZmFjdG9ycyBob3cgdGhl IHdlYiBwcm9jZXNzIHRlbGxzIHRoZSBuZXR3b3JrIHByb2Nlc3MKKyAgICAgICAgdG8gcmVtb3Zl IHN0b3JhZ2UgYWNjZXNzLiBQcmV2aW91c2x5LCB0aGlzIHdhcyBkb25lIG92ZXIgdGhlIFVJIHBy b2Nlc3MKKyAgICAgICAganVzdCBsaWtlIHJlcXVlc3RzIGZvciBzdG9yYWdlIGFjY2Vzcy4gQnV0 IHNpbmNlIG5vIGZ1cnRoZXIgcmVhc29uaW5nCisgICAgICAgIGlzIG5lZWRlZCwgdGhlIG1lc3Nh Z2Ugc2hvdWxkIGdvIHN0cmFpZ2h0IGZyb20gdGhlIHdlYiBwcm9jZXNzIHRvIHRoZQorICAgICAg ICBuZXR3b3JrIHByb2Nlc3MgZm9yIHBlcmZvcm1hbmNlIHJlYXNvbnMgYW5kIHRvIG1pbmltaXpl IHRoZSByaXNrIG9mIGEKKyAgICAgICAgcmFjZS4KKworICAgICAgICBBcyBhIGNvbnNlcXVlbmNl LCB0aGUgWFBDIGNvZGUgZm9yIHN0b3JhZ2UgYWNjZXNzIHJlbW92YWwgaW4gdGhlIFVJCisgICAg ICAgIHByb2Nlc3MgaXMgZGVsZXRlZC4KKworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL05ldHdv cmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzLmNwcDoKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya0Nv bm5lY3Rpb25Ub1dlYlByb2Nlc3M6OnJlbW92ZVN0b3JhZ2VBY2Nlc3MpOgorICAgICAgICAqIE5l dHdvcmtQcm9jZXNzL05ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzLmg6CisgICAgICAgICog TmV0d29ya1Byb2Nlc3MvTmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3MubWVzc2FnZXMuaW46 CisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3MuY3BwOgorICAgICAgICAo V2ViS2l0OjpOZXR3b3JrUHJvY2Vzczo6cmVtb3ZlU3RvcmFnZUFjY2Vzcyk6IERlbGV0ZWQuCisg ICAgICAgICogTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3MuaDoKKyAgICAgICAgKiBOZXR3 b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzcy5tZXNzYWdlcy5pbjoKKyAgICAgICAgKiBVSVByb2Nl c3MvTmV0d29yay9OZXR3b3JrUHJvY2Vzc1Byb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6TmV0 d29ya1Byb2Nlc3NQcm94eTo6cmVtb3ZlU3RvcmFnZUFjY2Vzcyk6IERlbGV0ZWQuCisgICAgICAg ICogVUlQcm9jZXNzL05ldHdvcmsvTmV0d29ya1Byb2Nlc3NQcm94eS5oOgorICAgICAgICAqIFVJ UHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6 OnJlcXVlc3RTdG9yYWdlQWNjZXNzKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5Ojpy ZW1vdmVTdG9yYWdlQWNjZXNzKTogRGVsZXRlZC4KKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFn ZVByb3h5Lmg6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5tZXNzYWdlcy5pbjoK KyAgICAgICAgKiBVSVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5jcHA6Cisg ICAgICAgIChXZWJLaXQ6OldlYnNpdGVEYXRhU3RvcmU6OnJlcXVlc3RTdG9yYWdlQWNjZXNzKToK KyAgICAgICAgKFdlYktpdDo6V2Vic2l0ZURhdGFTdG9yZTo6cmVtb3ZlU3RvcmFnZUFjY2Vzcyk6 IERlbGV0ZWQuCisgICAgICAgICogVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3Rv cmUuaDoKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVy Q2xpZW50LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViRnJhbWVMb2FkZXJDbGllbnQ6OmRldGFj aGVkRnJvbVBhcmVudDIpOgorICAgICAgICAoV2ViS2l0OjpXZWJGcmFtZUxvYWRlckNsaWVudDo6 ZGlzcGF0Y2hXaWxsQ2hhbmdlRG9jdW1lbnQpOgorCiAyMDE4LTAxLTAzICBCcmVudCBGdWxnaGFt ICA8YmZ1bGdoYW1AYXBwbGUuY29tPgogCiAgICAgICAgIFttYWNPU10gQ29uc3RhbnQgZnJhbWUg ZHJvcHBpbmcgZHVyaW5nIEZsYXNoIHZpZGVvIHBsYXliYWNrCkluZGV4OiBTb3VyY2UvV2ViS2l0 L05ldHdvcmtQcm9jZXNzL05ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzLmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtDb25uZWN0aW9uVG9X ZWJQcm9jZXNzLmNwcAkocmV2aXNpb24gMjI2MzY1KQorKysgU291cmNlL1dlYktpdC9OZXR3b3Jr UHJvY2Vzcy9OZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vzcy5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTQ3MSw0ICs0NzEsOSBAQCB2b2lkIE5ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzOjpl bnN1CiAgICAgTmV0d29ya1Byb2Nlc3M6OnNpbmdsZXRvbigpLmFkZFdlYnNpdGVEYXRhU3RvcmUo V2Vic2l0ZURhdGFTdG9yZVBhcmFtZXRlcnM6OmxlZ2FjeVByaXZhdGVTZXNzaW9uUGFyYW1ldGVy cygpKTsKIH0KIAordm9pZCBOZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vzczo6cmVtb3ZlU3Rv cmFnZUFjY2VzcyhQQUw6OlNlc3Npb25JRCBzZXNzaW9uSUQsIHVpbnQ2NF90IGZyYW1lSUQsIHVp bnQ2NF90IHBhZ2VJRCkKK3sKKyAgICBzdG9yYWdlU2Vzc2lvbihzZXNzaW9uSUQpLnJlbW92ZVN0 b3JhZ2VBY2Nlc3MoZnJhbWVJRCwgcGFnZUlEKTsKK30KKwogfSAvLyBuYW1lc3BhY2UgV2ViS2l0 CkluZGV4OiBTb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtDb25uZWN0aW9uVG9X ZWJQcm9jZXNzLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9O ZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vzcy5oCShyZXZpc2lvbiAyMjYzNjUpCisrKyBTb3Vy Y2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzLmgJ KHdvcmtpbmcgY29weSkKQEAgLTEzMyw2ICsxMzMsOCBAQCBwcml2YXRlOgogCiAgICAgQ2FjaGVT dG9yYWdlRW5naW5lQ29ubmVjdGlvbiYgY2FjaGVTdG9yYWdlQ29ubmVjdGlvbigpOwogCisgICAg dm9pZCByZW1vdmVTdG9yYWdlQWNjZXNzKFBBTDo6U2Vzc2lvbklELCB1aW50NjRfdCBmcmFtZUlE LCB1aW50NjRfdCBwYWdlSUQpOworCiAgICAgUmVmPElQQzo6Q29ubmVjdGlvbj4gbV9jb25uZWN0 aW9uOwogCiAgICAgSGFzaE1hcDx1aW50NjRfdCwgUmVmUHRyPE5ldHdvcmtTb2NrZXRTdHJlYW0+ PiBtX25ldHdvcmtTb2NrZXRTdHJlYW1zOwpJbmRleDogU291cmNlL1dlYktpdC9OZXR3b3JrUHJv Y2Vzcy9OZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vzcy5tZXNzYWdlcy5pbgo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtDb25uZWN0aW9uVG9XZWJQ cm9jZXNzLm1lc3NhZ2VzLmluCShyZXZpc2lvbiAyMjYzNjUpCisrKyBTb3VyY2UvV2ViS2l0L05l dHdvcmtQcm9jZXNzL05ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzLm1lc3NhZ2VzLmluCSh3 b3JraW5nIGNvcHkpCkBAIC01Nyw0ICs1Nyw2IEBAIG1lc3NhZ2VzIC0+IE5ldHdvcmtDb25uZWN0 aW9uVG9XZWJQcm9jZXMKICAgICBDcmVhdGVTb2NrZXRTdHJlYW0oV2ViQ29yZTo6VVJMIHVybCwg UEFMOjpTZXNzaW9uSUQgc2Vzc2lvbklELCBTdHJpbmcgY2FjaGVQYXJ0aXRpb24sIHVpbnQ2NF90 IGlkZW50aWZpZXIpCiAKICAgICBFbnN1cmVMZWdhY3lQcml2YXRlQnJvd3NpbmdTZXNzaW9uKCkK KworICAgIFJlbW92ZVN0b3JhZ2VBY2Nlc3MoUEFMOjpTZXNzaW9uSUQgc2Vzc2lvbklELCB1aW50 NjRfdCBmcmFtZUlELCB1aW50NjRfdCBwYWdlSUQpOwogfQpJbmRleDogU291cmNlL1dlYktpdC9O ZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzcy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzcy5jcHAJKHJldmlzaW9uIDIyNjM2NSkK KysrIFNvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3MuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC0zNjAsMTQgKzM2MCw2IEBAIHZvaWQgTmV0d29ya1Byb2Nlc3M6OnVwZGF0 ZVN0b3JhZ2VBY2Nlc3MKICAgICBwYXJlbnRQcm9jZXNzQ29ubmVjdGlvbigpLT5zZW5kKE1lc3Nh Z2VzOjpOZXR3b3JrUHJvY2Vzc1Byb3h5OjpTdG9yYWdlQWNjZXNzUmVxdWVzdFJlc3VsdChpc1N0 b3JhZ2VHcmFudGVkLCBjb250ZXh0SWQpLCAwKTsKIH0KIAotdm9pZCBOZXR3b3JrUHJvY2Vzczo6 cmVtb3ZlU3RvcmFnZUFjY2VzcyhQQUw6OlNlc3Npb25JRCBzZXNzaW9uSUQsIHVpbnQ2NF90IGZy YW1lSUQsIHVpbnQ2NF90IHBhZ2VJRCkKLXsKLSAgICBpZiAoYXV0byogbmV0d29ya1N0b3JhZ2VT ZXNzaW9uID0gTmV0d29ya1N0b3JhZ2VTZXNzaW9uOjpzdG9yYWdlU2Vzc2lvbihzZXNzaW9uSUQp KQotICAgICAgICBuZXR3b3JrU3RvcmFnZVNlc3Npb24tPnJlbW92ZVN0b3JhZ2VBY2Nlc3MoZnJh bWVJRCwgcGFnZUlEKTsKLSAgICBlbHNlCi0gICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwot fQotCiB2b2lkIE5ldHdvcmtQcm9jZXNzOjpyZW1vdmVQcmV2YWxlbnREb21haW5zKFBBTDo6U2Vz c2lvbklEIHNlc3Npb25JRCwgY29uc3QgVmVjdG9yPFN0cmluZz4mIGRvbWFpbnMpCiB7CiAgICAg aWYgKGF1dG8qIG5ldHdvcmtTdG9yYWdlU2Vzc2lvbiA9IE5ldHdvcmtTdG9yYWdlU2Vzc2lvbjo6 c3RvcmFnZVNlc3Npb24oc2Vzc2lvbklEKSkKSW5kZXg6IFNvdXJjZS9XZWJLaXQvTmV0d29ya1By b2Nlc3MvTmV0d29ya1Byb2Nlc3MuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L05ldHdv cmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzLmgJKHJldmlzaW9uIDIyNjM2NSkKKysrIFNvdXJjZS9X ZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3MuaAkod29ya2luZyBjb3B5KQpAQCAt MTQwLDcgKzE0MCw2IEBAIHB1YmxpYzoKICAgICB2b2lkIHVwZGF0ZVByZXZhbGVudERvbWFpbnNU b1BhcnRpdGlvbk9yQmxvY2tDb29raWVzKFBBTDo6U2Vzc2lvbklELCBjb25zdCBWZWN0b3I8U3Ry aW5nPiYgZG9tYWluc1RvUGFydGl0aW9uLCBjb25zdCBWZWN0b3I8U3RyaW5nPiYgZG9tYWluc1Rv QmxvY2ssIGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBkb21haW5zVG9OZWl0aGVyUGFydGl0aW9uTm9y QmxvY2ssIGJvb2wgc2hvdWxkQ2xlYXJGaXJzdCk7CiAgICAgdm9pZCBoYXNTdG9yYWdlQWNjZXNz Rm9yUHJldmFsZW50RG9tYWlucyhQQUw6OlNlc3Npb25JRCwgY29uc3QgU3RyaW5nJiByZXNvdXJj ZURvbWFpbiwgY29uc3QgU3RyaW5nJiBmaXJzdFBhcnR5RG9tYWluLCB1aW50NjRfdCBmcmFtZUlE LCB1aW50NjRfdCBwYWdlSUQsIHVpbnQ2NF90IGNvbnRleHRJZCk7CiAgICAgdm9pZCB1cGRhdGVT dG9yYWdlQWNjZXNzRm9yUHJldmFsZW50RG9tYWlucyhQQUw6OlNlc3Npb25JRCwgY29uc3QgU3Ry aW5nJiByZXNvdXJjZURvbWFpbiwgY29uc3QgU3RyaW5nJiBmaXJzdFBhcnR5RG9tYWluLCB1aW50 NjRfdCBmcmFtZUlELCB1aW50NjRfdCBwYWdlSUQsIGJvb2wgdmFsdWUsIHVpbnQ2NF90IGNvbnRl eHRJZCk7Ci0gICAgdm9pZCByZW1vdmVTdG9yYWdlQWNjZXNzKFBBTDo6U2Vzc2lvbklELCB1aW50 NjRfdCBmcmFtZUlELCB1aW50NjRfdCBwYWdlSUQpOwogICAgIHZvaWQgcmVtb3ZlUHJldmFsZW50 RG9tYWlucyhQQUw6OlNlc3Npb25JRCwgY29uc3QgVmVjdG9yPFN0cmluZz4mIGRvbWFpbnMpOwog I2VuZGlmCiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nl c3MubWVzc2FnZXMuaW4KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vz cy9OZXR3b3JrUHJvY2Vzcy5tZXNzYWdlcy5pbgkocmV2aXNpb24gMjI2MzY1KQorKysgU291cmNl L1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzcy5tZXNzYWdlcy5pbgkod29ya2lu ZyBjb3B5KQpAQCAtODUsNyArODUsNiBAQCBtZXNzYWdlcyAtPiBOZXR3b3JrUHJvY2VzcyBMZWdh Y3lSZWNlaXZlCiAgICAgVXBkYXRlUHJldmFsZW50RG9tYWluc1RvUGFydGl0aW9uT3JCbG9ja0Nv b2tpZXMoUEFMOjpTZXNzaW9uSUQgc2Vzc2lvbklELCBWZWN0b3I8U3RyaW5nPiBkb21haW5zVG9Q YXJ0aXRpb24sIFZlY3RvcjxTdHJpbmc+IGRvbWFpbnNUb0Jsb2NrLCBWZWN0b3I8U3RyaW5nPiBk b21haW5zVG9OZWl0aGVyUGFydGl0aW9uTm9yQmxvY2ssIGJvb2wgc2hvdWxkQ2xlYXJGaXJzdCkK ICAgICBIYXNTdG9yYWdlQWNjZXNzRm9yUHJldmFsZW50RG9tYWlucyhQQUw6OlNlc3Npb25JRCBz ZXNzaW9uSUQsIFN0cmluZyByZXNvdXJjZURvbWFpbiwgU3RyaW5nIGZpcnN0UGFydHlEb21haW4s IHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IHBhZ2VJRCwgdWludDY0X3QgY29udGV4dElkKQog ICAgIFVwZGF0ZVN0b3JhZ2VBY2Nlc3NGb3JQcmV2YWxlbnREb21haW5zKFBBTDo6U2Vzc2lvbklE IHNlc3Npb25JRCwgU3RyaW5nIHJlc291cmNlRG9tYWluLCBTdHJpbmcgZmlyc3RQYXJ0eURvbWFp biwgdWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgcGFnZUlELCBib29sIHNob3VsZEdyYW50QWNj ZXNzLCB1aW50NjRfdCBjb250ZXh0SWQpCi0gICAgUmVtb3ZlU3RvcmFnZUFjY2VzcyhQQUw6OlNl c3Npb25JRCBzZXNzaW9uSUQsIHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IHBhZ2VJRCk7CiAg ICAgUmVtb3ZlUHJldmFsZW50RG9tYWlucyhQQUw6OlNlc3Npb25JRCBzZXNzaW9uSUQsIFZlY3Rv cjxTdHJpbmc+IGRvbWFpbnNXaXRoSW50ZXJhY3Rpb24pOwogI2VuZGlmCiB9CkluZGV4OiBTb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAJKHJldmlzaW9uIDIyNjM2NSkKKysr IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTcxOTcsMTIgKzcxOTcsNiBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6cmVxdWVzdFN0b3JhZ2VB Y2Nlc3MoCiAgICAgICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6U3RvcmFn ZUFjY2Vzc1Jlc3BvbnNlKHdhc0dyYW50ZWQsIHdlYlByb2Nlc3NDb250ZXh0SWQpLCBtX3BhZ2VJ RCk7CiAgICAgfSk7CiB9Ci0KLXZvaWQgV2ViUGFnZVByb3h5OjpyZW1vdmVTdG9yYWdlQWNjZXNz KHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IHBhZ2VJRCkKLXsKLSAgICBBU1NFUlQocGFnZUlE ID09IG1fcGFnZUlEKTsKLSAgICBtX3dlYnNpdGVEYXRhU3RvcmUtPnJlbW92ZVN0b3JhZ2VBY2Nl c3MoZnJhbWVJRCwgcGFnZUlEKTsKLX0KICNlbmRpZgogCiAjaWYgUExBVEZPUk0oQ09DT0EpCklu ZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAkocmV2aXNpb24gMjI2MzY1 KQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgJKHdvcmtpbmcgY29w eSkKQEAgLTEyNDcsNyArMTI0Nyw2IEBAIHB1YmxpYzoKICNpZiBIQVZFKENGTkVUV09SS19TVE9S QUdFX1BBUlRJVElPTklORykKICAgICB2b2lkIGhhc1N0b3JhZ2VBY2Nlc3MoU3RyaW5nJiYgc3Vi RnJhbWVIb3N0LCBTdHJpbmcmJiB0b3BGcmFtZUhvc3QsIHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2 NF90IHBhZ2VJRCwgdWludDY0X3Qgd2ViUHJvY2Vzc0NvbnRleHRJZCk7CiAgICAgdm9pZCByZXF1 ZXN0U3RvcmFnZUFjY2VzcyhTdHJpbmcmJiBzdWJGcmFtZUhvc3QsIFN0cmluZyYmIHRvcEZyYW1l SG9zdCwgdWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgcGFnZUlELCB1aW50NjRfdCB3ZWJQcm9j ZXNzQ29udGV4dElkKTsKLSAgICB2b2lkIHJlbW92ZVN0b3JhZ2VBY2Nlc3ModWludDY0X3QgZnJh bWVJRCwgdWludDY0X3QgcGFnZUlEKTsKICNlbmRpZgogCiAjaWYgRU5BQkxFKEFUVEFDSE1FTlRf RUxFTUVOVCkKSW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5tZXNz YWdlcy5pbgo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJv eHkubWVzc2FnZXMuaW4JKHJldmlzaW9uIDIyNjM2NSkKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL1dlYlBhZ2VQcm94eS5tZXNzYWdlcy5pbgkod29ya2luZyBjb3B5KQpAQCAtNTA1LDcgKzUw NSw2IEBAIG1lc3NhZ2VzIC0+IFdlYlBhZ2VQcm94eSB7CiAjaWYgSEFWRShDRk5FVFdPUktfU1RP UkFHRV9QQVJUSVRJT05JTkcpCiAgICAgSGFzU3RvcmFnZUFjY2VzcyhTdHJpbmcgc3ViRnJhbWVI b3N0LCBTdHJpbmcgdG9wRnJhbWVIb3N0LCB1aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCBwYWdl SUQsIHVpbnQ2NF90IGNvbnRleHRJRCkKICAgICBSZXF1ZXN0U3RvcmFnZUFjY2VzcyhTdHJpbmcg c3ViRnJhbWVIb3N0LCBTdHJpbmcgdG9wRnJhbWVIb3N0LCB1aW50NjRfdCBmcmFtZUlELCB1aW50 NjRfdCBwYWdlSUQsIHVpbnQ2NF90IGNvbnRleHRJRCkKLSAgICBSZW1vdmVTdG9yYWdlQWNjZXNz KHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IHBhZ2VJRCkKICNlbmRpZgogCiAjaWYgRU5BQkxF KEFUVEFDSE1FTlRfRUxFTUVOVCkKSW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL05ldHdv cmsvTmV0d29ya1Byb2Nlc3NQcm94eS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9V SVByb2Nlc3MvTmV0d29yay9OZXR3b3JrUHJvY2Vzc1Byb3h5LmNwcAkocmV2aXNpb24gMjI2MzY1 KQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvTmV0d29yay9OZXR3b3JrUHJvY2Vzc1Byb3h5 LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDI0LDExICs0MjQsNiBAQCB2b2lkIE5ldHdvcmtQcm9j ZXNzUHJveHk6OnVwZGF0ZVN0b3JhZ2VBCiAgICAgc2VuZChNZXNzYWdlczo6TmV0d29ya1Byb2Nl c3M6OlVwZGF0ZVN0b3JhZ2VBY2Nlc3NGb3JQcmV2YWxlbnREb21haW5zKHNlc3Npb25JRCwgcmVz b3VyY2VEb21haW4sIGZpcnN0UGFydHlEb21haW4sIGZyYW1lSUQsIHBhZ2VJRCwgdmFsdWUsIGNv bnRleHRJZCksIDApOwogfQogCi12b2lkIE5ldHdvcmtQcm9jZXNzUHJveHk6OnJlbW92ZVN0b3Jh Z2VBY2Nlc3MoUEFMOjpTZXNzaW9uSUQgc2Vzc2lvbklELCB1aW50NjRfdCBmcmFtZUlELCB1aW50 NjRfdCBwYWdlSUQpCi17Ci0gICAgc2VuZChNZXNzYWdlczo6TmV0d29ya1Byb2Nlc3M6OlJlbW92 ZVN0b3JhZ2VBY2Nlc3Moc2Vzc2lvbklELCBmcmFtZUlELCBwYWdlSUQpLCAwKTsKLX0KLQogdm9p ZCBOZXR3b3JrUHJvY2Vzc1Byb3h5OjpzdG9yYWdlQWNjZXNzUmVxdWVzdFJlc3VsdChib29sIHdh c0dyYW50ZWQsIHVpbnQ2NF90IGNvbnRleHRJZCkKIHsKICAgICBhdXRvIGNhbGxiYWNrID0gbV9z dG9yYWdlQWNjZXNzUmVzcG9uc2VDYWxsYmFja01hcC50YWtlKGNvbnRleHRJZCk7CkluZGV4OiBT b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9OZXR3b3JrL05ldHdvcmtQcm9jZXNzUHJveHkuaAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9OZXR3b3JrL05ldHdvcmtQcm9jZXNz UHJveHkuaAkocmV2aXNpb24gMjI2MzY1KQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvTmV0 d29yay9OZXR3b3JrUHJvY2Vzc1Byb3h5LmgJKHdvcmtpbmcgY29weSkKQEAgLTgwLDcgKzgwLDYg QEAgcHVibGljOgogI2lmIEhBVkUoQ0ZORVRXT1JLX1NUT1JBR0VfUEFSVElUSU9OSU5HKQogICAg IHZvaWQgaGFzU3RvcmFnZUFjY2Vzc0ZvclByZXZhbGVudERvbWFpbnMoUEFMOjpTZXNzaW9uSUQs IGNvbnN0IFN0cmluZyYgcmVzb3VyY2VEb21haW4sIGNvbnN0IFN0cmluZyYgZmlyc3RQYXJ0eURv bWFpbiwgdWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgcGFnZUlELCBDb21wbGV0aW9uSGFuZGxl cjx2b2lkKGJvb2wpPiYmIGNhbGxiYWNrKTsKICAgICB2b2lkIHVwZGF0ZVN0b3JhZ2VBY2Nlc3NG b3JQcmV2YWxlbnREb21haW5zKFBBTDo6U2Vzc2lvbklELCBjb25zdCBTdHJpbmcmIHJlc291cmNl RG9tYWluLCBjb25zdCBTdHJpbmcmIGZpcnN0UGFydHlEb21haW4sIHVpbnQ2NF90IGZyYW1lSUQs IHVpbnQ2NF90IHBhZ2VJRCwgYm9vbCB2YWx1ZSwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChib29s KT4mJiBjYWxsYmFjayk7Ci0gICAgdm9pZCByZW1vdmVTdG9yYWdlQWNjZXNzKFBBTDo6U2Vzc2lv bklELCB1aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCBwYWdlSUQpOwogI2VuZGlmCiAKICAgICB2 b2lkIHByb2Nlc3NSZWFkeVRvU3VzcGVuZCgpOwpJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nl c3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYktpdC9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5jcHAJKHJldmlz aW9uIDIyNjM2NSkKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNp dGVEYXRhU3RvcmUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMjEzLDEyICsxMjEzLDYgQEAgdm9p ZCBXZWJzaXRlRGF0YVN0b3JlOjpyZXF1ZXN0U3RvcmFnZUFjYwogICAgIAogICAgIG1fcmVzb3Vy Y2VMb2FkU3RhdGlzdGljcy0+cmVxdWVzdFN0b3JhZ2VBY2Nlc3MoV1RGTW92ZShzdWJGcmFtZUhv c3QpLCBXVEZNb3ZlKHRvcEZyYW1lSG9zdCksIGZyYW1lSUQsIHBhZ2VJRCwgV1RGTW92ZShjYWxs YmFjaykpOwogfQotCi12b2lkIFdlYnNpdGVEYXRhU3RvcmU6OnJlbW92ZVN0b3JhZ2VBY2Nlc3Mo dWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgcGFnZUlEKQotewotICAgIGZvciAoYXV0byYgcHJv Y2Vzc1Bvb2wgOiBwcm9jZXNzUG9vbHMoKSkKLSAgICAgICAgcHJvY2Vzc1Bvb2wtPm5ldHdvcmtQ cm9jZXNzKCktPnJlbW92ZVN0b3JhZ2VBY2Nlc3MobV9zZXNzaW9uSUQsIGZyYW1lSUQsIHBhZ2VJ RCk7Ci19CiAjZW5kaWYKIAogdm9pZCBXZWJzaXRlRGF0YVN0b3JlOjpuZXR3b3JrUHJvY2Vzc0Rp ZENyYXNoKCkKSW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNp dGVEYXRhU3RvcmUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJz aXRlRGF0YS9XZWJzaXRlRGF0YVN0b3JlLmgJKHJldmlzaW9uIDIyNjM2NSkKKysrIFNvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUuaAkod29ya2luZyBj b3B5KQpAQCAtMTIzLDcgKzEyMyw2IEBAIHB1YmxpYzoKICAgICB2b2lkIHJlbW92ZVByZXZhbGVu dERvbWFpbnMoY29uc3QgVmVjdG9yPFN0cmluZz4mIGRvbWFpbnMpOwogICAgIHZvaWQgaGFzU3Rv cmFnZUFjY2VzcyhTdHJpbmcmJiBzdWJGcmFtZUhvc3QsIFN0cmluZyYmIHRvcEZyYW1lSG9zdCwg dWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgcGFnZUlELCBXVEY6OkNvbXBsZXRpb25IYW5kbGVy PHZvaWQgKGJvb2wpPiYmIGNhbGxiYWNrKTsKICAgICB2b2lkIHJlcXVlc3RTdG9yYWdlQWNjZXNz KFN0cmluZyYmIHN1YkZyYW1lSG9zdCwgU3RyaW5nJiYgdG9wRnJhbWVIb3N0LCB1aW50NjRfdCBm cmFtZUlELCB1aW50NjRfdCBwYWdlSUQsIFdURjo6Q29tcGxldGlvbkhhbmRsZXI8dm9pZCAoYm9v bCk+JiYgY2FsbGJhY2spOwotICAgIHZvaWQgcmVtb3ZlU3RvcmFnZUFjY2Vzcyh1aW50NjRfdCBm cmFtZUlELCB1aW50NjRfdCBwYWdlSUQpOwogI2VuZGlmCiAgICAgdm9pZCBuZXR3b3JrUHJvY2Vz c0RpZENyYXNoKCk7CiAgICAgdm9pZCByZXNvbHZlRGlyZWN0b3JpZXNJZk5lY2Vzc2FyeSgpOwpJ bmRleDogU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9h ZGVyQ2xpZW50LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2Vi Q29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwCShyZXZpc2lvbiAyMjYzNjUpCisr KyBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJD bGllbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zNiw2ICszNiw4IEBACiAjaW5jbHVkZSAiSW5q ZWN0ZWRCdW5kbGVET01XaW5kb3dFeHRlbnNpb24uaCIKICNpbmNsdWRlICJJbmplY3RlZEJ1bmRs ZU5hdmlnYXRpb25BY3Rpb24uaCIKICNpbmNsdWRlICJOYXZpZ2F0aW9uQWN0aW9uRGF0YS5oIgor I2luY2x1ZGUgIk5ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzTWVzc2FnZXMuaCIKKyNpbmNs dWRlICJOZXR3b3JrUHJvY2Vzc0Nvbm5lY3Rpb24uaCIKICNpbmNsdWRlICJQbHVnaW5WaWV3Lmgi CiAjaW5jbHVkZSAiVXNlckRhdGEuaCIKICNpbmNsdWRlICJXS0J1bmRsZUFQSUNhc3QuaCIKQEAg LTE2OCw3ICsxNzAsNyBAQCB2b2lkIFdlYkZyYW1lTG9hZGVyQ2xpZW50OjpkZXRhY2hlZEZyb21Q CiAKICNpZiBIQVZFKENGTkVUV09SS19TVE9SQUdFX1BBUlRJVElPTklORykKICAgICBpZiAobV9o YXNGcmFtZVNwZWNpZmljU3RvcmFnZUFjY2VzcykgewotICAgICAgICB3ZWJQYWdlLT5zZW5kKE1l c3NhZ2VzOjpXZWJQYWdlUHJveHk6OlJlbW92ZVN0b3JhZ2VBY2Nlc3MoZnJhbWVJRCgpLnZhbHVl KCksIHBhZ2VJRCgpLnZhbHVlKCkpKTsKKyAgICAgICAgV2ViUHJvY2Vzczo6c2luZ2xldG9uKCku ZW5zdXJlTmV0d29ya1Byb2Nlc3NDb25uZWN0aW9uKCkuY29ubmVjdGlvbigpLnNlbmQoTWVzc2Fn ZXM6Ok5ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzOjpSZW1vdmVTdG9yYWdlQWNjZXNzKHNl c3Npb25JRCgpLCBmcmFtZUlEKCkudmFsdWUoKSwgcGFnZUlEKCkudmFsdWUoKSksIDApOwogICAg ICAgICBtX2hhc0ZyYW1lU3BlY2lmaWNTdG9yYWdlQWNjZXNzID0gZmFsc2U7CiAgICAgfQogI2Vu ZGlmCkBAIC0zOTAsNyArMzkyLDcgQEAgdm9pZCBXZWJGcmFtZUxvYWRlckNsaWVudDo6ZGlzcGF0 Y2hXaWxsQwogICAgICAgICByZXR1cm47CiAKICAgICBpZiAobV9oYXNGcmFtZVNwZWNpZmljU3Rv cmFnZUFjY2VzcykgewotICAgICAgICB3ZWJQYWdlLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlUHJv eHk6OlJlbW92ZVN0b3JhZ2VBY2Nlc3MoZnJhbWVJRCgpLnZhbHVlKCksIHBhZ2VJRCgpLnZhbHVl KCkpKTsKKyAgICAgICAgV2ViUHJvY2Vzczo6c2luZ2xldG9uKCkuZW5zdXJlTmV0d29ya1Byb2Nl c3NDb25uZWN0aW9uKCkuY29ubmVjdGlvbigpLnNlbmQoTWVzc2FnZXM6Ok5ldHdvcmtDb25uZWN0 aW9uVG9XZWJQcm9jZXNzOjpSZW1vdmVTdG9yYWdlQWNjZXNzKHNlc3Npb25JRCgpLCBmcmFtZUlE KCkudmFsdWUoKSwgcGFnZUlEKCkudmFsdWUoKSksIDApOwogICAgICAgICBtX2hhc0ZyYW1lU3Bl Y2lmaWNTdG9yYWdlQWNjZXNzID0gZmFsc2U7CiAgICAgfQogI2VuZGlmCkluZGV4OiBMYXlvdXRU ZXN0cy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCShyZXZp c2lvbiAyMjYzNjUpCisrKyBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAg LTEsMyArMSwyNCBAQAorMjAxOC0wMS0wMyAgSm9obiBXaWxhbmRlciAgPHdpbGFuZGVyQGFwcGxl LmNvbT4KKworICAgICAgICBTdG9yYWdlIEFjY2VzcyBBUEk6IFJlZmFjdG9yIFhQQyBmb3IgYWNj ZXNzIHJlbW92YWwgdG8gZ28gc3RyYWlnaHQgZnJvbSB0aGUgd2ViIHByb2Nlc3MgdG8gdGhlIG5l dHdvcmsgcHJvY2VzcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTgxMjcwCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zNjI4OTU0ND4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIGNoYW5nZSByZWZh Y3RvcnMgaG93IHRoZSB3ZWIgcHJvY2VzcyB0ZWxscyB0aGUgbmV0d29yayBwcm9jZXNzCisgICAg ICAgIHRvIHJlbW92ZSBzdG9yYWdlIGFjY2Vzcy4gUHJldmlvdXNseSwgdGhpcyB3YXMgZG9uZSBv dmVyIHRoZSBVSSBwcm9jZXNzCisgICAgICAgIGp1c3QgbGlrZSByZXF1ZXN0cyBmb3Igc3RvcmFn ZSBhY2Nlc3MuIEJ1dCBzaW5jZSBubyBmdXJ0aGVyIHJlYXNvbmluZworICAgICAgICBpcyBuZWVk ZWQsIHRoZSBtZXNzYWdlIHNob3VsZCBnbyBzdHJhaWdodCBmcm9tIHRoZSB3ZWIgcHJvY2VzcyB0 byB0aGUKKyAgICAgICAgbmV0d29yayBwcm9jZXNzIGZvciBwZXJmb3JtYW5jZSByZWFzb25zIGFu ZCB0byBtaW5pbWl6ZSB0aGUgcmlzayBvZiBhCisgICAgICAgIHJhY2UuCisKKyAgICAgICAgQXMg YSBjb25zZXF1ZW5jZSwgdGhlIFhQQyBjb2RlIGZvciBzdG9yYWdlIGFjY2VzcyByZW1vdmFsIGlu IHRoZSBVSQorICAgICAgICBwcm9jZXNzIGlzIGRlbGV0ZWQuCisKKyAgICAgICAgKiBwbGF0Zm9y bS9tYWMtd2syL1Rlc3RFeHBlY3RhdGlvbnM6CisgICAgICAgICAgICBSZS1lbmFibGVzIHRoZSB0 ZXN0IGZvciB0aGlzIGNvZGUgcGF0aC4KKwogMjAxOC0wMS0wMyAgU2ltb24gRnJhc2VyICA8c2lt b24uZnJhc2VyQGFwcGxlLmNvbT4KIAogICAgICAgICBTVkcgbGlnaHRpbmcgZmlsdGVyIGxpZ2h0 cyBhcmUgaW4gdGhlIHdyb25nIGNvb3JkaW5hdGUgc3lzdGVtCkluZGV4OiBMYXlvdXRUZXN0cy9w bGF0Zm9ybS9tYWMtd2syL1Rlc3RFeHBlY3RhdGlvbnMKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVz dHMvcGxhdGZvcm0vbWFjLXdrMi9UZXN0RXhwZWN0YXRpb25zCShyZXZpc2lvbiAyMjYzNjUpCisr KyBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMtd2syL1Rlc3RFeHBlY3RhdGlvbnMJKHdvcmtpbmcg Y29weSkKQEAgLTc1OSw2ICs3NTksNyBAQCBodHRwL3Rlc3RzL3Jlc291cmNlTG9hZFN0YXRpc3Rp Y3MvdXNlci1pCiBbIEhpZ2hTaWVycmErIF0gaHR0cC90ZXN0cy9zdG9yYWdlQWNjZXNzL3JlcXVl c3Qtc3RvcmFnZS1hY2Nlc3Mtc2FtZS1vcmlnaW4tc2FuZGJveGVkLWlmcmFtZS5odG1sIFsgUGFz cyBdCiBbIEhpZ2hTaWVycmErIF0gaHR0cC90ZXN0cy9zdG9yYWdlQWNjZXNzL3JlcXVlc3QtYW5k LWdyYW50LXN0b3JhZ2UtYWNjZXNzLWNyb3NzLW9yaWdpbi1zYW5kYm94ZWQtbmVzdGVkLWlmcmFt ZS5odG1sIFsgUGFzcyBdCiBbIEhpZ2hTaWVycmErIF0gaHR0cC90ZXN0cy9zdG9yYWdlQWNjZXNz L3JlcXVlc3QtYW5kLWdyYW50LXN0b3JhZ2UtYWNjZXNzLWNyb3NzLW9yaWdpbi1zYW5kYm94ZWQt aWZyYW1lLWZyb20tcHJldmFsZW50LWRvbWFpbi13aXRoLXJlY2VudC11c2VyLWludGVyYWN0aW9u Lmh0bWwgWyBQYXNzIF0KK1sgSGlnaFNpZXJyYSsgXSBodHRwL3Rlc3RzL3N0b3JhZ2VBY2Nlc3Mv cmVxdWVzdC1hbmQtZ3JhbnQtc3RvcmFnZS1hY2Nlc3MtY3Jvc3Mtb3JpZ2luLXNhbmRib3hlZC1p ZnJhbWUtZnJvbS1wcmV2YWxlbnQtZG9tYWluLXdpdGgtbm9uLXJlY2VudC11c2VyLWludGVyYWN0 aW9uLWFuZC10cnktYWNjZXNzLWZyb20tcmlnaHQtZnJhbWUuaHRtbCBbIFBhc3MgXQogWyBIaWdo U2llcnJhKyBdIGh0dHAvdGVzdHMvc3RvcmFnZUFjY2Vzcy9yZXF1ZXN0LWFuZC1ncmFudC1zdG9y YWdlLWFjY2Vzcy1jcm9zcy1vcmlnaW4tc2FuZGJveGVkLWlmcmFtZS1mcm9tLXByZXZhbGVudC1k b21haW4td2l0aC1ub24tcmVjZW50LXVzZXItaW50ZXJhY3Rpb24tYnV0LXRyeS1hY2Nlc3MtZnJv bS13cm9uZy1mcmFtZS5odG1sIFsgUGFzcyBdCiBbIEhpZ2hTaWVycmErIF0gaHR0cC90ZXN0cy9z dG9yYWdlQWNjZXNzL3JlcXVlc3QtYW5kLWdyYW50LXN0b3JhZ2UtYWNjZXNzLWNyb3NzLW9yaWdp bi1zYW5kYm94ZWQtaWZyYW1lLWZyb20tcHJldmFsZW50LWRvbWFpbi13aXRob3V0LXVzZXItaW50 ZXJhY3Rpb24uaHRtbCBbIFBhc3MgXQogWyBIaWdoU2llcnJhKyBdIGh0dHAvdGVzdHMvc3RvcmFn ZUFjY2Vzcy9yZXF1ZXN0LXN0b3JhZ2UtYWNjZXNzLXRvcC1mcmFtZS5odG1sIFsgUGFzcyBdCg== 330435 2018-01-03 19:40:22 -0800 2018-01-03 20:22:02 -0800 Patch bug-181270-20180103194021.patch text/plain 19806 wilander SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIyNjM2NSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMwIEBACisyMDE4LTAxLTAzICBKb2huIFdp bGFuZGVyICA8d2lsYW5kZXJAYXBwbGUuY29tPgorCisgICAgICAgIFN0b3JhZ2UgQWNjZXNzIEFQ STogUmVmYWN0b3IgWFBDIGZvciBhY2Nlc3MgcmVtb3ZhbCB0byBnbyBzdHJhaWdodCBmcm9tIHRo ZSB3ZWIgcHJvY2VzcyB0byB0aGUgbmV0d29yayBwcm9jZXNzCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODEyNzAKKyAgICAgICAgPHJkYXI6Ly9wcm9i bGVtLzM2Mjg5NTQ0PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIE5vIG5ldyB0ZXN0cy4gRXhpc3RpbmcgdGVzdCByZS1lbmFibGVkLgorCisgICAgICAg IFRoaXMgY2hhbmdlIHJlZmFjdG9ycyBob3cgdGhlIHdlYiBwcm9jZXNzIHRlbGxzIHRoZSBuZXR3 b3JrIHByb2Nlc3MKKyAgICAgICAgdG8gcmVtb3ZlIHN0b3JhZ2UgYWNjZXNzLiBQcmV2aW91c2x5 LCB0aGlzIHdhcyBkb25lIG92ZXIgdGhlIFVJIHByb2Nlc3MKKyAgICAgICAganVzdCBsaWtlIHJl cXVlc3RzIGZvciBzdG9yYWdlIGFjY2Vzcy4gQnV0IHNpbmNlIG5vIGZ1cnRoZXIgcmVhc29uaW5n CisgICAgICAgIGlzIG5lZWRlZCwgdGhlIG1lc3NhZ2Ugc2hvdWxkIGdvIHN0cmFpZ2h0IGZyb20g dGhlIHdlYiBwcm9jZXNzIHRvIHRoZQorICAgICAgICBuZXR3b3JrIHByb2Nlc3MgZm9yIHBlcmZv cm1hbmNlIHJlYXNvbnMgYW5kIHRvIG1pbmltaXplIHRoZSByaXNrIG9mIGEKKyAgICAgICAgcmFj ZS4KKworICAgICAgICBBcyBhIGNvbnNlcXVlbmNlLCB0aGUgWFBDIGNvZGUgZm9yIHN0b3JhZ2Ug YWNjZXNzIHJlbW92YWwgaW4gdGhlIFVJCisgICAgICAgIHByb2Nlc3MgaXMgZGVsZXRlZC4KKwor ICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvY2YvTmV0d29ya1N0b3JhZ2VTZXNzaW9uQ0ZOZXQu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6TmV0d29ya1N0b3JhZ2VTZXNzaW9uOjpjb29raWVTdG9y YWdlUGFydGl0aW9uIGNvbnN0KToKKyAgICAgICAgICAgIFJlbW92ZXMgdGhlIHN0b3JhZ2VBY2Nl c3NBUElFbmFibGVkIGNoZWNrIHNpbmNlIHRoZSBmbGFnCisgICAgICAgICAgICBkb2Vzbid0IGdl dCBwcm9wYWdhdGVkIHdoZW4gdGhlIG5ldHdvcmsgcHJvY2VzcyBpcyBjcmVhdGVkLgorICAgICAg ICAgICAgRmlndXJpbmcgdGhpcyBvdXQgd2lsbCB0YWtlIHNvbWUgd29yayB3aGljaCBpcyB1bm5l Y2Vzc2FyeQorICAgICAgICAgICAgd2hlbiB3ZSBhbHJlYWR5IGdhdGUgYWNjZXNzIHRvIHRoZSBm ZWF0dXJlIGluIERvY3VtZW50LmlkbC4KKwogMjAxOC0wMS0wMyAgU2ltb24gRnJhc2VyICA8c2lt b24uZnJhc2VyQGFwcGxlLmNvbT4KIAogICAgICAgICBTVkcgbGlnaHRpbmcgZmlsdGVyIGxpZ2h0 cyBhcmUgaW4gdGhlIHdyb25nIGNvb3JkaW5hdGUgc3lzdGVtCkluZGV4OiBTb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9uZXR3b3JrL2NmL05ldHdvcmtTdG9yYWdlU2Vzc2lvbkNGTmV0LmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2NmL05ldHdvcmtTdG9y YWdlU2Vzc2lvbkNGTmV0LmNwcAkocmV2aXNpb24gMjI2MzY1KQorKysgU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vbmV0d29yay9jZi9OZXR3b3JrU3RvcmFnZVNlc3Npb25DRk5ldC5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTE5Niw3ICsxOTYsNyBAQCBTdHJpbmcgTmV0d29ya1N0b3JhZ2VTZXNzaW9u Ojpjb29raWVTdG9yCiAgICAgaWYgKGZpcnN0UGFydHlEb21haW4gPT0gcmVzb3VyY2VEb21haW4p CiAgICAgICAgIHJldHVybiBlbXB0eVN0cmluZygpOwogCi0gICAgaWYgKHN0b3JhZ2VBY2Nlc3NB UElFbmFibGVkICYmIGZyYW1lSUQgJiYgcGFnZUlEICYmIGlzU3RvcmFnZUFjY2Vzc0dyYW50ZWQo cmVzb3VyY2VEb21haW4sIGZpcnN0UGFydHlEb21haW4sIGZyYW1lSUQudmFsdWUoKSwgcGFnZUlE LnZhbHVlKCkpKQorICAgIGlmIChmcmFtZUlEICYmIHBhZ2VJRCAmJiBpc1N0b3JhZ2VBY2Nlc3NH cmFudGVkKHJlc291cmNlRG9tYWluLCBmaXJzdFBhcnR5RG9tYWluLCBmcmFtZUlELnZhbHVlKCks IHBhZ2VJRC52YWx1ZSgpKSkKICAgICAgICAgcmV0dXJuIGVtcHR5U3RyaW5nKCk7CiAKICAgICBy ZXR1cm4gZmlyc3RQYXJ0eURvbWFpbjsKSW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMjYzODYpCisr KyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQ1IEBA CisyMDE4LTAxLTAzICBKb2huIFdpbGFuZGVyICA8d2lsYW5kZXJAYXBwbGUuY29tPgorCisgICAg ICAgIFN0b3JhZ2UgQWNjZXNzIEFQSTogUmVmYWN0b3IgWFBDIGZvciBhY2Nlc3MgcmVtb3ZhbCB0 byBnbyBzdHJhaWdodCBmcm9tIHRoZSB3ZWIgcHJvY2VzcyB0byB0aGUgbmV0d29yayBwcm9jZXNz CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODEyNzAK KyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzM2Mjg5NTQ0PgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgY2hhbmdlIHJlZmFjdG9ycyBob3cgdGhl IHdlYiBwcm9jZXNzIHRlbGxzIHRoZSBuZXR3b3JrIHByb2Nlc3MKKyAgICAgICAgdG8gcmVtb3Zl IHN0b3JhZ2UgYWNjZXNzLiBQcmV2aW91c2x5LCB0aGlzIHdhcyBkb25lIG92ZXIgdGhlIFVJIHBy b2Nlc3MKKyAgICAgICAganVzdCBsaWtlIHJlcXVlc3RzIGZvciBzdG9yYWdlIGFjY2Vzcy4gQnV0 IHNpbmNlIG5vIGZ1cnRoZXIgcmVhc29uaW5nCisgICAgICAgIGlzIG5lZWRlZCwgdGhlIG1lc3Nh Z2Ugc2hvdWxkIGdvIHN0cmFpZ2h0IGZyb20gdGhlIHdlYiBwcm9jZXNzIHRvIHRoZQorICAgICAg ICBuZXR3b3JrIHByb2Nlc3MgZm9yIHBlcmZvcm1hbmNlIHJlYXNvbnMgYW5kIHRvIG1pbmltaXpl IHRoZSByaXNrIG9mIGEKKyAgICAgICAgcmFjZS4KKworICAgICAgICBBcyBhIGNvbnNlcXVlbmNl LCB0aGUgWFBDIGNvZGUgZm9yIHN0b3JhZ2UgYWNjZXNzIHJlbW92YWwgaW4gdGhlIFVJCisgICAg ICAgIHByb2Nlc3MgaXMgZGVsZXRlZC4KKworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL05ldHdv cmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzLmNwcDoKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya0Nv bm5lY3Rpb25Ub1dlYlByb2Nlc3M6OnJlbW92ZVN0b3JhZ2VBY2Nlc3MpOgorICAgICAgICAqIE5l dHdvcmtQcm9jZXNzL05ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzLmg6CisgICAgICAgICog TmV0d29ya1Byb2Nlc3MvTmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3MubWVzc2FnZXMuaW46 CisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3MuY3BwOgorICAgICAgICAo V2ViS2l0OjpOZXR3b3JrUHJvY2Vzczo6cmVtb3ZlU3RvcmFnZUFjY2Vzcyk6IERlbGV0ZWQuCisg ICAgICAgICogTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3MuaDoKKyAgICAgICAgKiBOZXR3 b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzcy5tZXNzYWdlcy5pbjoKKyAgICAgICAgKiBVSVByb2Nl c3MvTmV0d29yay9OZXR3b3JrUHJvY2Vzc1Byb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6TmV0 d29ya1Byb2Nlc3NQcm94eTo6cmVtb3ZlU3RvcmFnZUFjY2Vzcyk6IERlbGV0ZWQuCisgICAgICAg ICogVUlQcm9jZXNzL05ldHdvcmsvTmV0d29ya1Byb2Nlc3NQcm94eS5oOgorICAgICAgICAqIFVJ UHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6 OnJlcXVlc3RTdG9yYWdlQWNjZXNzKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5Ojpy ZW1vdmVTdG9yYWdlQWNjZXNzKTogRGVsZXRlZC4KKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFn ZVByb3h5Lmg6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5tZXNzYWdlcy5pbjoK KyAgICAgICAgKiBVSVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5jcHA6Cisg ICAgICAgIChXZWJLaXQ6OldlYnNpdGVEYXRhU3RvcmU6OnJlcXVlc3RTdG9yYWdlQWNjZXNzKToK KyAgICAgICAgKFdlYktpdDo6V2Vic2l0ZURhdGFTdG9yZTo6cmVtb3ZlU3RvcmFnZUFjY2Vzcyk6 IERlbGV0ZWQuCisgICAgICAgICogVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3Rv cmUuaDoKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVy Q2xpZW50LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViRnJhbWVMb2FkZXJDbGllbnQ6OmRldGFj aGVkRnJvbVBhcmVudDIpOgorICAgICAgICAoV2ViS2l0OjpXZWJGcmFtZUxvYWRlckNsaWVudDo6 ZGlzcGF0Y2hXaWxsQ2hhbmdlRG9jdW1lbnQpOgorCiAyMDE4LTAxLTAzICBCcmVudCBGdWxnaGFt ICA8YmZ1bGdoYW1AYXBwbGUuY29tPgogCiAgICAgICAgIFttYWNPU10gQ29uc3RhbnQgZnJhbWUg ZHJvcHBpbmcgZHVyaW5nIEZsYXNoIHZpZGVvIHBsYXliYWNrCkluZGV4OiBTb3VyY2UvV2ViS2l0 L05ldHdvcmtQcm9jZXNzL05ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzLmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtDb25uZWN0aW9uVG9X ZWJQcm9jZXNzLmNwcAkocmV2aXNpb24gMjI2MzY1KQorKysgU291cmNlL1dlYktpdC9OZXR3b3Jr UHJvY2Vzcy9OZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vzcy5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTQ3MSw0ICs0NzEsMTUgQEAgdm9pZCBOZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vzczo6 ZW5zdQogICAgIE5ldHdvcmtQcm9jZXNzOjpzaW5nbGV0b24oKS5hZGRXZWJzaXRlRGF0YVN0b3Jl KFdlYnNpdGVEYXRhU3RvcmVQYXJhbWV0ZXJzOjpsZWdhY3lQcml2YXRlU2Vzc2lvblBhcmFtZXRl cnMoKSk7CiB9CiAKK3ZvaWQgTmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3M6OnJlbW92ZVN0 b3JhZ2VBY2Nlc3MoUEFMOjpTZXNzaW9uSUQgc2Vzc2lvbklELCB1aW50NjRfdCBmcmFtZUlELCB1 aW50NjRfdCBwYWdlSUQpCit7CisjaWYgSEFWRShDRk5FVFdPUktfU1RPUkFHRV9QQVJUSVRJT05J TkcpCisgICAgc3RvcmFnZVNlc3Npb24oc2Vzc2lvbklEKS5yZW1vdmVTdG9yYWdlQWNjZXNzKGZy YW1lSUQsIHBhZ2VJRCk7CisjZWxzZQorICAgIFVOVVNFRF9QQVJBTShzZXNzaW9uSUQpOworICAg IFVOVVNFRF9QQVJBTShmcmFtZUlEKTsKKyAgICBVTlVTRURfUEFSQU0ocGFnZUlEKTsKKyNlbmRp ZgorfQorCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKSW5kZXg6IFNvdXJjZS9XZWJLaXQvTmV0d29y a1Byb2Nlc3MvTmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3MuaAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNz LmgJKHJldmlzaW9uIDIyNjM2NSkKKysrIFNvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0 d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3MuaAkod29ya2luZyBjb3B5KQpAQCAtMTMzLDYgKzEz Myw4IEBAIHByaXZhdGU6CiAKICAgICBDYWNoZVN0b3JhZ2VFbmdpbmVDb25uZWN0aW9uJiBjYWNo ZVN0b3JhZ2VDb25uZWN0aW9uKCk7CiAKKyAgICB2b2lkIHJlbW92ZVN0b3JhZ2VBY2Nlc3MoUEFM OjpTZXNzaW9uSUQsIHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IHBhZ2VJRCk7CisKICAgICBS ZWY8SVBDOjpDb25uZWN0aW9uPiBtX2Nvbm5lY3Rpb247CiAKICAgICBIYXNoTWFwPHVpbnQ2NF90 LCBSZWZQdHI8TmV0d29ya1NvY2tldFN0cmVhbT4+IG1fbmV0d29ya1NvY2tldFN0cmVhbXM7Cklu ZGV4OiBTb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtDb25uZWN0aW9uVG9XZWJQ cm9jZXNzLm1lc3NhZ2VzLmluCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvTmV0d29ya1By b2Nlc3MvTmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3MubWVzc2FnZXMuaW4JKHJldmlzaW9u IDIyNjM2NSkKKysrIFNvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya0Nvbm5lY3Rp b25Ub1dlYlByb2Nlc3MubWVzc2FnZXMuaW4JKHdvcmtpbmcgY29weSkKQEAgLTU3LDQgKzU3LDYg QEAgbWVzc2FnZXMgLT4gTmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2NlcwogICAgIENyZWF0ZVNv Y2tldFN0cmVhbShXZWJDb3JlOjpVUkwgdXJsLCBQQUw6OlNlc3Npb25JRCBzZXNzaW9uSUQsIFN0 cmluZyBjYWNoZVBhcnRpdGlvbiwgdWludDY0X3QgaWRlbnRpZmllcikKIAogICAgIEVuc3VyZUxl Z2FjeVByaXZhdGVCcm93c2luZ1Nlc3Npb24oKQorCisgICAgUmVtb3ZlU3RvcmFnZUFjY2VzcyhQ QUw6OlNlc3Npb25JRCBzZXNzaW9uSUQsIHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IHBhZ2VJ RCk7CiB9CkluZGV4OiBTb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9jZXNz LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtQ cm9jZXNzLmNwcAkocmV2aXNpb24gMjI2MzY1KQorKysgU291cmNlL1dlYktpdC9OZXR3b3JrUHJv Y2Vzcy9OZXR3b3JrUHJvY2Vzcy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM2MCwxNCArMzYwLDYg QEAgdm9pZCBOZXR3b3JrUHJvY2Vzczo6dXBkYXRlU3RvcmFnZUFjY2VzcwogICAgIHBhcmVudFBy b2Nlc3NDb25uZWN0aW9uKCktPnNlbmQoTWVzc2FnZXM6Ok5ldHdvcmtQcm9jZXNzUHJveHk6OlN0 b3JhZ2VBY2Nlc3NSZXF1ZXN0UmVzdWx0KGlzU3RvcmFnZUdyYW50ZWQsIGNvbnRleHRJZCksIDAp OwogfQogCi12b2lkIE5ldHdvcmtQcm9jZXNzOjpyZW1vdmVTdG9yYWdlQWNjZXNzKFBBTDo6U2Vz c2lvbklEIHNlc3Npb25JRCwgdWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgcGFnZUlEKQotewot ICAgIGlmIChhdXRvKiBuZXR3b3JrU3RvcmFnZVNlc3Npb24gPSBOZXR3b3JrU3RvcmFnZVNlc3Np b246OnN0b3JhZ2VTZXNzaW9uKHNlc3Npb25JRCkpCi0gICAgICAgIG5ldHdvcmtTdG9yYWdlU2Vz c2lvbi0+cmVtb3ZlU3RvcmFnZUFjY2VzcyhmcmFtZUlELCBwYWdlSUQpOwotICAgIGVsc2UKLSAg ICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7Ci19Ci0KIHZvaWQgTmV0d29ya1Byb2Nlc3M6OnJl bW92ZVByZXZhbGVudERvbWFpbnMoUEFMOjpTZXNzaW9uSUQgc2Vzc2lvbklELCBjb25zdCBWZWN0 b3I8U3RyaW5nPiYgZG9tYWlucykKIHsKICAgICBpZiAoYXV0byogbmV0d29ya1N0b3JhZ2VTZXNz aW9uID0gTmV0d29ya1N0b3JhZ2VTZXNzaW9uOjpzdG9yYWdlU2Vzc2lvbihzZXNzaW9uSUQpKQpJ bmRleDogU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzcy5oCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3MuaAko cmV2aXNpb24gMjI2MzY1KQorKysgU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3Jr UHJvY2Vzcy5oCSh3b3JraW5nIGNvcHkpCkBAIC0xNDAsNyArMTQwLDYgQEAgcHVibGljOgogICAg IHZvaWQgdXBkYXRlUHJldmFsZW50RG9tYWluc1RvUGFydGl0aW9uT3JCbG9ja0Nvb2tpZXMoUEFM OjpTZXNzaW9uSUQsIGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBkb21haW5zVG9QYXJ0aXRpb24sIGNv bnN0IFZlY3RvcjxTdHJpbmc+JiBkb21haW5zVG9CbG9jaywgY29uc3QgVmVjdG9yPFN0cmluZz4m IGRvbWFpbnNUb05laXRoZXJQYXJ0aXRpb25Ob3JCbG9jaywgYm9vbCBzaG91bGRDbGVhckZpcnN0 KTsKICAgICB2b2lkIGhhc1N0b3JhZ2VBY2Nlc3NGb3JQcmV2YWxlbnREb21haW5zKFBBTDo6U2Vz c2lvbklELCBjb25zdCBTdHJpbmcmIHJlc291cmNlRG9tYWluLCBjb25zdCBTdHJpbmcmIGZpcnN0 UGFydHlEb21haW4sIHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IHBhZ2VJRCwgdWludDY0X3Qg Y29udGV4dElkKTsKICAgICB2b2lkIHVwZGF0ZVN0b3JhZ2VBY2Nlc3NGb3JQcmV2YWxlbnREb21h aW5zKFBBTDo6U2Vzc2lvbklELCBjb25zdCBTdHJpbmcmIHJlc291cmNlRG9tYWluLCBjb25zdCBT dHJpbmcmIGZpcnN0UGFydHlEb21haW4sIHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IHBhZ2VJ RCwgYm9vbCB2YWx1ZSwgdWludDY0X3QgY29udGV4dElkKTsKLSAgICB2b2lkIHJlbW92ZVN0b3Jh Z2VBY2Nlc3MoUEFMOjpTZXNzaW9uSUQsIHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IHBhZ2VJ RCk7CiAgICAgdm9pZCByZW1vdmVQcmV2YWxlbnREb21haW5zKFBBTDo6U2Vzc2lvbklELCBjb25z dCBWZWN0b3I8U3RyaW5nPiYgZG9tYWlucyk7CiAjZW5kaWYKIApJbmRleDogU291cmNlL1dlYktp dC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzcy5tZXNzYWdlcy5pbgo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzLm1lc3NhZ2VzLmlu CShyZXZpc2lvbiAyMjYzNjUpCisrKyBTb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdv cmtQcm9jZXNzLm1lc3NhZ2VzLmluCSh3b3JraW5nIGNvcHkpCkBAIC04NSw3ICs4NSw2IEBAIG1l c3NhZ2VzIC0+IE5ldHdvcmtQcm9jZXNzIExlZ2FjeVJlY2VpdmUKICAgICBVcGRhdGVQcmV2YWxl bnREb21haW5zVG9QYXJ0aXRpb25PckJsb2NrQ29va2llcyhQQUw6OlNlc3Npb25JRCBzZXNzaW9u SUQsIFZlY3RvcjxTdHJpbmc+IGRvbWFpbnNUb1BhcnRpdGlvbiwgVmVjdG9yPFN0cmluZz4gZG9t YWluc1RvQmxvY2ssIFZlY3RvcjxTdHJpbmc+IGRvbWFpbnNUb05laXRoZXJQYXJ0aXRpb25Ob3JC bG9jaywgYm9vbCBzaG91bGRDbGVhckZpcnN0KQogICAgIEhhc1N0b3JhZ2VBY2Nlc3NGb3JQcmV2 YWxlbnREb21haW5zKFBBTDo6U2Vzc2lvbklEIHNlc3Npb25JRCwgU3RyaW5nIHJlc291cmNlRG9t YWluLCBTdHJpbmcgZmlyc3RQYXJ0eURvbWFpbiwgdWludDY0X3QgZnJhbWVJRCwgdWludDY0X3Qg cGFnZUlELCB1aW50NjRfdCBjb250ZXh0SWQpCiAgICAgVXBkYXRlU3RvcmFnZUFjY2Vzc0ZvclBy ZXZhbGVudERvbWFpbnMoUEFMOjpTZXNzaW9uSUQgc2Vzc2lvbklELCBTdHJpbmcgcmVzb3VyY2VE b21haW4sIFN0cmluZyBmaXJzdFBhcnR5RG9tYWluLCB1aW50NjRfdCBmcmFtZUlELCB1aW50NjRf dCBwYWdlSUQsIGJvb2wgc2hvdWxkR3JhbnRBY2Nlc3MsIHVpbnQ2NF90IGNvbnRleHRJZCkKLSAg ICBSZW1vdmVTdG9yYWdlQWNjZXNzKFBBTDo6U2Vzc2lvbklEIHNlc3Npb25JRCwgdWludDY0X3Qg ZnJhbWVJRCwgdWludDY0X3QgcGFnZUlEKTsKICAgICBSZW1vdmVQcmV2YWxlbnREb21haW5zKFBB TDo6U2Vzc2lvbklEIHNlc3Npb25JRCwgVmVjdG9yPFN0cmluZz4gZG9tYWluc1dpdGhJbnRlcmFj dGlvbik7CiAjZW5kaWYKIH0KSW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQ cm94eS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVBy b3h5LmNwcAkocmV2aXNpb24gMjI2MzY1KQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vi UGFnZVByb3h5LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNzE5NywxMiArNzE5Nyw2IEBAIHZvaWQg V2ViUGFnZVByb3h5OjpyZXF1ZXN0U3RvcmFnZUFjY2VzcygKICAgICAgICAgbV9wcm9jZXNzLT5z ZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpTdG9yYWdlQWNjZXNzUmVzcG9uc2Uod2FzR3JhbnRlZCwg d2ViUHJvY2Vzc0NvbnRleHRJZCksIG1fcGFnZUlEKTsKICAgICB9KTsKIH0KLQotdm9pZCBXZWJQ YWdlUHJveHk6OnJlbW92ZVN0b3JhZ2VBY2Nlc3ModWludDY0X3QgZnJhbWVJRCwgdWludDY0X3Qg cGFnZUlEKQotewotICAgIEFTU0VSVChwYWdlSUQgPT0gbV9wYWdlSUQpOwotICAgIG1fd2Vic2l0 ZURhdGFTdG9yZS0+cmVtb3ZlU3RvcmFnZUFjY2VzcyhmcmFtZUlELCBwYWdlSUQpOwotfQogI2Vu ZGlmCiAKICNpZiBQTEFURk9STShDT0NPQSkKSW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L1dlYlBhZ2VQcm94eS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dl YlBhZ2VQcm94eS5oCShyZXZpc2lvbiAyMjYzNjUpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9XZWJQYWdlUHJveHkuaAkod29ya2luZyBjb3B5KQpAQCAtMTI0Nyw3ICsxMjQ3LDYgQEAgcHVi bGljOgogI2lmIEhBVkUoQ0ZORVRXT1JLX1NUT1JBR0VfUEFSVElUSU9OSU5HKQogICAgIHZvaWQg aGFzU3RvcmFnZUFjY2VzcyhTdHJpbmcmJiBzdWJGcmFtZUhvc3QsIFN0cmluZyYmIHRvcEZyYW1l SG9zdCwgdWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgcGFnZUlELCB1aW50NjRfdCB3ZWJQcm9j ZXNzQ29udGV4dElkKTsKICAgICB2b2lkIHJlcXVlc3RTdG9yYWdlQWNjZXNzKFN0cmluZyYmIHN1 YkZyYW1lSG9zdCwgU3RyaW5nJiYgdG9wRnJhbWVIb3N0LCB1aW50NjRfdCBmcmFtZUlELCB1aW50 NjRfdCBwYWdlSUQsIHVpbnQ2NF90IHdlYlByb2Nlc3NDb250ZXh0SWQpOwotICAgIHZvaWQgcmVt b3ZlU3RvcmFnZUFjY2Vzcyh1aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCBwYWdlSUQpOwogI2Vu ZGlmCiAKICNpZiBFTkFCTEUoQVRUQUNITUVOVF9FTEVNRU5UKQpJbmRleDogU291cmNlL1dlYktp dC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5Lm1lc3NhZ2VzLmluCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5tZXNzYWdlcy5pbgkocmV2aXNpb24gMjI2 MzY1KQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5Lm1lc3NhZ2VzLmlu CSh3b3JraW5nIGNvcHkpCkBAIC01MDUsNyArNTA1LDYgQEAgbWVzc2FnZXMgLT4gV2ViUGFnZVBy b3h5IHsKICNpZiBIQVZFKENGTkVUV09SS19TVE9SQUdFX1BBUlRJVElPTklORykKICAgICBIYXNT dG9yYWdlQWNjZXNzKFN0cmluZyBzdWJGcmFtZUhvc3QsIFN0cmluZyB0b3BGcmFtZUhvc3QsIHVp bnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IHBhZ2VJRCwgdWludDY0X3QgY29udGV4dElEKQogICAg IFJlcXVlc3RTdG9yYWdlQWNjZXNzKFN0cmluZyBzdWJGcmFtZUhvc3QsIFN0cmluZyB0b3BGcmFt ZUhvc3QsIHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IHBhZ2VJRCwgdWludDY0X3QgY29udGV4 dElEKQotICAgIFJlbW92ZVN0b3JhZ2VBY2Nlc3ModWludDY0X3QgZnJhbWVJRCwgdWludDY0X3Qg cGFnZUlEKQogI2VuZGlmCiAKICNpZiBFTkFCTEUoQVRUQUNITUVOVF9FTEVNRU5UKQpJbmRleDog U291cmNlL1dlYktpdC9VSVByb2Nlc3MvTmV0d29yay9OZXR3b3JrUHJvY2Vzc1Byb3h5LmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9OZXR3b3JrL05ldHdvcmtQcm9j ZXNzUHJveHkuY3BwCShyZXZpc2lvbiAyMjYzNjUpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9OZXR3b3JrL05ldHdvcmtQcm9jZXNzUHJveHkuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00MjQs MTEgKzQyNCw2IEBAIHZvaWQgTmV0d29ya1Byb2Nlc3NQcm94eTo6dXBkYXRlU3RvcmFnZUEKICAg ICBzZW5kKE1lc3NhZ2VzOjpOZXR3b3JrUHJvY2Vzczo6VXBkYXRlU3RvcmFnZUFjY2Vzc0ZvclBy ZXZhbGVudERvbWFpbnMoc2Vzc2lvbklELCByZXNvdXJjZURvbWFpbiwgZmlyc3RQYXJ0eURvbWFp biwgZnJhbWVJRCwgcGFnZUlELCB2YWx1ZSwgY29udGV4dElkKSwgMCk7CiB9CiAKLXZvaWQgTmV0 d29ya1Byb2Nlc3NQcm94eTo6cmVtb3ZlU3RvcmFnZUFjY2VzcyhQQUw6OlNlc3Npb25JRCBzZXNz aW9uSUQsIHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IHBhZ2VJRCkKLXsKLSAgICBzZW5kKE1l c3NhZ2VzOjpOZXR3b3JrUHJvY2Vzczo6UmVtb3ZlU3RvcmFnZUFjY2VzcyhzZXNzaW9uSUQsIGZy YW1lSUQsIHBhZ2VJRCksIDApOwotfQotCiB2b2lkIE5ldHdvcmtQcm9jZXNzUHJveHk6OnN0b3Jh Z2VBY2Nlc3NSZXF1ZXN0UmVzdWx0KGJvb2wgd2FzR3JhbnRlZCwgdWludDY0X3QgY29udGV4dElk KQogewogICAgIGF1dG8gY2FsbGJhY2sgPSBtX3N0b3JhZ2VBY2Nlc3NSZXNwb25zZUNhbGxiYWNr TWFwLnRha2UoY29udGV4dElkKTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL05ldHdv cmsvTmV0d29ya1Byb2Nlc3NQcm94eS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL05ldHdvcmsvTmV0d29ya1Byb2Nlc3NQcm94eS5oCShyZXZpc2lvbiAyMjYzNjUpCisr KyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9OZXR3b3JrL05ldHdvcmtQcm9jZXNzUHJveHkuaAko d29ya2luZyBjb3B5KQpAQCAtODAsNyArODAsNiBAQCBwdWJsaWM6CiAjaWYgSEFWRShDRk5FVFdP UktfU1RPUkFHRV9QQVJUSVRJT05JTkcpCiAgICAgdm9pZCBoYXNTdG9yYWdlQWNjZXNzRm9yUHJl dmFsZW50RG9tYWlucyhQQUw6OlNlc3Npb25JRCwgY29uc3QgU3RyaW5nJiByZXNvdXJjZURvbWFp biwgY29uc3QgU3RyaW5nJiBmaXJzdFBhcnR5RG9tYWluLCB1aW50NjRfdCBmcmFtZUlELCB1aW50 NjRfdCBwYWdlSUQsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoYm9vbCk+JiYgY2FsbGJhY2spOwog ICAgIHZvaWQgdXBkYXRlU3RvcmFnZUFjY2Vzc0ZvclByZXZhbGVudERvbWFpbnMoUEFMOjpTZXNz aW9uSUQsIGNvbnN0IFN0cmluZyYgcmVzb3VyY2VEb21haW4sIGNvbnN0IFN0cmluZyYgZmlyc3RQ YXJ0eURvbWFpbiwgdWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgcGFnZUlELCBib29sIHZhbHVl LCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKGJvb2wpPiYmIGNhbGxiYWNrKTsKLSAgICB2b2lkIHJl bW92ZVN0b3JhZ2VBY2Nlc3MoUEFMOjpTZXNzaW9uSUQsIHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2 NF90IHBhZ2VJRCk7CiAjZW5kaWYKIAogICAgIHZvaWQgcHJvY2Vzc1JlYWR5VG9TdXNwZW5kKCk7 CkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVN0 b3JlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJzaXRlRGF0 YS9XZWJzaXRlRGF0YVN0b3JlLmNwcAkocmV2aXNpb24gMjI2MzY1KQorKysgU291cmNlL1dlYktp dC9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTEyMTMsMTIgKzEyMTMsNiBAQCB2b2lkIFdlYnNpdGVEYXRhU3RvcmU6OnJlcXVlc3RT dG9yYWdlQWNjCiAgICAgCiAgICAgbV9yZXNvdXJjZUxvYWRTdGF0aXN0aWNzLT5yZXF1ZXN0U3Rv cmFnZUFjY2VzcyhXVEZNb3ZlKHN1YkZyYW1lSG9zdCksIFdURk1vdmUodG9wRnJhbWVIb3N0KSwg ZnJhbWVJRCwgcGFnZUlELCBXVEZNb3ZlKGNhbGxiYWNrKSk7CiB9Ci0KLXZvaWQgV2Vic2l0ZURh dGFTdG9yZTo6cmVtb3ZlU3RvcmFnZUFjY2Vzcyh1aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCBw YWdlSUQpCi17Ci0gICAgZm9yIChhdXRvJiBwcm9jZXNzUG9vbCA6IHByb2Nlc3NQb29scygpKQot ICAgICAgICBwcm9jZXNzUG9vbC0+bmV0d29ya1Byb2Nlc3MoKS0+cmVtb3ZlU3RvcmFnZUFjY2Vz cyhtX3Nlc3Npb25JRCwgZnJhbWVJRCwgcGFnZUlEKTsKLX0KICNlbmRpZgogCiB2b2lkIFdlYnNp dGVEYXRhU3RvcmU6Om5ldHdvcmtQcm9jZXNzRGlkQ3Jhc2goKQpJbmRleDogU291cmNlL1dlYktp dC9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5oCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUuaAko cmV2aXNpb24gMjI2MzY1KQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vic2l0ZURhdGEv V2Vic2l0ZURhdGFTdG9yZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMjMsNyArMTIzLDYgQEAgcHVi bGljOgogICAgIHZvaWQgcmVtb3ZlUHJldmFsZW50RG9tYWlucyhjb25zdCBWZWN0b3I8U3RyaW5n PiYgZG9tYWlucyk7CiAgICAgdm9pZCBoYXNTdG9yYWdlQWNjZXNzKFN0cmluZyYmIHN1YkZyYW1l SG9zdCwgU3RyaW5nJiYgdG9wRnJhbWVIb3N0LCB1aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCBw YWdlSUQsIFdURjo6Q29tcGxldGlvbkhhbmRsZXI8dm9pZCAoYm9vbCk+JiYgY2FsbGJhY2spOwog ICAgIHZvaWQgcmVxdWVzdFN0b3JhZ2VBY2Nlc3MoU3RyaW5nJiYgc3ViRnJhbWVIb3N0LCBTdHJp bmcmJiB0b3BGcmFtZUhvc3QsIHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IHBhZ2VJRCwgV1RG OjpDb21wbGV0aW9uSGFuZGxlcjx2b2lkIChib29sKT4mJiBjYWxsYmFjayk7Ci0gICAgdm9pZCBy ZW1vdmVTdG9yYWdlQWNjZXNzKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IHBhZ2VJRCk7CiAj ZW5kaWYKICAgICB2b2lkIG5ldHdvcmtQcm9jZXNzRGlkQ3Jhc2goKTsKICAgICB2b2lkIHJlc29s dmVEaXJlY3Rvcmllc0lmTmVjZXNzYXJ5KCk7CkluZGV4OiBTb3VyY2UvV2ViS2l0L1dlYlByb2Nl c3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNs aWVudC5jcHAJKHJldmlzaW9uIDIyNjM2NSkKKysrIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9X ZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTM2LDYgKzM2LDggQEAKICNpbmNsdWRlICJJbmplY3RlZEJ1bmRsZURPTVdpbmRvd0V4dGVuc2lv bi5oIgogI2luY2x1ZGUgIkluamVjdGVkQnVuZGxlTmF2aWdhdGlvbkFjdGlvbi5oIgogI2luY2x1 ZGUgIk5hdmlnYXRpb25BY3Rpb25EYXRhLmgiCisjaW5jbHVkZSAiTmV0d29ya0Nvbm5lY3Rpb25U b1dlYlByb2Nlc3NNZXNzYWdlcy5oIgorI2luY2x1ZGUgIk5ldHdvcmtQcm9jZXNzQ29ubmVjdGlv bi5oIgogI2luY2x1ZGUgIlBsdWdpblZpZXcuaCIKICNpbmNsdWRlICJVc2VyRGF0YS5oIgogI2lu Y2x1ZGUgIldLQnVuZGxlQVBJQ2FzdC5oIgpAQCAtMTY4LDcgKzE3MCw3IEBAIHZvaWQgV2ViRnJh bWVMb2FkZXJDbGllbnQ6OmRldGFjaGVkRnJvbVAKIAogI2lmIEhBVkUoQ0ZORVRXT1JLX1NUT1JB R0VfUEFSVElUSU9OSU5HKQogICAgIGlmIChtX2hhc0ZyYW1lU3BlY2lmaWNTdG9yYWdlQWNjZXNz KSB7Ci0gICAgICAgIHdlYlBhZ2UtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6UmVtb3Zl U3RvcmFnZUFjY2VzcyhmcmFtZUlEKCkudmFsdWUoKSwgcGFnZUlEKCkudmFsdWUoKSkpOworICAg ICAgICBXZWJQcm9jZXNzOjpzaW5nbGV0b24oKS5lbnN1cmVOZXR3b3JrUHJvY2Vzc0Nvbm5lY3Rp b24oKS5jb25uZWN0aW9uKCkuc2VuZChNZXNzYWdlczo6TmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlBy b2Nlc3M6OlJlbW92ZVN0b3JhZ2VBY2Nlc3Moc2Vzc2lvbklEKCksIGZyYW1lSUQoKS52YWx1ZSgp LCBwYWdlSUQoKS52YWx1ZSgpKSwgMCk7CiAgICAgICAgIG1faGFzRnJhbWVTcGVjaWZpY1N0b3Jh Z2VBY2Nlc3MgPSBmYWxzZTsKICAgICB9CiAjZW5kaWYKQEAgLTM5MCw3ICszOTIsNyBAQCB2b2lk IFdlYkZyYW1lTG9hZGVyQ2xpZW50OjpkaXNwYXRjaFdpbGxDCiAgICAgICAgIHJldHVybjsKIAog ICAgIGlmIChtX2hhc0ZyYW1lU3BlY2lmaWNTdG9yYWdlQWNjZXNzKSB7Ci0gICAgICAgIHdlYlBh Z2UtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6UmVtb3ZlU3RvcmFnZUFjY2VzcyhmcmFt ZUlEKCkudmFsdWUoKSwgcGFnZUlEKCkudmFsdWUoKSkpOworICAgICAgICBXZWJQcm9jZXNzOjpz aW5nbGV0b24oKS5lbnN1cmVOZXR3b3JrUHJvY2Vzc0Nvbm5lY3Rpb24oKS5jb25uZWN0aW9uKCku c2VuZChNZXNzYWdlczo6TmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3M6OlJlbW92ZVN0b3Jh Z2VBY2Nlc3Moc2Vzc2lvbklEKCksIGZyYW1lSUQoKS52YWx1ZSgpLCBwYWdlSUQoKS52YWx1ZSgp KSwgMCk7CiAgICAgICAgIG1faGFzRnJhbWVTcGVjaWZpY1N0b3JhZ2VBY2Nlc3MgPSBmYWxzZTsK ICAgICB9CiAjZW5kaWYKSW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHJldmlzaW9uIDIyNjM2NSkKKysrIExheW91dFRlc3Rz L0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBACisyMDE4LTAxLTAzICBK b2huIFdpbGFuZGVyICA8d2lsYW5kZXJAYXBwbGUuY29tPgorCisgICAgICAgIFN0b3JhZ2UgQWNj ZXNzIEFQSTogUmVmYWN0b3IgWFBDIGZvciBhY2Nlc3MgcmVtb3ZhbCB0byBnbyBzdHJhaWdodCBm cm9tIHRoZSB3ZWIgcHJvY2VzcyB0byB0aGUgbmV0d29yayBwcm9jZXNzCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODEyNzAKKyAgICAgICAgPHJkYXI6 Ly9wcm9ibGVtLzM2Mjg5NTQ0PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFRoaXMgY2hhbmdlIHJlZmFjdG9ycyBob3cgdGhlIHdlYiBwcm9jZXNzIHRl bGxzIHRoZSBuZXR3b3JrIHByb2Nlc3MKKyAgICAgICAgdG8gcmVtb3ZlIHN0b3JhZ2UgYWNjZXNz LiBQcmV2aW91c2x5LCB0aGlzIHdhcyBkb25lIG92ZXIgdGhlIFVJIHByb2Nlc3MKKyAgICAgICAg anVzdCBsaWtlIHJlcXVlc3RzIGZvciBzdG9yYWdlIGFjY2Vzcy4gQnV0IHNpbmNlIG5vIGZ1cnRo ZXIgcmVhc29uaW5nCisgICAgICAgIGlzIG5lZWRlZCwgdGhlIG1lc3NhZ2Ugc2hvdWxkIGdvIHN0 cmFpZ2h0IGZyb20gdGhlIHdlYiBwcm9jZXNzIHRvIHRoZQorICAgICAgICBuZXR3b3JrIHByb2Nl c3MgZm9yIHBlcmZvcm1hbmNlIHJlYXNvbnMgYW5kIHRvIG1pbmltaXplIHRoZSByaXNrIG9mIGEK KyAgICAgICAgcmFjZS4KKworICAgICAgICBBcyBhIGNvbnNlcXVlbmNlLCB0aGUgWFBDIGNvZGUg Zm9yIHN0b3JhZ2UgYWNjZXNzIHJlbW92YWwgaW4gdGhlIFVJCisgICAgICAgIHByb2Nlc3MgaXMg ZGVsZXRlZC4KKworICAgICAgICAqIHBsYXRmb3JtL21hYy13azIvVGVzdEV4cGVjdGF0aW9uczoK KyAgICAgICAgICAgIFJlLWVuYWJsZXMgdGhlIHRlc3QgZm9yIHRoaXMgY29kZSBwYXRoLgorCiAy MDE4LTAxLTAzICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAg ICAgIFNWRyBsaWdodGluZyBmaWx0ZXIgbGlnaHRzIGFyZSBpbiB0aGUgd3JvbmcgY29vcmRpbmF0 ZSBzeXN0ZW0KSW5kZXg6IExheW91dFRlc3RzL3BsYXRmb3JtL21hYy13azIvVGVzdEV4cGVjdGF0 aW9ucwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMtd2syL1Rlc3RFeHBl Y3RhdGlvbnMJKHJldmlzaW9uIDIyNjM2NSkKKysrIExheW91dFRlc3RzL3BsYXRmb3JtL21hYy13 azIvVGVzdEV4cGVjdGF0aW9ucwkod29ya2luZyBjb3B5KQpAQCAtNzU5LDYgKzc1OSw3IEBAIGh0 dHAvdGVzdHMvcmVzb3VyY2VMb2FkU3RhdGlzdGljcy91c2VyLWkKIFsgSGlnaFNpZXJyYSsgXSBo dHRwL3Rlc3RzL3N0b3JhZ2VBY2Nlc3MvcmVxdWVzdC1zdG9yYWdlLWFjY2Vzcy1zYW1lLW9yaWdp bi1zYW5kYm94ZWQtaWZyYW1lLmh0bWwgWyBQYXNzIF0KIFsgSGlnaFNpZXJyYSsgXSBodHRwL3Rl c3RzL3N0b3JhZ2VBY2Nlc3MvcmVxdWVzdC1hbmQtZ3JhbnQtc3RvcmFnZS1hY2Nlc3MtY3Jvc3Mt b3JpZ2luLXNhbmRib3hlZC1uZXN0ZWQtaWZyYW1lLmh0bWwgWyBQYXNzIF0KIFsgSGlnaFNpZXJy YSsgXSBodHRwL3Rlc3RzL3N0b3JhZ2VBY2Nlc3MvcmVxdWVzdC1hbmQtZ3JhbnQtc3RvcmFnZS1h Y2Nlc3MtY3Jvc3Mtb3JpZ2luLXNhbmRib3hlZC1pZnJhbWUtZnJvbS1wcmV2YWxlbnQtZG9tYWlu LXdpdGgtcmVjZW50LXVzZXItaW50ZXJhY3Rpb24uaHRtbCBbIFBhc3MgXQorWyBIaWdoU2llcnJh KyBdIGh0dHAvdGVzdHMvc3RvcmFnZUFjY2Vzcy9yZXF1ZXN0LWFuZC1ncmFudC1zdG9yYWdlLWFj Y2Vzcy1jcm9zcy1vcmlnaW4tc2FuZGJveGVkLWlmcmFtZS1mcm9tLXByZXZhbGVudC1kb21haW4t d2l0aC1ub24tcmVjZW50LXVzZXItaW50ZXJhY3Rpb24tYW5kLXRyeS1hY2Nlc3MtZnJvbS1yaWdo dC1mcmFtZS5odG1sIFsgUGFzcyBdCiBbIEhpZ2hTaWVycmErIF0gaHR0cC90ZXN0cy9zdG9yYWdl QWNjZXNzL3JlcXVlc3QtYW5kLWdyYW50LXN0b3JhZ2UtYWNjZXNzLWNyb3NzLW9yaWdpbi1zYW5k Ym94ZWQtaWZyYW1lLWZyb20tcHJldmFsZW50LWRvbWFpbi13aXRoLW5vbi1yZWNlbnQtdXNlci1p bnRlcmFjdGlvbi1idXQtdHJ5LWFjY2Vzcy1mcm9tLXdyb25nLWZyYW1lLmh0bWwgWyBQYXNzIF0K IFsgSGlnaFNpZXJyYSsgXSBodHRwL3Rlc3RzL3N0b3JhZ2VBY2Nlc3MvcmVxdWVzdC1hbmQtZ3Jh bnQtc3RvcmFnZS1hY2Nlc3MtY3Jvc3Mtb3JpZ2luLXNhbmRib3hlZC1pZnJhbWUtZnJvbS1wcmV2 YWxlbnQtZG9tYWluLXdpdGhvdXQtdXNlci1pbnRlcmFjdGlvbi5odG1sIFsgUGFzcyBdCiBbIEhp Z2hTaWVycmErIF0gaHR0cC90ZXN0cy9zdG9yYWdlQWNjZXNzL3JlcXVlc3Qtc3RvcmFnZS1hY2Nl c3MtdG9wLWZyYW1lLmh0bWwgWyBQYXNzIF0K