190731 2018-10-18 13:41:20 -0700 Clean up FrameLoader two-state enums 2018-10-18 14:18:41 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen benjamin cdumez cmarcelo dbates ews-watchlist japhet webkit-bug-importer oldest_to_newest 1470646 0 achristensen 2018-10-18 13:41:20 -0700 Clean up FrameLoader two-state enums 1470649 1 352726 achristensen 2018-10-18 13:51:20 -0700 Created attachment 352726 Patch 1470652 2 ews-watchlist 2018-10-18 13:54:32 -0700 Attachment 352726 did not pass style-queue: ERROR: Source/WebCore/loader/EmptyFrameLoaderClient.h:78: Inline functions should not be in classes annotated with WEBCORE_EXPORT. Remove the macro from the class and apply it to each appropriate method, or move the inline function definition out-of-line. [build/webcore_export] [4] Total errors found: 1 in 27 files If any of these errors are false positives, please file a bug against check-webkit-style. 1470668 3 achristensen 2018-10-18 14:17:07 -0700 http://trac.webkit.org/r237264 1470670 4 webkit-bug-importer 2018-10-18 14:18:41 -0700 <rdar://problem/45384056> 352726 2018-10-18 13:51:20 -0700 2018-10-18 13:55:01 -0700 Patch bug-190731-20181018135120.patch text/plain 30804 achristensen SW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvQ2hh bmdlTG9nCShyZXZpc2lvbiAyMzcyNTkpCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBACisyMDE4LTEwLTE4ICBBbGV4IENocmlzdGVuc2VuICA8 YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgQ2xlYW4gdXAgRnJhbWVMb2FkZXIg dHdvLXN0YXRlIGVudW1zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xOTA3MzEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIHd0Zi9FbnVtVHJhaXRzLmg6CisgICAgICAgIChXVEY6OmlzVmFsaWRFbnVtKToK KwogMjAxOC0xMC0xNyAgQ29tbWl0IFF1ZXVlICA8Y29tbWl0LXF1ZXVlQHdlYmtpdC5vcmc+CiAK ICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjIzNzIwOC4KSW5kZXg6IFNvdXJjZS9X VEYvd3RmL0VudW1UcmFpdHMuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV1RGL3d0Zi9FbnVtVHJh aXRzLmgJKHJldmlzaW9uIDIzNzI1OSkKKysrIFNvdXJjZS9XVEYvd3RmL0VudW1UcmFpdHMuaAko d29ya2luZyBjb3B5KQpAQCAtNTEsMTQgKzUxLDIwIEBAIHN0cnVjdCBFbnVtVmFsdWVDaGVja2Vy PFQsIEVudW1WYWx1ZXM8RT4KICAgICB9CiB9OwogCi10ZW1wbGF0ZTx0eXBlbmFtZSBFLCB0eXBl bmFtZSBUPgotY29uc3RleHByIGF1dG8gaXNWYWxpZEVudW0oVCB0KSAtPiBzdGQ6OmVuYWJsZV9p Zl90PHN0ZDo6aXNfZW51bTxFPjo6dmFsdWUsIGJvb2w+Cit0ZW1wbGF0ZTx0eXBlbmFtZSBFLCB0 eXBlbmFtZSBULCBzdGQ6OmVuYWJsZV9pZl90PHN0ZDo6aXNfZW51bTxFPjo6dmFsdWUgJiYgIXN0 ZDo6aXNfc2FtZTxzdGQ6OnVuZGVybHlpbmdfdHlwZV90PEU+LCBib29sPjo6dmFsdWU+KiA9IG51 bGxwdHI+Citjb25zdGV4cHIgYm9vbCBpc1ZhbGlkRW51bShUIHQpCiB7CiAgICAgc3RhdGljX2Fz c2VydChzaXplb2YoVCkgPj0gc3RkOjp1bmRlcmx5aW5nX3R5cGVfdDxFPigpLCAiSW50ZWdyYWwg dHlwZSBtdXN0IGJlIGF0IGxlYXN0IHRoZSBzaXplIG9mIHRoZSB1bmRlcmx5aW5nIGVudW0gdHlw ZSIpOwogCiAgICAgcmV0dXJuIEVudW1WYWx1ZUNoZWNrZXI8VCwgdHlwZW5hbWUgRW51bVRyYWl0 czxFPjo6dmFsdWVzPjo6aXNWYWxpZEVudW0odCk7CiB9CiAKK3RlbXBsYXRlPHR5cGVuYW1lIEUs IHR5cGVuYW1lIFQsIHN0ZDo6ZW5hYmxlX2lmX3Q8c3RkOjppc19zYW1lPHN0ZDo6dW5kZXJseWlu Z190eXBlX3Q8RT4sIGJvb2w+Ojp2YWx1ZT4qID0gbnVsbHB0cj4KK2NvbnN0ZXhwciBib29sIGlz VmFsaWRFbnVtKFQgdCkKK3sKKyAgICByZXR1cm4gIXQgfHwgdCA9PSAxOworfQorCiB0ZW1wbGF0 ZTx0eXBlbmFtZSBFPgogY29uc3RleHByIGF1dG8gZW51bVRvVW5kZXJseWluZ1R5cGUoRSBlKQog ewpJbmRleDogU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjM3MjU5KQorKysgU291cmNlL1dlYkNvcmUvQ2hh bmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzUgQEAKKzIwMTgtMTAtMTggIEFsZXgg Q2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBDbGVhbiB1 cCBGcmFtZUxvYWRlciB0d28tc3RhdGUgZW51bXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE5MDczMQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgcGF0Y2ggZG9lcyB0aHJlZSB0aGluZ3M6CisgICAg ICAgIDEuIEFkZCBhbiBvdmVybG9hZCB0byBFbnVtVHJhaXRzIHNvIHdlIGRvIG5vdCBuZWVkIHRv IGxpc3Qgb3V0IHRoZSB2YWxpZCB2YWx1ZXMgb2YgYm9vbGVhbiBlbnVtIGNsYXNzZXMuCisgICAg ICAgIFRoZSB2YWxpZCB2YWx1ZXMgYXJlIGFsd2F5cyAwIGFuZCAxLiAgVGhpcyBpcyB1c2VkIHdo ZW4gZGVjb2RpbmcgZnJvbSBJUEMuCisgICAgICAgIDIuIEFkZCBhIDItc3RhdGUgZW51bSBjbGFz cyBmb3IgTmV3TG9hZEluUHJvZ3Jlc3MgaW5zdGFkIG9mIGEgYm9vbCBzbyB3ZSBjYW4gdW5kZXJz dGFuZCB0aGUgY29kZSBiZXR0ZXIuCisgICAgICAgIDMuIEJlZ2luIHBhc3NpbmcgTG9ja0JhY2tG b3J3YXJkTGlzdCB0byB0aGUgVUlQcm9jZXNzLiAgV2Ugd2lsbCBuZWVkIGl0IHNvb24gZm9yIFBT T04uCisKKyAgICAgICAgKiBoaXN0b3J5L0NhY2hlZEZyYW1lLmg6CisgICAgICAgICogbG9hZGVy L0VtcHR5RnJhbWVMb2FkZXJDbGllbnQuaDoKKyAgICAgICAgKiBsb2FkZXIvRnJhbWVMb2FkZXIu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXI6OnByb3Zpc2lvbmFsTG9hZFN0YXJ0 ZWQpOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXI6OmxvYWRXaXRoRG9jdW1lbnRMb2Fk ZXIpOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXI6OmNvbW1pdFByb3Zpc2lvbmFsTG9h ZCk6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6Y2xpZW50UmVkaXJlY3RDYW5jZWxs ZWRPckZpbmlzaGVkKToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyOjpjbGllbnRSZWRp cmVjdGVkKToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyOjpyZWNlaXZlZE1haW5SZXNv dXJjZUVycm9yKToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyOjpjb250aW51ZUxvYWRB ZnRlck5hdmlnYXRpb25Qb2xpY3kpOgorICAgICAgICAqIGxvYWRlci9GcmFtZUxvYWRlci5oOgor ICAgICAgICAqIGxvYWRlci9GcmFtZUxvYWRlckNsaWVudC5oOgorICAgICAgICAqIGxvYWRlci9G cmFtZUxvYWRlclR5cGVzLmg6CisgICAgICAgICogbG9hZGVyL05hdmlnYXRpb25TY2hlZHVsZXIu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6U2NoZWR1bGVkTmF2aWdhdGlvbjo6ZGlkU3RvcFRpbWVy KToKKyAgICAgICAgKFdlYkNvcmU6Ok5hdmlnYXRpb25TY2hlZHVsZXI6OmNhbmNlbCk6CisgICAg ICAgICogbG9hZGVyL05hdmlnYXRpb25TY2hlZHVsZXIuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9u ZXR3b3JrL1N0b3JlZENyZWRlbnRpYWxzUG9saWN5Lmg6CisKIDIwMTgtMTAtMTggIEFsaSBKdW1h ICA8YWp1bWFAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtJbnRlcnNlY3Rpb25PYnNlcnZlcl0g RmFjdG9yIG91dCByZWN0IG1hcHBpbmcgYW5kIGNsaXBwaW5nIGxvZ2ljIGZyb20gY29tcHV0ZVJl Y3RGb3JSZXBhaW50CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9oaXN0b3J5L0NhY2hlZEZyYW1lLmgK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvaGlzdG9yeS9DYWNoZWRGcmFtZS5oCShyZXZp c2lvbiAyMzcyNTkpCisrKyBTb3VyY2UvV2ViQ29yZS9oaXN0b3J5L0NhY2hlZEZyYW1lLmgJKHdv cmtpbmcgY29weSkKQEAgLTM4LDcgKzM4LDcgQEAgY2xhc3MgRG9jdW1lbnQ7CiBjbGFzcyBEb2N1 bWVudExvYWRlcjsKIGNsYXNzIEZyYW1lVmlldzsKIGNsYXNzIE5vZGU7Ci1lbnVtIGNsYXNzIEhh c0luc2VjdXJlQ29udGVudCA6IHVpbnQ4X3Q7CitlbnVtIGNsYXNzIEhhc0luc2VjdXJlQ29udGVu dCA6IGJvb2w7CiAKIGNsYXNzIENhY2hlZEZyYW1lQmFzZSB7CiBwdWJsaWM6CkluZGV4OiBTb3Vy Y2UvV2ViQ29yZS9sb2FkZXIvRW1wdHlGcmFtZUxvYWRlckNsaWVudC5oCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJDb3JlL2xvYWRlci9FbXB0eUZyYW1lTG9hZGVyQ2xpZW50LmgJKHJldmlzaW9u IDIzNzI1OSkKKysrIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9FbXB0eUZyYW1lTG9hZGVyQ2xpZW50 LmgJKHdvcmtpbmcgY29weSkKQEAgLTc1LDcgKzc1LDcgQEAgY2xhc3MgV0VCQ09SRV9FWFBPUlQg RW1wdHlGcmFtZUxvYWRlckNsaQogICAgIHZvaWQgZGlzcGF0Y2hEaWREaXNwYXRjaE9ubG9hZEV2 ZW50cygpIGZpbmFsIHsgfQogICAgIHZvaWQgZGlzcGF0Y2hEaWRSZWNlaXZlU2VydmVyUmVkaXJl Y3RGb3JQcm92aXNpb25hbExvYWQoKSBmaW5hbCB7IH0KICAgICB2b2lkIGRpc3BhdGNoRGlkQ2Fu Y2VsQ2xpZW50UmVkaXJlY3QoKSBmaW5hbCB7IH0KLSAgICB2b2lkIGRpc3BhdGNoV2lsbFBlcmZv cm1DbGllbnRSZWRpcmVjdChjb25zdCBVUkwmLCBkb3VibGUsIFdhbGxUaW1lKSBmaW5hbCB7IH0K KyAgICB2b2lkIGRpc3BhdGNoV2lsbFBlcmZvcm1DbGllbnRSZWRpcmVjdChjb25zdCBVUkwmLCBk b3VibGUsIFdhbGxUaW1lLCBMb2NrQmFja0ZvcndhcmRMaXN0KSBmaW5hbCB7IH0KICAgICB2b2lk IGRpc3BhdGNoRGlkQ2hhbmdlTG9jYXRpb25XaXRoaW5QYWdlKCkgZmluYWwgeyB9CiAgICAgdm9p ZCBkaXNwYXRjaERpZFB1c2hTdGF0ZVdpdGhpblBhZ2UoKSBmaW5hbCB7IH0KICAgICB2b2lkIGRp c3BhdGNoRGlkUmVwbGFjZVN0YXRlV2l0aGluUGFnZSgpIGZpbmFsIHsgfQpJbmRleDogU291cmNl L1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCShyZXZpc2lvbiAyMzcyNTkpCisrKyBTb3VyY2Uv V2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMDY4LDcg KzEwNjgsNyBAQCB2b2lkIEZyYW1lTG9hZGVyOjpwcm92aXNpb25hbExvYWRTdGFydGVkCiB7CiAg ICAgaWYgKG1fc3RhdGVNYWNoaW5lLmZpcnN0TGF5b3V0RG9uZSgpKQogICAgICAgICBtX3N0YXRl TWFjaGluZS5hZHZhbmNlVG8oRnJhbWVMb2FkZXJTdGF0ZU1hY2hpbmU6OkNvbW1pdHRlZEZpcnN0 UmVhbExvYWQpOwotICAgIG1fZnJhbWUubmF2aWdhdGlvblNjaGVkdWxlcigpLmNhbmNlbCh0cnVl KTsKKyAgICBtX2ZyYW1lLm5hdmlnYXRpb25TY2hlZHVsZXIoKS5jYW5jZWwoTmV3TG9hZEluUHJv Z3Jlc3M6Olllcyk7CiAgICAgbV9jbGllbnQucHJvdmlzaW9uYWxMb2FkU3RhcnRlZCgpOwogCiAg ICAgaWYgKG1fZnJhbWUuaXNNYWluRnJhbWUoKSkgewpAQCAtMTU5Miw3ICsxNTkyLDcgQEAgdm9p ZCBGcmFtZUxvYWRlcjo6bG9hZFdpdGhEb2N1bWVudExvYWRlcgogICAgICAgICB9CiAgICAgfQog Ci0gICAgbV9mcmFtZS5uYXZpZ2F0aW9uU2NoZWR1bGVyKCkuY2FuY2VsKHRydWUpOworICAgIG1f ZnJhbWUubmF2aWdhdGlvblNjaGVkdWxlcigpLmNhbmNlbChOZXdMb2FkSW5Qcm9ncmVzczo6WWVz KTsKIAogICAgIGlmIChtX2N1cnJlbnRMb2FkU2hvdWxkQmVUcmVhdGVkQXNDb250aW51aW5nTG9h ZCkgewogICAgICAgICBjb250aW51ZUxvYWRBZnRlck5hdmlnYXRpb25Qb2xpY3kobG9hZGVyLT5y ZXF1ZXN0KCksIGZvcm1TdGF0ZS5nZXQoKSwgU2hvdWxkQ29udGludWU6OlllcywgYWxsb3dOYXZp Z2F0aW9uVG9JbnZhbGlkVVJMKTsKQEAgLTE5NzAsNyArMTk3MCw3IEBAIHZvaWQgRnJhbWVMb2Fk ZXI6OmNvbW1pdFByb3Zpc2lvbmFsTG9hZCgKICAgICAvLyB0aGUgcmVkaXJlY3QgaW4gaXRzIC13 ZWJWaWV3OndpbGxQZXJmb3JtQ2xpZW50UmVkaXJlY3RUb1VSTDpkZWxheTpmaXJlRGF0ZTpmb3JG cmFtZTouICBTaW5jZSB3ZSBhcmUKICAgICAvLyBqdXN0IGFib3V0IHRvIGNvbW1pdCBhIG5ldyBw YWdlLCB0aGVyZSBjYW5ub3QgcG9zc2libHkgYmUgYSBwZW5kaW5nIHJlZGlyZWN0IGF0IHRoaXMg cG9pbnQuCiAgICAgaWYgKG1fc2VudFJlZGlyZWN0Tm90aWZpY2F0aW9uKQotICAgICAgICBjbGll bnRSZWRpcmVjdENhbmNlbGxlZE9yRmluaXNoZWQoZmFsc2UpOworICAgICAgICBjbGllbnRSZWRp cmVjdENhbmNlbGxlZE9yRmluaXNoZWQoTmV3TG9hZEluUHJvZ3Jlc3M6Ok5vKTsKICAgICAKICAg ICBpZiAoY2FjaGVkUGFnZSAmJiBjYWNoZWRQYWdlLT5kb2N1bWVudCgpKSB7CiAjaWYgUExBVEZP Uk0oSU9TKQpAQCAtMjE1OCwxNCArMjE1OCwxNCBAQCB2b2lkIEZyYW1lTG9hZGVyOjp0cmFuc2l0 aW9uVG9Db21taXR0ZWQoCiAgICAgICAgIG1fc3RhdGVNYWNoaW5lLmFkdmFuY2VUbyhGcmFtZUxv YWRlclN0YXRlTWFjaGluZTo6RGlzcGxheWluZ0luaXRpYWxFbXB0eURvY3VtZW50UG9zdENvbW1p dCk7CiB9CiAKLXZvaWQgRnJhbWVMb2FkZXI6OmNsaWVudFJlZGlyZWN0Q2FuY2VsbGVkT3JGaW5p c2hlZChib29sIGNhbmNlbFdpdGhMb2FkSW5Qcm9ncmVzcykKK3ZvaWQgRnJhbWVMb2FkZXI6OmNs aWVudFJlZGlyZWN0Q2FuY2VsbGVkT3JGaW5pc2hlZChOZXdMb2FkSW5Qcm9ncmVzcyBuZXdMb2Fk SW5Qcm9ncmVzcykKIHsKICAgICAvLyBOb3RlIHRoYXQgLXdlYlZpZXc6ZGlkQ2FuY2VsQ2xpZW50 UmVkaXJlY3RGb3JGcmFtZTogaXMgY2FsbGVkIG9uIHRoZSBmcmFtZSBsb2FkIGRlbGVnYXRlIGV2 ZW4gaWYKICAgICAvLyB0aGUgcmVkaXJlY3Qgc3VjY2VlZGVkLiAgV2Ugc2hvdWxkIGVpdGhlciBy ZW5hbWUgdGhpcyBBUEksIG9yIGFkZCBhIG5ldyBtZXRob2QsIGxpa2UKICAgICAvLyAtd2ViVmll dzpkaWRGaW5pc2hDbGllbnRSZWRpcmVjdEZvckZyYW1lOgogICAgIG1fY2xpZW50LmRpc3BhdGNo RGlkQ2FuY2VsQ2xpZW50UmVkaXJlY3QoKTsKIAotICAgIGlmICghY2FuY2VsV2l0aExvYWRJblBy b2dyZXNzKQorICAgIGlmIChuZXdMb2FkSW5Qcm9ncmVzcyA9PSBOZXdMb2FkSW5Qcm9ncmVzczo6 Tm8pCiAgICAgICAgIG1fcXVpY2tSZWRpcmVjdENvbWluZyA9IGZhbHNlOwogCiAgICAgbV9zZW50 UmVkaXJlY3ROb3RpZmljYXRpb24gPSBmYWxzZTsKQEAgLTIxNzMsNyArMjE3Myw3IEBAIHZvaWQg RnJhbWVMb2FkZXI6OmNsaWVudFJlZGlyZWN0Q2FuY2VsbGUKIAogdm9pZCBGcmFtZUxvYWRlcjo6 Y2xpZW50UmVkaXJlY3RlZChjb25zdCBVUkwmIHVybCwgZG91YmxlIHNlY29uZHMsIFdhbGxUaW1l IGZpcmVEYXRlLCBMb2NrQmFja0ZvcndhcmRMaXN0IGxvY2tCYWNrRm9yd2FyZExpc3QpCiB7Ci0g ICAgbV9jbGllbnQuZGlzcGF0Y2hXaWxsUGVyZm9ybUNsaWVudFJlZGlyZWN0KHVybCwgc2Vjb25k cywgZmlyZURhdGUpOworICAgIG1fY2xpZW50LmRpc3BhdGNoV2lsbFBlcmZvcm1DbGllbnRSZWRp cmVjdCh1cmwsIHNlY29uZHMsIGZpcmVEYXRlLCBsb2NrQmFja0ZvcndhcmRMaXN0KTsKICAgICAK ICAgICAvLyBSZW1lbWJlciB0aGF0IHdlIHNlbnQgYSByZWRpcmVjdCBub3RpZmljYXRpb24gdG8g dGhlIGZyYW1lIGxvYWQgZGVsZWdhdGUgc28gdGhhdCB3aGVuIHdlIGNvbW1pdAogICAgIC8vIHRo ZSBuZXh0IHByb3Zpc2lvbmFsIGxvYWQsIHdlIGNhbiBzZW5kIGEgY29ycmVzcG9uZGluZyAtd2Vi VmlldzpkaWRDYW5jZWxDbGllbnRSZWRpcmVjdEZvckZyYW1lOgpAQCAtMzAzMyw3ICszMDMzLDcg QEAgdm9pZCBGcmFtZUxvYWRlcjo6cmVjZWl2ZWRNYWluUmVzb3VyY2VFcgogICAgICAgICAvLyBu b3QgZ29pbmcgdG8gdXNlIHRoaXMgcHJvdmlzaW9uYWwgcmVzb3VyY2UsIGFzIGl0IHdhcyBjYW5j ZWxsZWQsIG5vdGlmeSB0aGUgZnJhbWUgbG9hZCBkZWxlZ2F0ZSB0aGF0IHRoZSByZWRpcmVjdAog ICAgICAgICAvLyBoYXMgZW5kZWQuCiAgICAgICAgIGlmIChtX3NlbnRSZWRpcmVjdE5vdGlmaWNh dGlvbikKLSAgICAgICAgICAgIGNsaWVudFJlZGlyZWN0Q2FuY2VsbGVkT3JGaW5pc2hlZChmYWxz ZSk7CisgICAgICAgICAgICBjbGllbnRSZWRpcmVjdENhbmNlbGxlZE9yRmluaXNoZWQoTmV3TG9h ZEluUHJvZ3Jlc3M6Ok5vKTsKICAgICB9CiAKICAgICBjaGVja0NvbXBsZXRlZCgpOwpAQCAtMzI4 OSw3ICszMjg5LDcgQEAgdm9pZCBGcmFtZUxvYWRlcjo6Y29udGludWVMb2FkQWZ0ZXJOYXZpZwog ICAgICAgICAvLyBuZWVkIHRvIHJlcG9ydCB0aGF0IHRoZSBjbGllbnQgcmVkaXJlY3Qgd2FzIGNh bmNlbGxlZC4KICAgICAgICAgLy8gRklYTUU6IFRoZSBjbGllbnQgc2hvdWxkIGJlIHRvbGQgYWJv dXQgaWdub3JlZCBub24tcXVpY2sgcmVkaXJlY3RzLCB0b28uCiAgICAgICAgIGlmIChtX3F1aWNr UmVkaXJlY3RDb21pbmcpCi0gICAgICAgICAgICBjbGllbnRSZWRpcmVjdENhbmNlbGxlZE9yRmlu aXNoZWQoZmFsc2UpOworICAgICAgICAgICAgY2xpZW50UmVkaXJlY3RDYW5jZWxsZWRPckZpbmlz aGVkKE5ld0xvYWRJblByb2dyZXNzOjpObyk7CiAKICAgICAgICAgc2V0UG9saWN5RG9jdW1lbnRM b2FkZXIobnVsbHB0cik7CiAgICAgICAgIGNoZWNrQ29tcGxldGVkKCk7CkluZGV4OiBTb3VyY2Uv V2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29y ZS9sb2FkZXIvRnJhbWVMb2FkZXIuaAkocmV2aXNpb24gMjM3MjU5KQorKysgU291cmNlL1dlYkNv cmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmgJKHdvcmtpbmcgY29weSkKQEAgLTgzLDYgKzgzLDcgQEAg Y2xhc3MgU2hhcmVkQnVmZmVyOwogY2xhc3MgU3ViZnJhbWVMb2FkZXI7CiBjbGFzcyBTdWJzdGl0 dXRlRGF0YTsKIAorZW51bSBjbGFzcyBOZXdMb2FkSW5Qcm9ncmVzcyA6IGJvb2w7CiBlbnVtIGNs YXNzIFNob3VsZENvbnRpbnVlOwogZW51bSBjbGFzcyBTaG91bGRUcmVhdEFzQ29udGludWluZ0xv YWQgOiBib29sOwogCkBAIC0yODAsNyArMjgxLDcgQEAgcHVibGljOgogICAgIHZvaWQgY29tcGxl dGVkKCk7CiAgICAgYm9vbCBhbGxBbmNlc3RvcnNBcmVDb21wbGV0ZSgpIGNvbnN0OyAvLyBpbmNs dWRpbmcgdGhpcwogICAgIHZvaWQgY2xpZW50UmVkaXJlY3RlZChjb25zdCBVUkwmLCBkb3VibGUg ZGVsYXksIFdhbGxUaW1lIGZpcmVEYXRlLCBMb2NrQmFja0ZvcndhcmRMaXN0KTsKLSAgICB2b2lk IGNsaWVudFJlZGlyZWN0Q2FuY2VsbGVkT3JGaW5pc2hlZChib29sIGNhbmNlbFdpdGhMb2FkSW5Q cm9ncmVzcyk7CisgICAgdm9pZCBjbGllbnRSZWRpcmVjdENhbmNlbGxlZE9yRmluaXNoZWQoTmV3 TG9hZEluUHJvZ3Jlc3MpOwogCiAgICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBzZXRPcmlnaW5hbFVS TEZvckRvd25sb2FkUmVxdWVzdChSZXNvdXJjZVJlcXVlc3QmKTsKIApJbmRleDogU291cmNlL1dl YkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyQ2xpZW50LmgKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyQ2xpZW50LmgJKHJldmlzaW9uIDIzNzI1OSkKKysrIFNv dXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlckNsaWVudC5oCSh3b3JraW5nIGNvcHkpCkBA IC0xMDMsNiArMTAzLDcgQEAgY2xhc3MgU3Vic3RpdHV0ZURhdGE7CiBjbGFzcyBVUkw7CiBjbGFz cyBXaWRnZXQ7CiAKK2VudW0gY2xhc3MgTG9ja0JhY2tGb3J3YXJkTGlzdCA6IGJvb2w7CiBlbnVt IGNsYXNzIFBvbGljeURlY2lzaW9uTW9kZTsKIGVudW0gY2xhc3MgU2hvdWxkU2tpcFNhZmVCcm93 c2luZ0NoZWNrIDogYm9vbDsKIApAQCAtMTY0LDcgKzE2NSw3IEBAIHB1YmxpYzoKICAgICB2aXJ0 dWFsIHZvaWQgZGlzcGF0Y2hEaWRSZWNlaXZlU2VydmVyUmVkaXJlY3RGb3JQcm92aXNpb25hbExv YWQoKSA9IDA7CiAgICAgdmlydHVhbCB2b2lkIGRpc3BhdGNoRGlkQ2hhbmdlUHJvdmlzaW9uYWxV UkwoKSB7IH0KICAgICB2aXJ0dWFsIHZvaWQgZGlzcGF0Y2hEaWRDYW5jZWxDbGllbnRSZWRpcmVj dCgpID0gMDsKLSAgICB2aXJ0dWFsIHZvaWQgZGlzcGF0Y2hXaWxsUGVyZm9ybUNsaWVudFJlZGly ZWN0KGNvbnN0IFVSTCYsIGRvdWJsZSBpbnRlcnZhbCwgV2FsbFRpbWUgZmlyZURhdGUpID0gMDsK KyAgICB2aXJ0dWFsIHZvaWQgZGlzcGF0Y2hXaWxsUGVyZm9ybUNsaWVudFJlZGlyZWN0KGNvbnN0 IFVSTCYsIGRvdWJsZSBpbnRlcnZhbCwgV2FsbFRpbWUgZmlyZURhdGUsIExvY2tCYWNrRm9yd2Fy ZExpc3QpID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgZGlzcGF0Y2hEaWRDaGFuZ2VNYWluRG9jdW1l bnQoKSB7IH0KICAgICB2aXJ0dWFsIHZvaWQgZGlzcGF0Y2hXaWxsQ2hhbmdlRG9jdW1lbnQoY29u c3QgVVJMJiwgY29uc3QgVVJMJikgeyB9CiAgICAgdmlydHVhbCB2b2lkIGRpc3BhdGNoRGlkTmF2 aWdhdGVXaXRoaW5QYWdlKCkgeyB9CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVM b2FkZXJUeXBlcy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxv YWRlclR5cGVzLmgJKHJldmlzaW9uIDIzNzI1OSkKKysrIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9G cmFtZUxvYWRlclR5cGVzLmgJKHdvcmtpbmcgY29weSkKQEAgLTEyOSwyNiArMTI5LDEwIEBAIGVu dW0gV2ViR0xMb2FkUG9saWN5IHsKICAgICBXZWJHTFBlbmRpbmdDcmVhdGlvbgogfTsKIAotZW51 bSBjbGFzcyBMb2NrSGlzdG9yeSA6IHVpbnQ4X3QgewotICAgIFllcywKLSAgICBObwotfTsKLQot ZW51bSBjbGFzcyBMb2NrQmFja0ZvcndhcmRMaXN0IDogdWludDhfdCB7Ci0gICAgWWVzLAotICAg IE5vCi19OwotCi1lbnVtIGNsYXNzIEFsbG93TmF2aWdhdGlvblRvSW52YWxpZFVSTCA6IHVpbnQ4 X3QgewotICAgIFllcywKLSAgICBObwotfTsKLQotZW51bSBjbGFzcyBIYXNJbnNlY3VyZUNvbnRl bnQgOiB1aW50OF90IHsKLSAgICBZZXMsCi0gICAgTm8sCi19OwotCitlbnVtIGNsYXNzIExvY2tI aXN0b3J5IDogYm9vbCB7IE5vLCBZZXMgfTsKK2VudW0gY2xhc3MgTG9ja0JhY2tGb3J3YXJkTGlz dCA6IGJvb2wgeyBObywgWWVzIH07CitlbnVtIGNsYXNzIEFsbG93TmF2aWdhdGlvblRvSW52YWxp ZFVSTCA6IGJvb2wgeyBObywgWWVzIH07CitlbnVtIGNsYXNzIEhhc0luc2VjdXJlQ29udGVudCA6 IGJvb2wgeyBObywgWWVzIH07CiAKIHN0cnVjdCBTeXN0ZW1QcmV2aWV3SW5mbyB7CiAgICAgSW50 UmVjdCBzeXN0ZW1QcmV2aWV3UmVjdDsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2xvYWRlci9OYXZp Z2F0aW9uU2NoZWR1bGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9sb2FkZXIv TmF2aWdhdGlvblNjaGVkdWxlci5jcHAJKHJldmlzaW9uIDIzNzI1OSkKKysrIFNvdXJjZS9XZWJD b3JlL2xvYWRlci9OYXZpZ2F0aW9uU2NoZWR1bGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtOTEs NyArOTEsNyBAQCBwdWJsaWM6CiAKICAgICB2aXJ0dWFsIGJvb2wgc2hvdWxkU3RhcnRUaW1lcihG cmFtZSYpIHsgcmV0dXJuIHRydWU7IH0KICAgICB2aXJ0dWFsIHZvaWQgZGlkU3RhcnRUaW1lcihG cmFtZSYsIFRpbWVyJikgeyB9Ci0gICAgdmlydHVhbCB2b2lkIGRpZFN0b3BUaW1lcihGcmFtZSYs IGJvb2wgLyogbmV3TG9hZEluUHJvZ3Jlc3MgKi8pIHsgfQorICAgIHZpcnR1YWwgdm9pZCBkaWRT dG9wVGltZXIoRnJhbWUmLCBOZXdMb2FkSW5Qcm9ncmVzcykgeyB9CiAKICAgICBkb3VibGUgZGVs YXkoKSBjb25zdCB7IHJldHVybiBtX2RlbGF5OyB9CiAgICAgTG9ja0hpc3RvcnkgbG9ja0hpc3Rv cnkoKSBjb25zdCB7IHJldHVybiBtX2xvY2tIaXN0b3J5OyB9CkBAIC0xMzcsNyArMTM3LDcgQEAg cHJvdGVjdGVkOgogICAgICAgICBmcmFtZS5sb2FkZXIoKS5jbGllbnRSZWRpcmVjdGVkKG1fdXJs LCBkZWxheSgpLCBXYWxsVGltZTo6bm93KCkgKyB0aW1lci5uZXh0RmlyZUludGVydmFsKCksIGxv Y2tCYWNrRm9yd2FyZExpc3QoKSk7CiAgICAgfQogCi0gICAgdm9pZCBkaWRTdG9wVGltZXIoRnJh bWUmIGZyYW1lLCBib29sIG5ld0xvYWRJblByb2dyZXNzKSBvdmVycmlkZQorICAgIHZvaWQgZGlk U3RvcFRpbWVyKEZyYW1lJiBmcmFtZSwgTmV3TG9hZEluUHJvZ3Jlc3MgbmV3TG9hZEluUHJvZ3Jl c3MpIG92ZXJyaWRlCiAgICAgewogICAgICAgICBpZiAoIW1faGF2ZVRvbGRDbGllbnQpCiAgICAg ICAgICAgICByZXR1cm47CkBAIC0yODcsNyArMjg3LDcgQEAgcHVibGljOgogICAgICAgICBmcmFt ZS5sb2FkZXIoKS5jbGllbnRSZWRpcmVjdGVkKG1fc3VibWlzc2lvbi0+cmVxdWVzdFVSTCgpLCBk ZWxheSgpLCBXYWxsVGltZTo6bm93KCkgKyB0aW1lci5uZXh0RmlyZUludGVydmFsKCksIGxvY2tC YWNrRm9yd2FyZExpc3QoKSk7CiAgICAgfQogCi0gICAgdm9pZCBkaWRTdG9wVGltZXIoRnJhbWUm IGZyYW1lLCBib29sIG5ld0xvYWRJblByb2dyZXNzKSBvdmVycmlkZQorICAgIHZvaWQgZGlkU3Rv cFRpbWVyKEZyYW1lJiBmcmFtZSwgTmV3TG9hZEluUHJvZ3Jlc3MgbmV3TG9hZEluUHJvZ3Jlc3Mp IG92ZXJyaWRlCiAgICAgewogICAgICAgICBpZiAoIW1faGF2ZVRvbGRDbGllbnQpCiAgICAgICAg ICAgICByZXR1cm47CkBAIC01NTUsMTUgKzU1NSwxNSBAQCB2b2lkIE5hdmlnYXRpb25TY2hlZHVs ZXI6OnN0YXJ0VGltZXIoKQogICAgIG1fcmVkaXJlY3QtPmRpZFN0YXJ0VGltZXIobV9mcmFtZSwg bV90aW1lcik7IC8vIG1fcmVkaXJlY3QgbWF5IGJlIG51bGwgb24gcmV0dXJuIChlLmcuIHRoZSBj bGllbnQgY2FuY2VsZWQgdGhlIGxvYWQpCiB9CiAKLXZvaWQgTmF2aWdhdGlvblNjaGVkdWxlcjo6 Y2FuY2VsKGJvb2wgbmV3TG9hZEluUHJvZ3Jlc3MpCit2b2lkIE5hdmlnYXRpb25TY2hlZHVsZXI6 OmNhbmNlbChOZXdMb2FkSW5Qcm9ncmVzcyBuZXdMb2FkSW5Qcm9ncmVzcykKIHsKLSAgICBMT0co SGlzdG9yeSwgIk5hdmlnYXRpb25TY2hlZHVsZXIgJXAgY2FuY2VsKG5ld0xvYWRJblByb2dyZXNz PSVkKSIsIHRoaXMsIG5ld0xvYWRJblByb2dyZXNzKTsKKyAgICBMT0coSGlzdG9yeSwgIk5hdmln YXRpb25TY2hlZHVsZXIgJXAgY2FuY2VsKG5ld0xvYWRJblByb2dyZXNzPSVkKSIsIHRoaXMsIG5l d0xvYWRJblByb2dyZXNzID09IE5ld0xvYWRJblByb2dyZXNzOjpZZXMpOwogCiAgICAgaWYgKG1f dGltZXIuaXNBY3RpdmUoKSkKICAgICAgICAgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpmcmFt ZUNsZWFyZWRTY2hlZHVsZWROYXZpZ2F0aW9uKG1fZnJhbWUpOwogICAgIG1fdGltZXIuc3RvcCgp OwogCi0gICAgaWYgKHN0ZDo6dW5pcXVlX3B0cjxTY2hlZHVsZWROYXZpZ2F0aW9uPiByZWRpcmVj dCA9IFdURk1vdmUobV9yZWRpcmVjdCkpCisgICAgaWYgKGF1dG8gcmVkaXJlY3QgPSBXVEZNb3Zl KG1fcmVkaXJlY3QpKQogICAgICAgICByZWRpcmVjdC0+ZGlkU3RvcFRpbWVyKG1fZnJhbWUsIG5l d0xvYWRJblByb2dyZXNzKTsKIH0KIApJbmRleDogU291cmNlL1dlYkNvcmUvbG9hZGVyL05hdmln YXRpb25TY2hlZHVsZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvTmF2 aWdhdGlvblNjaGVkdWxlci5oCShyZXZpc2lvbiAyMzcyNTkpCisrKyBTb3VyY2UvV2ViQ29yZS9s b2FkZXIvTmF2aWdhdGlvblNjaGVkdWxlci5oCSh3b3JraW5nIGNvcHkpCkBAIC00Myw2ICs0Myw4 IEBAIGNsYXNzIFNjaGVkdWxlZE5hdmlnYXRpb247CiBjbGFzcyBTZWN1cml0eU9yaWdpbjsKIGNs YXNzIFVSTDsKIAorZW51bSBjbGFzcyBOZXdMb2FkSW5Qcm9ncmVzcyA6IGJvb2wgeyBObywgWWVz IH07CisgICAgCiBjbGFzcyBOYXZpZ2F0aW9uU2NoZWR1bGVyIHsKIHB1YmxpYzoKICAgICBleHBs aWNpdCBOYXZpZ2F0aW9uU2NoZWR1bGVyKEZyYW1lJik7CkBAIC02MCw3ICs2Miw3IEBAIHB1Ymxp YzoKIAogICAgIHZvaWQgc3RhcnRUaW1lcigpOwogCi0gICAgdm9pZCBjYW5jZWwoYm9vbCBuZXdM b2FkSW5Qcm9ncmVzcyA9IGZhbHNlKTsKKyAgICB2b2lkIGNhbmNlbChOZXdMb2FkSW5Qcm9ncmVz cyA9IE5ld0xvYWRJblByb2dyZXNzOjpObyk7CiAgICAgdm9pZCBjbGVhcigpOwogCiBwcml2YXRl OgpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9TdG9yZWRDcmVkZW50aWFs c1BvbGljeS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsv U3RvcmVkQ3JlZGVudGlhbHNQb2xpY3kuaAkocmV2aXNpb24gMjM3MjU5KQorKysgU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vbmV0d29yay9TdG9yZWRDcmVkZW50aWFsc1BvbGljeS5oCSh3b3JraW5n IGNvcHkpCkBAIC0yNyw3ICsyNyw3IEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotZW51bSBj bGFzcyBTdG9yZWRDcmVkZW50aWFsc1BvbGljeSA6IHVpbnQ4X3QgeworZW51bSBjbGFzcyBTdG9y ZWRDcmVkZW50aWFsc1BvbGljeSA6IGJvb2wgewogICAgIERvTm90VXNlLAogICAgIFVzZSwKIH07 CkluZGV4OiBTb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0L0NoYW5nZUxvZwkocmV2aXNpb24gMjM3MjYyKQorKysgU291cmNlL1dlYktpdC9DaGFuZ2VM b2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwyMSBAQAorMjAxOC0xMC0xOCAgQWxleCBDaHJp c3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgorCisgICAgICAgIENsZWFuIHVwIEZy YW1lTG9hZGVyIHR3by1zdGF0ZSBlbnVtcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTkwNzMxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzcy5oOgorICAg ICAgICAqIE5ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzLm1lc3NhZ2VzLmluOgorICAgICAg ICAqIFNoYXJlZC9XZWJDb3JlQXJndW1lbnRDb2RlcnMuaDoKKyAgICAgICAgKiBVSVByb2Nlc3Mv V2ViUGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5Ojp3aWxsUGVy Zm9ybUNsaWVudFJlZGlyZWN0Rm9yRnJhbWUpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdl UHJveHkuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5Lm1lc3NhZ2VzLmluOgor ICAgICAgICAqIFdlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQu Y3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJGcmFtZUxvYWRlckNsaWVudDo6ZGlzcGF0Y2hXaWxs UGVyZm9ybUNsaWVudFJlZGlyZWN0KToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYkNvcmVTdXBw b3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50Lmg6CisKIDIwMTgtMTAtMTggIFlvdWVubiBGYWJsZXQg IDx5b3Vlbm5AYXBwbGUuY29tPgogCiAgICAgICAgIEhhbmRsZSBNRE5TIHJlc29sdXRpb24gb2Yg Y2FuZGlkYXRlcyB0aHJvdWdoIGxpYndlYnJ0YyBkaXJlY3RseQpJbmRleDogU291cmNlL1dlYktp dC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzcy5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3MuaAkocmV2aXNpb24gMjM3MjU5KQor KysgU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzcy5oCSh3b3JraW5n IGNvcHkpCkBAIC02Niw3ICs2Niw3IEBAIGNsYXNzIFJlc291cmNlRXJyb3I7CiBjbGFzcyBTV1Nl cnZlcjsKIGNsYXNzIFNlY3VyaXR5T3JpZ2luOwogY2xhc3MgVVJMOwotZW51bSBjbGFzcyBTdG9y ZWRDcmVkZW50aWFsc1BvbGljeSA6IHVpbnQ4X3Q7CitlbnVtIGNsYXNzIFN0b3JlZENyZWRlbnRp YWxzUG9saWN5IDogYm9vbDsKIHN0cnVjdCBNZXNzYWdlV2l0aE1lc3NhZ2VQb3J0czsKIHN0cnVj dCBTZWN1cml0eU9yaWdpbkRhdGE7CiBzdHJ1Y3QgU291cE5ldHdvcmtQcm94eVNldHRpbmdzOwpJ bmRleDogU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzcy5tZXNzYWdl cy5pbgo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtQ cm9jZXNzLm1lc3NhZ2VzLmluCShyZXZpc2lvbiAyMzcyNTkpCisrKyBTb3VyY2UvV2ViS2l0L05l dHdvcmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzLm1lc3NhZ2VzLmluCSh3b3JraW5nIGNvcHkpCkBA IC03OSw3ICs3OSw3IEBAIG1lc3NhZ2VzIC0+IE5ldHdvcmtQcm9jZXNzIExlZ2FjeVJlY2VpdmUK IAogICAgIFdyaXRlQmxvYlRvRmlsZVBhdGgoV2ViQ29yZTo6VVJMIGJsb2JVUkwsIFN0cmluZyBw YXRoLCBXZWJLaXQ6OlNhbmRib3hFeHRlbnNpb246OkhhbmRsZSBoYW5kbGUsIHVpbnQ2NF90IGNh bGxiYWNrSUQpCiAKLSAgICBQcmVjb25uZWN0VG8oV2ViQ29yZTo6VVJMIHVybCwgZW51bTp1aW50 OF90IFdlYkNvcmU6OlN0b3JlZENyZWRlbnRpYWxzUG9saWN5IHN0b3JlZENyZWRlbnRpYWxzUG9s aWN5KTsKKyAgICBQcmVjb25uZWN0VG8oV2ViQ29yZTo6VVJMIHVybCwgZW51bTpib29sIFdlYkNv cmU6OlN0b3JlZENyZWRlbnRpYWxzUG9saWN5IHN0b3JlZENyZWRlbnRpYWxzUG9saWN5KTsKIAog I2lmIEVOQUJMRShSRVNPVVJDRV9MT0FEX1NUQVRJU1RJQ1MpCiAgICAgVXBkYXRlUHJldmFsZW50 RG9tYWluc1RvQmxvY2tDb29raWVzRm9yKFBBTDo6U2Vzc2lvbklEIHNlc3Npb25JRCwgVmVjdG9y PFN0cmluZz4gZG9tYWluc1RvQmxvY2ssIGJvb2wgc2hvdWxkQ2xlYXJGaXJzdCwgdWludDY0X3Qg Y29udGV4dElkKQpJbmRleDogU291cmNlL1dlYktpdC9TY3JpcHRzL3dlYmtpdC9tZXNzYWdlcy5w eQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1NjcmlwdHMvd2Via2l0L21lc3NhZ2VzLnB5 CShyZXZpc2lvbiAyMzcyNTkpCisrKyBTb3VyY2UvV2ViS2l0L1NjcmlwdHMvd2Via2l0L21lc3Nh Z2VzLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0zODgsNiArMzg4LDcgQEAgZGVmIGhlYWRlcnNfZm9y X3R5cGUodHlwZSk6CiAgICAgICAgICdXZWJDb3JlOjpJbmNsdWRlU2VjdXJlQ29va2llcyc6IFsn PFdlYkNvcmUvQ29va2llc1N0cmF0ZWd5Lmg+J10sCiAgICAgICAgICdXZWJDb3JlOjpLZXlmcmFt ZVZhbHVlTGlzdCc6IFsnPFdlYkNvcmUvR3JhcGhpY3NMYXllci5oPiddLAogICAgICAgICAnV2Vi Q29yZTo6S2V5cHJlc3NDb21tYW5kJzogWyc8V2ViQ29yZS9LZXlib2FyZEV2ZW50Lmg+J10sCisg ICAgICAgICdXZWJDb3JlOjpMb2NrQmFja0ZvcndhcmRMaXN0JzogWyc8V2ViQ29yZS9GcmFtZUxv YWRlclR5cGVzLmg+J10sCiAgICAgICAgICdXZWJDb3JlOjpOZXR3b3JrVHJhbnNhY3Rpb25JbmZv cm1hdGlvbic6IFsnPFdlYkNvcmUvTmV0d29ya0xvYWRJbmZvcm1hdGlvbi5oPiddLAogICAgICAg ICAnV2ViQ29yZTo6UGFzdGVib2FyZEN1c3RvbURhdGEnOiBbJzxXZWJDb3JlL1Bhc3RlYm9hcmQu aD4nXSwKICAgICAgICAgJ1dlYkNvcmU6OlBhc3RlYm9hcmRJbWFnZSc6IFsnPFdlYkNvcmUvUGFz dGVib2FyZC5oPiddLApJbmRleDogU291cmNlL1dlYktpdC9TaGFyZWQvV2ViQ29yZUFyZ3VtZW50 Q29kZXJzLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9TaGFyZWQvV2ViQ29yZUFyZ3Vt ZW50Q29kZXJzLmgJKHJldmlzaW9uIDIzNzI1OSkKKysrIFNvdXJjZS9XZWJLaXQvU2hhcmVkL1dl YkNvcmVBcmd1bWVudENvZGVycy5oCSh3b3JraW5nIGNvcHkpCkBAIC03MzMsMTQgKzczMyw2IEBA IHRlbXBsYXRlPD4gc3RydWN0IEVudW1UcmFpdHM8V2ViQ29yZTo6Q28KICAgICA+OwogfTsKIAot dGVtcGxhdGU8PiBzdHJ1Y3QgRW51bVRyYWl0czxXZWJDb3JlOjpIYXNJbnNlY3VyZUNvbnRlbnQ+ IHsKLSAgICB1c2luZyB2YWx1ZXMgPSBFbnVtVmFsdWVzPAotICAgICAgICBXZWJDb3JlOjpIYXNJ bnNlY3VyZUNvbnRlbnQsCi0gICAgICAgIFdlYkNvcmU6Okhhc0luc2VjdXJlQ29udGVudDo6Tm8s Ci0gICAgICAgIFdlYkNvcmU6Okhhc0luc2VjdXJlQ29udGVudDo6WWVzCi0gICAgPjsKLX07Ci0K IHRlbXBsYXRlPD4gc3RydWN0IEVudW1UcmFpdHM8V2ViQ29yZTo6QXV0b3BsYXlFdmVudD4gewog ICAgIHVzaW5nIHZhbHVlcyA9IEVudW1WYWx1ZXM8CiAgICAgICAgIFdlYkNvcmU6OkF1dG9wbGF5 RXZlbnQsCkBAIC03NTEsMTQgKzc0Myw2IEBAIHRlbXBsYXRlPD4gc3RydWN0IEVudW1UcmFpdHM8 V2ViQ29yZTo6QXUKICAgICA+OwogfTsKIAotdGVtcGxhdGU8PiBzdHJ1Y3QgRW51bVRyYWl0czxX ZWJDb3JlOjpTaG91bGRTYW1wbGU+IHsKLSAgICB1c2luZyB2YWx1ZXMgPSBFbnVtVmFsdWVzPAot ICAgICAgICBXZWJDb3JlOjpTaG91bGRTYW1wbGUsCi0gICAgICAgIFdlYkNvcmU6OlNob3VsZFNh bXBsZTo6Tm8sCi0gICAgICAgIFdlYkNvcmU6OlNob3VsZFNhbXBsZTo6WWVzCi0gICAgPjsKLX07 Ci0KIHRlbXBsYXRlPD4gc3RydWN0IEVudW1UcmFpdHM8V2ViQ29yZTo6TmV0d29ya0xvYWRQcmlv cml0eT4gewogICAgIHVzaW5nIHZhbHVlcyA9IEVudW1WYWx1ZXM8CiAgICAgICAgIFdlYkNvcmU6 Ok5ldHdvcmtMb2FkUHJpb3JpdHksCkBAIC04MDgsMTQgKzc5Miw2IEBAIHRlbXBsYXRlPD4gc3Ry dWN0IEVudW1UcmFpdHM8V2ViQ29yZTo6TWUKICAgICA+OwogfTsKIAotdGVtcGxhdGUgPD4gc3Ry dWN0IEVudW1UcmFpdHM8V2ViQ29yZTo6U3RvcmVkQ3JlZGVudGlhbHNQb2xpY3k+IHsKLSAgICB1 c2luZyB2YWx1ZXMgPSBFbnVtVmFsdWVzPAotICAgICAgICBXZWJDb3JlOjpTdG9yZWRDcmVkZW50 aWFsc1BvbGljeSwKLSAgICAgICAgV2ViQ29yZTo6U3RvcmVkQ3JlZGVudGlhbHNQb2xpY3k6OkRv Tm90VXNlLAotICAgICAgICBXZWJDb3JlOjpTdG9yZWRDcmVkZW50aWFsc1BvbGljeTo6VXNlCi0g ICAgPjsKLX07Ci0KIHRlbXBsYXRlIDw+IHN0cnVjdCBFbnVtVHJhaXRzPFdlYkNvcmU6Oldvcmtl clR5cGU+IHsKICAgICB1c2luZyB2YWx1ZXMgPSBFbnVtVmFsdWVzPAogICAgICAgICBXZWJDb3Jl OjpXb3JrZXJUeXBlLApJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5 LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHku Y3BwCShyZXZpc2lvbiAyMzcyNTkpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdl UHJveHkuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zNjA1LDcgKzM2MDUsNyBAQCB2b2lkIFdlYlBh Z2VQcm94eTo6ZGlkUmVjZWl2ZVNlcnZlclJlZGlyCiAgICAgICAgIG1fbmF2aWdhdGlvbkNsaWVu dC0+ZGlkUmVjZWl2ZVNlcnZlclJlZGlyZWN0Rm9yUHJvdmlzaW9uYWxOYXZpZ2F0aW9uKCp0aGlz LCBuYXZpZ2F0aW9uLmdldCgpLCBtX3Byb2Nlc3MtPnRyYW5zZm9ybUhhbmRsZXNUb09iamVjdHMo dXNlckRhdGEub2JqZWN0KCkpLmdldCgpKTsKIH0KIAotdm9pZCBXZWJQYWdlUHJveHk6OndpbGxQ ZXJmb3JtQ2xpZW50UmVkaXJlY3RGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCBjb25zdCBTdHJp bmcmIHVybCwgZG91YmxlIGRlbGF5KQordm9pZCBXZWJQYWdlUHJveHk6OndpbGxQZXJmb3JtQ2xp ZW50UmVkaXJlY3RGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCBjb25zdCBTdHJpbmcmIHVybCwg ZG91YmxlIGRlbGF5LCBXZWJDb3JlOjpMb2NrQmFja0ZvcndhcmRMaXN0KQogewogICAgIFBhZ2VD bGllbnRQcm90ZWN0b3IgcHJvdGVjdG9yKHBhZ2VDbGllbnQoKSk7CiAKSW5kZXg6IFNvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCShyZXZpc2lvbiAyMzcyNTkpCisrKyBTb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAkod29ya2luZyBjb3B5KQpAQCAtMTc3LDcg KzE3Nyw4IEBAIGNsYXNzIFZhbGlkYXRpb25CdWJibGU7CiBlbnVtIFNlbGVjdGlvbkRpcmVjdGlv biA6IHVpbnQ4X3Q7CiAKIGVudW0gY2xhc3MgQXV0b3BsYXlFdmVudCA6IHVpbnQ4X3Q7Ci1lbnVt IGNsYXNzIEhhc0luc2VjdXJlQ29udGVudCA6IHVpbnQ4X3Q7CitlbnVtIGNsYXNzIExvY2tCYWNr Rm9yd2FyZExpc3QgOiBib29sOworZW51bSBjbGFzcyBIYXNJbnNlY3VyZUNvbnRlbnQgOiBib29s OwogZW51bSBjbGFzcyBOb3RpZmljYXRpb25EaXJlY3Rpb24gOiB1aW50OF90OwogZW51bSBjbGFz cyBTaG91bGRTYW1wbGUgOiBib29sOwogZW51bSBjbGFzcyBTaG91bGRUcmVhdEFzQ29udGludWlu Z0xvYWQgOiBib29sOwpAQCAtMTQxNiw3ICsxNDE3LDcgQEAgcHJpdmF0ZToKIAogICAgIHZvaWQg ZGlkU3RhcnRQcm92aXNpb25hbExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCB1aW50NjRf dCBuYXZpZ2F0aW9uSUQsIFdlYkNvcmU6OlVSTCYmLCBXZWJDb3JlOjpVUkwmJiB1bnJlYWNoYWJs ZVVSTCwgY29uc3QgVXNlckRhdGEmKTsKICAgICB2b2lkIGRpZFJlY2VpdmVTZXJ2ZXJSZWRpcmVj dEZvclByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IG5h dmlnYXRpb25JRCwgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiYsIGNvbnN0IFVzZXJEYXRhJik7 Ci0gICAgdm9pZCB3aWxsUGVyZm9ybUNsaWVudFJlZGlyZWN0Rm9yRnJhbWUodWludDY0X3QgZnJh bWVJRCwgY29uc3QgU3RyaW5nJiB1cmwsIGRvdWJsZSBkZWxheSk7CisgICAgdm9pZCB3aWxsUGVy Zm9ybUNsaWVudFJlZGlyZWN0Rm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgY29uc3QgU3RyaW5n JiB1cmwsIGRvdWJsZSBkZWxheSwgV2ViQ29yZTo6TG9ja0JhY2tGb3J3YXJkTGlzdCk7CiAgICAg dm9pZCBkaWRDYW5jZWxDbGllbnRSZWRpcmVjdEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQpOwog ICAgIHZvaWQgZGlkQ2hhbmdlUHJvdmlzaW9uYWxVUkxGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlE LCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIFdlYkNvcmU6OlVSTCYmKTsKICAgICB2b2lkIGRpZEZh aWxQcm92aXNpb25hbExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCBjb25zdCBXZWJDb3Jl OjpTZWN1cml0eU9yaWdpbkRhdGEmIGZyYW1lU2VjdXJpdHlPcmlnaW4sIHVpbnQ2NF90IG5hdmln YXRpb25JRCwgY29uc3QgU3RyaW5nJiBwcm92aXNpb25hbFVSTCwgY29uc3QgV2ViQ29yZTo6UmVz b3VyY2VFcnJvciYsIGNvbnN0IFVzZXJEYXRhJik7CkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9XZWJQYWdlUHJveHkubWVzc2FnZXMuaW4KPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktp dC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5Lm1lc3NhZ2VzLmluCShyZXZpc2lvbiAyMzcyNTkpCisr KyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkubWVzc2FnZXMuaW4JKHdvcmtp bmcgY29weSkKQEAgLTEzMCw3ICsxMzAsNyBAQCBtZXNzYWdlcyAtPiBXZWJQYWdlUHJveHkgewog ICAgICMgRnJhbWUgbG9hZCBtZXNzYWdlcwogICAgIERpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9y RnJhbWUodWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgbmF2aWdhdGlvbklELCBXZWJDb3JlOjpV UkwgdXJsLCBXZWJDb3JlOjpVUkwgdW5yZWFjaGFibGVVUkwsIFdlYktpdDo6VXNlckRhdGEgdXNl ckRhdGEpCiAgICAgRGlkUmVjZWl2ZVNlcnZlclJlZGlyZWN0Rm9yUHJvdmlzaW9uYWxMb2FkRm9y RnJhbWUodWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgbmF2aWdhdGlvbklELCBXZWJDb3JlOjpS ZXNvdXJjZVJlcXVlc3QgcmVxdWVzdCwgV2ViS2l0OjpVc2VyRGF0YSB1c2VyRGF0YSkKLSAgICBX aWxsUGVyZm9ybUNsaWVudFJlZGlyZWN0Rm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgU3RyaW5n IHVybCwgZG91YmxlIGRlbGF5KQorICAgIFdpbGxQZXJmb3JtQ2xpZW50UmVkaXJlY3RGb3JGcmFt ZSh1aW50NjRfdCBmcmFtZUlELCBTdHJpbmcgdXJsLCBkb3VibGUgZGVsYXksIGVudW06Ym9vbCBX ZWJDb3JlOjpMb2NrQmFja0ZvcndhcmRMaXN0IGxvY2tCYWNrRm9yd2FyZExpc3QpCiAgICAgRGlk Q2FuY2VsQ2xpZW50UmVkaXJlY3RGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlEKQogICAgIERpZENo YW5nZVByb3Zpc2lvbmFsVVJMRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgbmF2 aWdhdGlvbklELCBXZWJDb3JlOjpVUkwgdXJsKQogICAgIERpZEZhaWxQcm92aXNpb25hbExvYWRG b3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCBzdHJ1Y3QgV2ViQ29yZTo6U2VjdXJpdHlPcmlnaW5E YXRhIGZyYW1lU2VjdXJpdHlPcmlnaW4sIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgU3RyaW5nIHBy b3Zpc2lvbmFsVVJMLCBXZWJDb3JlOjpSZXNvdXJjZUVycm9yIGVycm9yLCBXZWJLaXQ6OlVzZXJE YXRhIHVzZXJEYXRhKQpAQCAtMTQ5LDcgKzE0OSw3IEBAIG1lc3NhZ2VzIC0+IFdlYlBhZ2VQcm94 eSB7CiAgICAgRGlkQ2hhbmdlTWFpbkRvY3VtZW50KHVpbnQ2NF90IGZyYW1lSUQpOwogICAgIERp ZERlc3Ryb3lOYXZpZ2F0aW9uKHVpbnQ2NF90IG5hdmlnYXRpb25JRCkKIAotICAgIEhhc0luc2Vj dXJlQ29udGVudCgpIC0+IChlbnVtOnVpbnQ4X3QgV2ViQ29yZTo6SGFzSW5zZWN1cmVDb250ZW50 IGhhc0luc2VjdXJlQ29udGVudCkKKyAgICBIYXNJbnNlY3VyZUNvbnRlbnQoKSAtPiAoZW51bTpi b29sIFdlYkNvcmU6Okhhc0luc2VjdXJlQ29udGVudCBoYXNJbnNlY3VyZUNvbnRlbnQpCiAKICAg ICBNYWluRnJhbWVQbHVnaW5IYW5kbGVzUGFnZVNjYWxlR2VzdHVyZURpZENoYW5nZShib29sIG1h aW5GcmFtZVBsdWdpbkhhbmRsZXNQYWdlU2NhbGVHZXN0dXJlKQogCkluZGV4OiBTb3VyY2UvV2Vi S2l0L1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJG cmFtZUxvYWRlckNsaWVudC5jcHAJKHJldmlzaW9uIDIzNzI1OSkKKysrIFNvdXJjZS9XZWJLaXQv V2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTM0NCw3ICszNDQsNyBAQCB2b2lkIFdlYkZyYW1lTG9hZGVyQ2xpZW50Ojpk aXNwYXRjaERpZENhCiAgICAgd2ViUGFnZS0+c2VuZChNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpE aWRDYW5jZWxDbGllbnRSZWRpcmVjdEZvckZyYW1lKG1fZnJhbWUtPmZyYW1lSUQoKSkpOwogfQog Ci12b2lkIFdlYkZyYW1lTG9hZGVyQ2xpZW50OjpkaXNwYXRjaFdpbGxQZXJmb3JtQ2xpZW50UmVk aXJlY3QoY29uc3QgVVJMJiB1cmwsIGRvdWJsZSBpbnRlcnZhbCwgV2FsbFRpbWUgZmlyZURhdGUp Cit2b2lkIFdlYkZyYW1lTG9hZGVyQ2xpZW50OjpkaXNwYXRjaFdpbGxQZXJmb3JtQ2xpZW50UmVk aXJlY3QoY29uc3QgVVJMJiB1cmwsIGRvdWJsZSBpbnRlcnZhbCwgV2FsbFRpbWUgZmlyZURhdGUs IExvY2tCYWNrRm9yd2FyZExpc3QgbG9ja0JhY2tGb3J3YXJkTGlzdCkKIHsKICAgICBXZWJQYWdl KiB3ZWJQYWdlID0gbV9mcmFtZS0+cGFnZSgpOwogICAgIGlmICghd2ViUGFnZSkKQEAgLTM1NCw3 ICszNTQsNyBAQCB2b2lkIFdlYkZyYW1lTG9hZGVyQ2xpZW50OjpkaXNwYXRjaFdpbGxQCiAgICAg d2ViUGFnZS0+aW5qZWN0ZWRCdW5kbGVMb2FkZXJDbGllbnQoKS53aWxsUGVyZm9ybUNsaWVudFJl ZGlyZWN0Rm9yRnJhbWUoKndlYlBhZ2UsICptX2ZyYW1lLCB1cmwsIGludGVydmFsLCBmaXJlRGF0 ZSk7CiAKICAgICAvLyBOb3RpZnkgdGhlIFVJUHJvY2Vzcy4KLSAgICB3ZWJQYWdlLT5zZW5kKE1l c3NhZ2VzOjpXZWJQYWdlUHJveHk6OldpbGxQZXJmb3JtQ2xpZW50UmVkaXJlY3RGb3JGcmFtZSht X2ZyYW1lLT5mcmFtZUlEKCksIHVybC5zdHJpbmcoKSwgaW50ZXJ2YWwpKTsKKyAgICB3ZWJQYWdl LT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OldpbGxQZXJmb3JtQ2xpZW50UmVkaXJlY3RG b3JGcmFtZShtX2ZyYW1lLT5mcmFtZUlEKCksIHVybC5zdHJpbmcoKSwgaW50ZXJ2YWwsIGxvY2tC YWNrRm9yd2FyZExpc3QpKTsKIH0KIAogdm9pZCBXZWJGcmFtZUxvYWRlckNsaWVudDo6ZGlzcGF0 Y2hEaWRDaGFuZ2VMb2NhdGlvbldpdGhpblBhZ2UoKQpJbmRleDogU291cmNlL1dlYktpdC9XZWJQ cm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVy Q2xpZW50LmgJKHJldmlzaW9uIDIzNzI1OSkKKysrIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9X ZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5oCSh3b3JraW5nIGNvcHkpCkBAIC0x MDMsNyArMTAzLDcgQEAgcHJpdmF0ZToKICAgICB2b2lkIGRpc3BhdGNoRGlkUmVjZWl2ZVNlcnZl clJlZGlyZWN0Rm9yUHJvdmlzaW9uYWxMb2FkKCkgZmluYWw7CiAgICAgdm9pZCBkaXNwYXRjaERp ZENoYW5nZVByb3Zpc2lvbmFsVVJMKCkgZmluYWw7CiAgICAgdm9pZCBkaXNwYXRjaERpZENhbmNl bENsaWVudFJlZGlyZWN0KCkgZmluYWw7Ci0gICAgdm9pZCBkaXNwYXRjaFdpbGxQZXJmb3JtQ2xp ZW50UmVkaXJlY3QoY29uc3QgV2ViQ29yZTo6VVJMJiwgZG91YmxlIGludGVydmFsLCBXYWxsVGlt ZSBmaXJlRGF0ZSkgZmluYWw7CisgICAgdm9pZCBkaXNwYXRjaFdpbGxQZXJmb3JtQ2xpZW50UmVk aXJlY3QoY29uc3QgV2ViQ29yZTo6VVJMJiwgZG91YmxlIGludGVydmFsLCBXYWxsVGltZSBmaXJl RGF0ZSwgV2ViQ29yZTo6TG9ja0JhY2tGb3J3YXJkTGlzdCkgZmluYWw7CiAgICAgdm9pZCBkaXNw YXRjaERpZENoYW5nZUxvY2F0aW9uV2l0aGluUGFnZSgpIGZpbmFsOwogICAgIHZvaWQgZGlzcGF0 Y2hEaWRQdXNoU3RhdGVXaXRoaW5QYWdlKCkgZmluYWw7CiAgICAgdm9pZCBkaXNwYXRjaERpZFJl cGxhY2VTdGF0ZVdpdGhpblBhZ2UoKSBmaW5hbDsKSW5kZXg6IFNvdXJjZS9XZWJLaXRMZWdhY3kv bWFjL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9DaGFu Z2VMb2cJKHJldmlzaW9uIDIzNzI2MCkKKysrIFNvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE0IEBACisyMDE4LTEwLTE4ICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgQ2xlYW4gdXAg RnJhbWVMb2FkZXIgdHdvLXN0YXRlIGVudW1zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xOTA3MzEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50 Lmg6CisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQubW06Cisg ICAgICAgIChXZWJGcmFtZUxvYWRlckNsaWVudDo6ZGlzcGF0Y2hXaWxsUGVyZm9ybUNsaWVudFJl ZGlyZWN0KToKKwogMjAxOC0xMC0xOCAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3 ZWJraXQub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHIyMzcxMzcuCklu ZGV4OiBTb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRl ckNsaWVudC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL1dlYkNvcmVT dXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmgJKHJldmlzaW9uIDIzNzI1OSkKKysrIFNvdXJj ZS9XZWJLaXRMZWdhY3kvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmgJ KHdvcmtpbmcgY29weSkKQEAgLTEwNyw3ICsxMDcsNyBAQCBwcml2YXRlOgogICAgIHZvaWQgZGlz cGF0Y2hEaWREaXNwYXRjaE9ubG9hZEV2ZW50cygpIGZpbmFsOwogICAgIHZvaWQgZGlzcGF0Y2hE aWRSZWNlaXZlU2VydmVyUmVkaXJlY3RGb3JQcm92aXNpb25hbExvYWQoKSBmaW5hbDsKICAgICB2 b2lkIGRpc3BhdGNoRGlkQ2FuY2VsQ2xpZW50UmVkaXJlY3QoKSBmaW5hbDsKLSAgICB2b2lkIGRp c3BhdGNoV2lsbFBlcmZvcm1DbGllbnRSZWRpcmVjdChjb25zdCBXZWJDb3JlOjpVUkwmLCBkb3Vi bGUgaW50ZXJ2YWwsIFdhbGxUaW1lIGZpcmVEYXRlKSBmaW5hbDsKKyAgICB2b2lkIGRpc3BhdGNo V2lsbFBlcmZvcm1DbGllbnRSZWRpcmVjdChjb25zdCBXZWJDb3JlOjpVUkwmLCBkb3VibGUgaW50 ZXJ2YWwsIFdhbGxUaW1lIGZpcmVEYXRlLCBXZWJDb3JlOjpMb2NrQmFja0ZvcndhcmRMaXN0KSBm aW5hbDsKICAgICB2b2lkIGRpc3BhdGNoRGlkQ2hhbmdlTG9jYXRpb25XaXRoaW5QYWdlKCkgZmlu YWw7CiAgICAgdm9pZCBkaXNwYXRjaERpZFB1c2hTdGF0ZVdpdGhpblBhZ2UoKSBmaW5hbDsKICAg ICB2b2lkIGRpc3BhdGNoRGlkUmVwbGFjZVN0YXRlV2l0aGluUGFnZSgpIGZpbmFsOwpJbmRleDog U291cmNlL1dlYktpdExlZ2FjeS9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGll bnQubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdExlZ2FjeS9tYWMvV2ViQ29yZVN1cHBv cnQvV2ViRnJhbWVMb2FkZXJDbGllbnQubW0JKHJldmlzaW9uIDIzNzI1OSkKKysrIFNvdXJjZS9X ZWJLaXRMZWdhY3kvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50Lm1tCSh3 b3JraW5nIGNvcHkpCkBAIC02MDIsNyArNjAyLDcgQEAgdm9pZCBXZWJGcmFtZUxvYWRlckNsaWVu dDo6ZGlzcGF0Y2hEaWRDYQogICAgICAgICBDYWxsRnJhbWVMb2FkRGVsZWdhdGUoaW1wbGVtZW50 YXRpb25zLT5kaWRDYW5jZWxDbGllbnRSZWRpcmVjdEZvckZyYW1lRnVuYywgd2ViVmlldywgQHNl bGVjdG9yKHdlYlZpZXc6ZGlkQ2FuY2VsQ2xpZW50UmVkaXJlY3RGb3JGcmFtZTopLCBtX3dlYkZy YW1lLmdldCgpKTsKIH0KIAotdm9pZCBXZWJGcmFtZUxvYWRlckNsaWVudDo6ZGlzcGF0Y2hXaWxs UGVyZm9ybUNsaWVudFJlZGlyZWN0KGNvbnN0IFVSTCYgdXJsLCBkb3VibGUgZGVsYXksIFdhbGxU aW1lIGZpcmVEYXRlKQordm9pZCBXZWJGcmFtZUxvYWRlckNsaWVudDo6ZGlzcGF0Y2hXaWxsUGVy Zm9ybUNsaWVudFJlZGlyZWN0KGNvbnN0IFVSTCYgdXJsLCBkb3VibGUgZGVsYXksIFdhbGxUaW1l IGZpcmVEYXRlLCBMb2NrQmFja0ZvcndhcmRMaXN0KQogewogICAgIFdlYlZpZXcgKndlYlZpZXcg PSBnZXRXZWJWaWV3KG1fd2ViRnJhbWUuZ2V0KCkpOwogICAgIFdlYkZyYW1lTG9hZERlbGVnYXRl SW1wbGVtZW50YXRpb25DYWNoZSogaW1wbGVtZW50YXRpb25zID0gV2ViVmlld0dldEZyYW1lTG9h ZERlbGVnYXRlSW1wbGVtZW50YXRpb25zKHdlYlZpZXcpOwpJbmRleDogU291cmNlL1dlYktpdExl Z2FjeS93aW4vQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXRMZWdhY3kvd2lu L0NoYW5nZUxvZwkocmV2aXNpb24gMjM3MjYyKQorKysgU291cmNlL1dlYktpdExlZ2FjeS93aW4v Q2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTgtMTAtMTggIEFs ZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBDbGVh biB1cCBGcmFtZUxvYWRlciB0d28tc3RhdGUgZW51bXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5MDczMQorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJD bGllbnQuY3BwOgorICAgICAgICAoV2ViRnJhbWVMb2FkZXJDbGllbnQ6OmRpc3BhdGNoV2lsbFBl cmZvcm1DbGllbnRSZWRpcmVjdCk6CisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVM b2FkZXJDbGllbnQuaDoKKwogMjAxOC0xMC0xNyAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3Rl bnNlbkB3ZWJraXQub3JnPgogCiAgICAgICAgIEJhY2tGb3J3YXJkQ2xpZW50IG5lZWRzIHRvIGJl IGFibGUgdG8gc3VwcG9ydCBVSVByb2Nlc3Mtb25seSBiYWNrL2ZvcndhcmQgbGlzdHMKSW5kZXg6 IFNvdXJjZS9XZWJLaXRMZWdhY3kvd2luL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xp ZW50LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0TGVnYWN5L3dpbi9XZWJDb3JlU3Vw cG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAJKHJldmlzaW9uIDIzNzI1OSkKKysrIFNvdXJj ZS9XZWJLaXRMZWdhY3kvd2luL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNw cAkod29ya2luZyBjb3B5KQpAQCAtMzU0LDcgKzM1NCw3IEBAIHZvaWQgV2ViRnJhbWVMb2FkZXJD bGllbnQ6OmRpc3BhdGNoRGlkQ2EKICAgICAgICAgZnJhbWVMb2FkRGVsZWdhdGUtPmRpZENhbmNl bENsaWVudFJlZGlyZWN0Rm9yRnJhbWUod2ViVmlldywgbV93ZWJGcmFtZSk7CiB9CiAKLXZvaWQg V2ViRnJhbWVMb2FkZXJDbGllbnQ6OmRpc3BhdGNoV2lsbFBlcmZvcm1DbGllbnRSZWRpcmVjdChj b25zdCBVUkwmIHVybCwgZG91YmxlIGRlbGF5LCBXYWxsVGltZSBmaXJlRGF0ZSkKK3ZvaWQgV2Vi RnJhbWVMb2FkZXJDbGllbnQ6OmRpc3BhdGNoV2lsbFBlcmZvcm1DbGllbnRSZWRpcmVjdChjb25z dCBVUkwmIHVybCwgZG91YmxlIGRlbGF5LCBXYWxsVGltZSBmaXJlRGF0ZSwgV2ViQ29yZTo6TG9j a0JhY2tGb3J3YXJkTGlzdCkKIHsKICAgICBXZWJWaWV3KiB3ZWJWaWV3ID0gbV93ZWJGcmFtZS0+ d2ViVmlldygpOwogICAgIENPTVB0cjxJV2ViRnJhbWVMb2FkRGVsZWdhdGU+IGZyYW1lTG9hZERl bGVnYXRlOwpJbmRleDogU291cmNlL1dlYktpdExlZ2FjeS93aW4vV2ViQ29yZVN1cHBvcnQvV2Vi RnJhbWVMb2FkZXJDbGllbnQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0TGVnYWN5L3dp bi9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5oCShyZXZpc2lvbiAyMzcyNTkp CisrKyBTb3VyY2UvV2ViS2l0TGVnYWN5L3dpbi9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRl ckNsaWVudC5oCSh3b3JraW5nIGNvcHkpCkBAIC04NSw3ICs4NSw3IEBAIHB1YmxpYzoKICAgICB2 b2lkIGRpc3BhdGNoRGlkRGlzcGF0Y2hPbmxvYWRFdmVudHMoKSBvdmVycmlkZTsKICAgICB2b2lk IGRpc3BhdGNoRGlkUmVjZWl2ZVNlcnZlclJlZGlyZWN0Rm9yUHJvdmlzaW9uYWxMb2FkKCkgb3Zl cnJpZGU7CiAgICAgdm9pZCBkaXNwYXRjaERpZENhbmNlbENsaWVudFJlZGlyZWN0KCkgb3ZlcnJp ZGU7Ci0gICAgdm9pZCBkaXNwYXRjaFdpbGxQZXJmb3JtQ2xpZW50UmVkaXJlY3QoY29uc3QgV2Vi Q29yZTo6VVJMJiwgZG91YmxlIGludGVydmFsLCBXYWxsVGltZSBmaXJlRGF0ZSkgb3ZlcnJpZGU7 CisgICAgdm9pZCBkaXNwYXRjaFdpbGxQZXJmb3JtQ2xpZW50UmVkaXJlY3QoY29uc3QgV2ViQ29y ZTo6VVJMJiwgZG91YmxlIGludGVydmFsLCBXYWxsVGltZSBmaXJlRGF0ZSwgV2ViQ29yZTo6TG9j a0JhY2tGb3J3YXJkTGlzdCkgb3ZlcnJpZGU7CiAgICAgdm9pZCBkaXNwYXRjaERpZENoYW5nZUxv Y2F0aW9uV2l0aGluUGFnZSgpIG92ZXJyaWRlOwogICAgIHZvaWQgZGlzcGF0Y2hEaWRQdXNoU3Rh dGVXaXRoaW5QYWdlKCkgb3ZlcnJpZGU7CiAgICAgdm9pZCBkaXNwYXRjaERpZFJlcGxhY2VTdGF0 ZVdpdGhpblBhZ2UoKSBvdmVycmlkZTsK