211083 2020-04-27 09:48:25 -0700 [Cocoa] After r258891, r255119 can be reverted 2020-05-07 09:27:35 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified REOPENED InRadar P2 Normal --- 211578 1 pvollan pvollan commit-queue webkit-bug-importer oldest_to_newest 1646061 0 pvollan 2020-04-27 09:48:25 -0700 Copying a MIME type map from the UI process to the WebContent process on startup is not needed anymore, since r258891 will map the Launch Services database in the WebContent process. 1646068 1 397694 pvollan 2020-04-27 10:00:41 -0700 Created attachment 397694 Patch 1646088 2 397699 pvollan 2020-04-27 10:42:01 -0700 Created attachment 397699 Patch 1646154 3 ews-feeder 2020-04-27 13:01:58 -0700 Committed r260769: <https://trac.webkit.org/changeset/260769> All reviewed patches have been landed. Closing bug and clearing flags on attachment 397699. 1646155 4 webkit-bug-importer 2020-04-27 13:02:16 -0700 <rdar://problem/62464920> 1646159 5 pvollan 2020-04-27 13:13:31 -0700 rdar://problem/60714318 1650143 6 commit-queue 2020-05-07 09:27:35 -0700 Re-opened since this is blocked by bug 211578 397694 2020-04-27 10:00:41 -0700 2020-04-27 10:41:59 -0700 Patch bug-211083-20200427100035.patch text/plain 18974 pvollan SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI2MDY2OSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBACisyMDIwLTA0LTI3ICBQZXIgQXJu ZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbQ29jb2FdIEFmdGVyIHIy NTg4OTEsIHIyNTUxMTkgY2FuIGJlIHJldmVydGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTEwODMKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzYw NzE0MzE4PgorCisgICAgICAgIFVucmV2aWV3ZWQgcmV2ZXJ0IG9mIHIyNTUxMTkuCisKKyAgICAg ICAgQ29weWluZyBhIE1JTUUgdHlwZSBtYXAgZnJvbSB0aGUgVUkgcHJvY2VzcyB0byB0aGUgV2Vi Q29udGVudCBwcm9jZXNzIG9uIHN0YXJ0dXAgaXMgbm90IG5lZWRlZCBhbnltb3JlLAorICAgICAg ICBzaW5jZSByMjU4ODkxIHdpbGwgbWFwIHRoZSBMYXVuY2ggU2VydmljZXMgZGF0YWJhc2UgaW4g dGhlIFdlYkNvbnRlbnQgcHJvY2Vzcy4KKworICAgICAgICAqIHBsYXRmb3JtL01JTUVUeXBlUmVn aXN0cnkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Y29tbW9uTWltZVR5cGVzTWFwKToKKyAgICAg ICAgKFdlYkNvcmU6OnR5cGVzRm9yQ29tbW9uRXh0ZW5zaW9uKToKKyAgICAgICAgKFdlYkNvcmU6 Om92ZXJyaWRkZW5NaW1lVHlwZXNNYXApOiBEZWxldGVkLgorICAgICAgICAqIHBsYXRmb3JtL01J TUVUeXBlUmVnaXN0cnkuaDoKKyAgICAgICAgKiB0ZXN0aW5nL0ludGVybmFscy5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpJbnRlcm5hbHM6Om1lZGlhTUlNRVR5cGVGb3JFeHRlbnNpb24pOiBEZWxl dGVkLgorICAgICAgICAqIHRlc3RpbmcvSW50ZXJuYWxzLmg6CisgICAgICAgICogdGVzdGluZy9J bnRlcm5hbHMuaWRsOgorCiAyMDIwLTA0LTI0ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5j b20+CiAKICAgICAgICAgQVNTRVJUSU9OIEZBSUxFRDogbV93cmFwcGVyIHVuZGVyIEhUTUxNZWRp YUVsZW1lbnQ6OnNldElzUGxheWluZ1RvV2lyZWxlc3NUYXJnZXQKSW5kZXg6IFNvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL01JTUVUeXBlUmVnaXN0cnkuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL01JTUVUeXBlUmVnaXN0cnkuY3BwCShyZXZpc2lvbiAyNjA2NjkpCisr KyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9NSU1FVHlwZVJlZ2lzdHJ5LmNwcAkod29ya2luZyBj b3B5KQpAQCAtMjcwLDEyICsyNzAsNiBAQCBjb25zdCBIYXNoU2V0PFN0cmluZywgQVNDSUlDYXNl SW5zZW5zaXRpCiAgICAgcmV0dXJuIHVuc3VwcG9ydGVkVGV4dE1JTUVUeXBlczsKIH0KIAotT3B0 aW9uYWw8SGFzaE1hcDxTdHJpbmcsIFZlY3RvcjxTdHJpbmc+LCBBU0NJSUNhc2VJbnNlbnNpdGl2 ZUhhc2g+PiYgb3ZlcnJpZGRlbk1pbWVUeXBlc01hcCgpCi17Ci0gICAgc3RhdGljIE5ldmVyRGVz dHJveWVkPE9wdGlvbmFsPEhhc2hNYXA8U3RyaW5nLCBWZWN0b3I8U3RyaW5nPiwgQVNDSUlDYXNl SW5zZW5zaXRpdmVIYXNoPj4+IG1hcDsKLSAgICByZXR1cm4gbWFwOwotfQotCiBjb25zdCBzdGQ6 OmluaXRpYWxpemVyX2xpc3Q8VHlwZUV4dGVuc2lvblBhaXI+JiBjb21tb25NZWRpYVR5cGVzKCkK IHsKICAgICAvLyBBIHRhYmxlIG9mIGNvbW1vbiBtZWRpYSBNSU1FIHR5cGVzIGFuZCBmaWxlIGV4 dGVuc2lvbnMgdXNlZCB3aGVuIGEgcGxhdGZvcm0ncwpAQCAtMzYyLDcgKzM1Niw3IEBAIGNvbnN0 IHN0ZDo6aW5pdGlhbGl6ZXJfbGlzdDxUeXBlRXh0ZW5zaW8KICAgICByZXR1cm4gY29tbW9uTWVk aWFUeXBlczsKIH0KIAotY29uc3QgSGFzaE1hcDxTdHJpbmcsIFZlY3RvcjxTdHJpbmc+LCBBU0NJ SUNhc2VJbnNlbnNpdGl2ZUhhc2g+JiBjb21tb25NaW1lVHlwZXNNYXAoKQorc3RhdGljIGNvbnN0 IEhhc2hNYXA8U3RyaW5nLCBWZWN0b3I8U3RyaW5nPiwgQVNDSUlDYXNlSW5zZW5zaXRpdmVIYXNo PiYgY29tbW9uTWltZVR5cGVzTWFwKCkKIHsKICAgICBBU1NFUlQoaXNNYWluVGhyZWFkKCkpOwog ICAgIHN0YXRpYyBOZXZlckRlc3Ryb3llZDxIYXNoTWFwPFN0cmluZywgVmVjdG9yPFN0cmluZz4s IEFTQ0lJQ2FzZUluc2Vuc2l0aXZlSGFzaD4+IG1pbWVUeXBlc01hcCA9IFtdIHsKQEAgLTM4Nywx MiArMzgxLDYgQEAgY29uc3QgSGFzaE1hcDxTdHJpbmcsIFZlY3RvcjxTdHJpbmc+LCBBUwogCiBz dGF0aWMgY29uc3QgVmVjdG9yPFN0cmluZz4qIHR5cGVzRm9yQ29tbW9uRXh0ZW5zaW9uKGNvbnN0 IFN0cmluZyYgZXh0ZW5zaW9uKQogewotICAgIGlmIChvdmVycmlkZGVuTWltZVR5cGVzTWFwKCku aGFzVmFsdWUoKSkgewotICAgICAgICBhdXRvIG1hcEVudHJ5ID0gb3ZlcnJpZGRlbk1pbWVUeXBl c01hcCgpLT5maW5kKGV4dGVuc2lvbik7Ci0gICAgICAgIGlmIChtYXBFbnRyeSA9PSBvdmVycmlk ZGVuTWltZVR5cGVzTWFwKCktPmVuZCgpKQotICAgICAgICAgICAgcmV0dXJuIG51bGxwdHI7Ci0g ICAgICAgIHJldHVybiAmbWFwRW50cnktPnZhbHVlOwotICAgIH0KICAgICBhdXRvIG1hcEVudHJ5 ID0gY29tbW9uTWltZVR5cGVzTWFwKCkuZmluZChleHRlbnNpb24pOwogICAgIGlmIChtYXBFbnRy eSA9PSBjb21tb25NaW1lVHlwZXNNYXAoKS5lbmQoKSkKICAgICAgICAgcmV0dXJuIG51bGxwdHI7 CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9NSU1FVHlwZVJlZ2lzdHJ5LmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vTUlNRVR5cGVSZWdpc3RyeS5oCShyZXZp c2lvbiAyNjA2NjkpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9NSU1FVHlwZVJlZ2lzdHJ5 LmgJKHdvcmtpbmcgY29weSkKQEAgLTMxLDkgKzMxLDYgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUg ewogCi1XRUJDT1JFX0VYUE9SVCBPcHRpb25hbDxIYXNoTWFwPFN0cmluZywgVmVjdG9yPFN0cmlu Zz4sIEFTQ0lJQ2FzZUluc2Vuc2l0aXZlSGFzaD4+JiBvdmVycmlkZGVuTWltZVR5cGVzTWFwKCk7 Ci1XRUJDT1JFX0VYUE9SVCBjb25zdCBIYXNoTWFwPFN0cmluZywgVmVjdG9yPFN0cmluZz4sIEFT Q0lJQ2FzZUluc2Vuc2l0aXZlSGFzaD4mIGNvbW1vbk1pbWVUeXBlc01hcCgpOwotCiBzdHJ1Y3Qg VHlwZUV4dGVuc2lvblBhaXIgewogICAgIEFTQ0lJTGl0ZXJhbCB0eXBlOwogICAgIEFTQ0lJTGl0 ZXJhbCBleHRlbnNpb247CkluZGV4OiBTb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuY3BwCShy ZXZpc2lvbiAyNjA2NjkpCisrKyBTb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTExOCw3ICsxMTgsNiBAQAogI2luY2x1ZGUgIkxpYldlYlJUQ1By b3ZpZGVyLmgiCiAjaW5jbHVkZSAiTG9hZGVyU3RyYXRlZ3kuaCIKICNpbmNsdWRlICJMb2NhdGlv bi5oIgotI2luY2x1ZGUgIk1JTUVUeXBlUmVnaXN0cnkuaCIKICNpbmNsdWRlICJNYWxsb2NTdGF0 aXN0aWNzLmgiCiAjaW5jbHVkZSAiTWVkaWFEZXZpY2VzLmgiCiAjaW5jbHVkZSAiTWVkaWFFbmdp bmVDb25maWd1cmF0aW9uRmFjdG9yeS5oIgpAQCAtNTYzMiwxMSArNTYzMSw2IEBAIGJvb2wgSW50 ZXJuYWxzOjpoYXNTYW5kYm94SU9LaXRPcGVuQWNjZXMKIH0KICNlbmRpZgogCi1TdHJpbmcgSW50 ZXJuYWxzOjptZWRpYU1JTUVUeXBlRm9yRXh0ZW5zaW9uKGNvbnN0IFN0cmluZyYgZXh0ZW5zaW9u KQotewotICAgIHJldHVybiBNSU1FVHlwZVJlZ2lzdHJ5OjpnZXRNZWRpYU1JTUVUeXBlRm9yRXh0 ZW5zaW9uKGV4dGVuc2lvbik7Ci19Ci0KIGJvb2wgSW50ZXJuYWxzOjpzdXBwb3J0c1BpY3R1cmVJ blBpY3R1cmUoKQogewogICAgIHJldHVybiBXZWJDb3JlOjpzdXBwb3J0c1BpY3R1cmVJblBpY3R1 cmUoKTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuaAkocmV2aXNpb24gMjYwNjY5 KQorKysgU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuaAkod29ya2luZyBjb3B5KQpA QCAtOTkzLDggKzk5Myw2IEBAIHB1YmxpYzoKICAgICBpbnQgcmVhZFByZWZlcmVuY2VJbnRlZ2Vy KGNvbnN0IFN0cmluZyYgZG9tYWluLCBjb25zdCBTdHJpbmcmIGtleSk7CiAgICAgU3RyaW5nIGVu Y29kZWRQcmVmZXJlbmNlVmFsdWUoY29uc3QgU3RyaW5nJiBkb21haW4sIGNvbnN0IFN0cmluZyYg a2V5KTsKIAotICAgIFN0cmluZyBtZWRpYU1JTUVUeXBlRm9yRXh0ZW5zaW9uKGNvbnN0IFN0cmlu ZyYgZXh0ZW5zaW9uKTsKLQogICAgIFN0cmluZyBnZXRVVElGcm9tVGFnKGNvbnN0IFN0cmluZyYg dGFnQ2xhc3MsIGNvbnN0IFN0cmluZyYgdGFnLCBjb25zdCBTdHJpbmcmIGNvbmZvcm1pbmdUb1VU SSk7CiAKICAgICBib29sIHN1cHBvcnRzUGljdHVyZUluUGljdHVyZSgpOwpJbmRleDogU291cmNl L1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuaWRsCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJD b3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmlkbAkocmV2aXNpb24gMjYwNjY5KQorKysgU291cmNlL1dl YkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuaWRsCSh3b3JraW5nIGNvcHkpCkBAIC04OTYsOCArODk2 LDYgQEAgZW51bSBDb21wb3NpdGluZ1BvbGljeSB7CiAgICAgbG9uZyByZWFkUHJlZmVyZW5jZUlu dGVnZXIoRE9NU3RyaW5nIGRvbWFpbiwgRE9NU3RyaW5nIGtleSk7CiAgICAgRE9NU3RyaW5nIGVu Y29kZWRQcmVmZXJlbmNlVmFsdWUoRE9NU3RyaW5nIGRvbWFpbiwgRE9NU3RyaW5nIGtleSk7CiAK LSAgICBET01TdHJpbmcgbWVkaWFNSU1FVHlwZUZvckV4dGVuc2lvbihET01TdHJpbmcgZXh0ZW5z aW9uKTsKLQogICAgIERPTVN0cmluZyBnZXRVVElGcm9tVGFnKERPTVN0cmluZyB0YWdDbGFzcywg RE9NU3RyaW5nIHRhZywgRE9NU3RyaW5nIGNvbmZvcm1pbmdUb1VUSSk7CiAKICAgICBib29sZWFu IHN1cHBvcnRzUGljdHVyZUluUGljdHVyZSgpOwpJbmRleDogU291cmNlL1dlYktpdC9DaGFuZ2VM b2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9DaGFuZ2VMb2cJKHJldmlzaW9uIDI2MDY2 OSkKKysrIFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEs MTkgQEAKKzIwMjAtMDQtMjcgIFBlciBBcm5lIFZvbGxhbiAgPHB2b2xsYW5AYXBwbGUuY29tPgor CisgICAgICAgIFtDb2NvYV0gQWZ0ZXIgcjI1ODg5MSwgcjI1NTExOSBjYW4gYmUgcmV2ZXJ0ZWQK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMTA4Mwor CisgICAgICAgIFVucmV2aWV3ZWQgcmV2ZXJ0IG9mIHIyNTUxMTkuCisKKyAgICAgICAgKiBTaGFy ZWQvV2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5jcHA6CisgICAgICAgIChXZWJLaXQ6Oldl YlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnM6OmVuY29kZSBjb25zdCk6CisgICAgICAgIChXZWJL aXQ6OldlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnM6OmRlY29kZSk6CisgICAgICAgICogU2hh cmVkL1dlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuaDoKKyAgICAgICAgKiBVSVByb2Nlc3Mv Q29jb2EvV2ViUHJvY2Vzc1Bvb2xDb2NvYS5tbToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vz c1Bvb2w6OnBsYXRmb3JtSW5pdGlhbGl6ZVdlYlByb2Nlc3MpOgorICAgICAgICAqIFdlYlByb2Nl c3MvY29jb2EvV2ViUHJvY2Vzc0NvY29hLm1tOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNz OjpwbGF0Zm9ybUluaXRpYWxpemVXZWJQcm9jZXNzKToKKwogMjAyMC0wNC0yNCAgS2F0ZSBDaGVu ZXkgIDxrYXRoZXJpbmVfY2hlbmV5QGFwcGxlLmNvbT4KIAogICAgICAgICBSZW1vdmluZyB3ZWJz aXRlIGRhdGEgZm9yIGEgZG9tYWluIHNob3VsZCBkZWxldGUgY29ycmVzcG9uZGluZyBJVFAgZW50 cnkKSW5kZXg6IFNvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRl cnMuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYlByb2Nlc3NDcmVh dGlvblBhcmFtZXRlcnMuY3BwCShyZXZpc2lvbiAyNjA2NjkpCisrKyBTb3VyY2UvV2ViS2l0L1No YXJlZC9XZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcAkod29ya2luZyBjb3B5KQpAQCAt MTc5LDcgKzE3OSw2IEBAIHZvaWQgV2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVyczo6ZW5jb2QK ICAgICBlbmNvZGVyIDw8IG5lU2Vzc2lvbk1hbmFnZXJFeHRlbnNpb25IYW5kbGU7CiAgICAgZW5j b2RlciA8PCBtYXBEQkV4dGVuc2lvbkhhbmRsZTsKICAgICBlbmNvZGVyIDw8IHN5c3RlbUhhc0Jh dHRlcnk7Ci0gICAgZW5jb2RlciA8PCBtaW1lVHlwZXNNYXA7CiAjZW5kaWYKIAogI2lmIFBMQVRG T1JNKElPU19GQU1JTFkpCkBAIC01MDMsMTIgKzUwMiw2IEBAIGJvb2wgV2ViUHJvY2Vzc0NyZWF0 aW9uUGFyYW1ldGVyczo6ZGVjb2QKICAgICBpZiAoIXN5c3RlbUhhc0JhdHRlcnkpCiAgICAgICAg IHJldHVybiBmYWxzZTsKICAgICBwYXJhbWV0ZXJzLnN5c3RlbUhhc0JhdHRlcnkgPSBXVEZNb3Zl KCpzeXN0ZW1IYXNCYXR0ZXJ5KTsKLQotICAgIE9wdGlvbmFsPE9wdGlvbmFsPEhhc2hNYXA8U3Ry aW5nLCBWZWN0b3I8U3RyaW5nPiwgQVNDSUlDYXNlSW5zZW5zaXRpdmVIYXNoPj4+IG1pbWVUeXBl c01hcDsKLSAgICBkZWNvZGVyID4+IG1pbWVUeXBlc01hcDsKLSAgICBpZiAoIW1pbWVUeXBlc01h cCkKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgIHBhcmFtZXRlcnMubWltZVR5cGVzTWFwID0g V1RGTW92ZSgqbWltZVR5cGVzTWFwKTsKICNlbmRpZgogCiAjaWYgUExBVEZPUk0oSU9TX0ZBTUlM WSkKSW5kZXg6IFNvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRl cnMuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJQcm9jZXNzQ3JlYXRp b25QYXJhbWV0ZXJzLmgJKHJldmlzaW9uIDI2MDY2OSkKKysrIFNvdXJjZS9XZWJLaXQvU2hhcmVk L1dlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuaAkod29ya2luZyBjb3B5KQpAQCAtMjE3LDcg KzIxNyw2IEBAIHN0cnVjdCBXZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzIHsKICAgICBPcHRp b25hbDxTYW5kYm94RXh0ZW5zaW9uOjpIYW5kbGU+IG5lU2Vzc2lvbk1hbmFnZXJFeHRlbnNpb25I YW5kbGU7CiAgICAgT3B0aW9uYWw8U2FuZGJveEV4dGVuc2lvbjo6SGFuZGxlPiBtYXBEQkV4dGVu c2lvbkhhbmRsZTsKICAgICBib29sIHN5c3RlbUhhc0JhdHRlcnkgeyBmYWxzZSB9OwotICAgIE9w dGlvbmFsPEhhc2hNYXA8U3RyaW5nLCBWZWN0b3I8U3RyaW5nPiwgQVNDSUlDYXNlSW5zZW5zaXRp dmVIYXNoPj4gbWltZVR5cGVzTWFwOwogI2VuZGlmCiAKICNpZiBQTEFURk9STShJT1NfRkFNSUxZ KQpJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvV2ViUHJvY2Vzc1Bvb2xDb2Nv YS5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9XZWJQcm9j ZXNzUG9vbENvY29hLm1tCShyZXZpc2lvbiAyNjA2NjkpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9Db2NvYS9XZWJQcm9jZXNzUG9vbENvY29hLm1tCSh3b3JraW5nIGNvcHkpCkBAIC01MSw3 ICs1MSw2IEBACiAjaW1wb3J0IDxXZWJDb3JlL0FHWENvbXBpbGVyU2VydmljZS5oPgogI2ltcG9y dCA8V2ViQ29yZS9Db2xvci5oPgogI2ltcG9ydCA8V2ViQ29yZS9Mb2NhbGl6ZWREZXZpY2VNb2Rl bC5oPgotI2ltcG9ydCA8V2ViQ29yZS9NSU1FVHlwZVJlZ2lzdHJ5Lmg+CiAjaW1wb3J0IDxXZWJD b3JlL05ldHdvcmtTdG9yYWdlU2Vzc2lvbi5oPgogI2ltcG9ydCA8V2ViQ29yZS9Ob3RJbXBsZW1l bnRlZC5oPgogI2ltcG9ydCA8V2ViQ29yZS9QaWN0dXJlSW5QaWN0dXJlU3VwcG9ydC5oPgpAQCAt NDE0LDcgKzQxMyw2IEBAIHZvaWQgV2ViUHJvY2Vzc1Bvb2w6OnBsYXRmb3JtSW5pdGlhbGl6ZVcK ICAgICAgICAgcGFyYW1ldGVycy5uZVNlc3Npb25NYW5hZ2VyRXh0ZW5zaW9uSGFuZGxlID0gV1RG TW92ZShtYW5hZ2VySGFuZGxlKTsKICAgICB9CiAgICAgcGFyYW1ldGVycy5zeXN0ZW1IYXNCYXR0 ZXJ5ID0gc3lzdGVtSGFzQmF0dGVyeSgpOwotICAgIHBhcmFtZXRlcnMubWltZVR5cGVzTWFwID0g Y29tbW9uTWltZVR5cGVzTWFwKCk7CiAKICAgICBTYW5kYm94RXh0ZW5zaW9uOjpIYW5kbGUgbWFw REJIYW5kbGU7CiAgICAgaWYgKFNhbmRib3hFeHRlbnNpb246OmNyZWF0ZUhhbmRsZUZvck1hY2hM b29rdXAoImNvbS5hcHBsZS5sc2QubWFwZGIiLCBXVEY6Om51bGxvcHQsIG1hcERCSGFuZGxlLCBT YW5kYm94RXh0ZW5zaW9uOjpGbGFnczo6Tm9SZXBvcnQpKQpJbmRleDogU291cmNlL1dlYktpdC9X ZWJQcm9jZXNzL2NvY29hL1dlYlByb2Nlc3NDb2NvYS5tbQo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0L1dlYlByb2Nlc3MvY29jb2EvV2ViUHJvY2Vzc0NvY29hLm1tCShyZXZpc2lvbiAyNjA2 NjkpCisrKyBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29jb2EvV2ViUHJvY2Vzc0NvY29hLm1t CSh3b3JraW5nIGNvcHkpCkBAIC02MSw3ICs2MSw2IEBACiAjaW1wb3J0IDxXZWJDb3JlL0xvY2Fs aXplZERldmljZU1vZGVsLmg+CiAjaW1wb3J0IDxXZWJDb3JlL0xvY2FsaXplZFN0cmluZ3MuaD4K ICNpbXBvcnQgPFdlYkNvcmUvTG9nSW5pdGlhbGl6YXRpb24uaD4KLSNpbXBvcnQgPFdlYkNvcmUv TUlNRVR5cGVSZWdpc3RyeS5oPgogI2ltcG9ydCA8V2ViQ29yZS9NZW1vcnlSZWxlYXNlLmg+CiAj aW1wb3J0IDxXZWJDb3JlL05TU2Nyb2xsZXJJbXBEZXRhaWxzLmg+CiAjaW1wb3J0IDxXZWJDb3Jl L05ldHdvcmtFeHRlbnNpb25Db250ZW50RmlsdGVyLmg+CkBAIC0zMjcsOSArMzI2LDYgQEAgdm9p ZCBXZWJQcm9jZXNzOjpwbGF0Zm9ybUluaXRpYWxpemVXZWJQcgogCiAgICAgc2V0U3lzdGVtSGFz QmF0dGVyeShwYXJhbWV0ZXJzLnN5c3RlbUhhc0JhdHRlcnkpOwogCi0gICAgaWYgKHBhcmFtZXRl cnMubWltZVR5cGVzTWFwKQotICAgICAgICBvdmVycmlkZGVuTWltZVR5cGVzTWFwKCkgPSBXVEZN b3ZlKHBhcmFtZXRlcnMubWltZVR5cGVzTWFwKTsKLQogI2lmIFBMQVRGT1JNKElPU19GQU1JTFkp CiAgICAgUmVuZGVyVGhlbWVJT1M6OnNldENTU1ZhbHVlVG9TeXN0ZW1Db2xvck1hcChXVEZNb3Zl KHBhcmFtZXRlcnMuY3NzVmFsdWVUb1N5c3RlbUNvbG9yTWFwKSk7CiAgICAgUmVuZGVyVGhlbWVJ T1M6OnNldEZvY3VzUmluZ0NvbG9yKHBhcmFtZXRlcnMuZm9jdXNSaW5nQ29sb3IpOwpJbmRleDog VG9vbHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0NoYW5nZUxvZwkocmV2aXNpb24g MjYwNzYyKQorKysgVG9vbHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTMg QEAKKzIwMjAtMDQtMjcgIFBlciBBcm5lIFZvbGxhbiAgPHB2b2xsYW5AYXBwbGUuY29tPgorCisg ICAgICAgIFtDb2NvYV0gQWZ0ZXIgcjI1ODg5MSwgcjI1NTExOSBjYW4gYmUgcmV2ZXJ0ZWQKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMTA4MworCisg ICAgICAgIFVucmV2aWV3ZWQgcmV2ZXJ0IG9mIHIyNTUxMTkuCisKKyAgICAgICAgKiBUZXN0V2Vi S2l0QVBJL1Rlc3RXZWJLaXRBUEkueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvajoKKyAgICAgICAg KiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdC9NaW1lVHlwZXMubW06IFJlbW92ZWQuCisKIDIw MjAtMDQtMjcgIERhbmllbCBCYXRlcyAgPGRhYmF0ZXNAYXBwbGUuY29tPgogCiAgICAgICAgIENh cmV0IG1heSBiZSBwbGFjZWQgaW4gdGhlIHdyb25nIHNwb3QgZm9yIHRleHQgaW5wdXQgY29udGV4 dCB0aGF0IGlzIGEgZm9ybSBjb250cm9sCkluZGV4OiBUb29scy9UZXN0V2ViS2l0QVBJL1Rlc3RX ZWJLaXRBUEkueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvago9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9U ZXN0V2ViS2l0QVBJL1Rlc3RXZWJLaXRBUEkueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagkocmV2 aXNpb24gMjYwNjY5KQorKysgVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0V2ViS2l0QVBJLnhjb2Rl cHJvai9wcm9qZWN0LnBieHByb2oJKHdvcmtpbmcgY29weSkKQEAgLTg4OSw3ICs4ODksNiBAQAog CQlDMEJENjY5RjEzMUQzQ0ZGMDBFMThGMkEgLyogUmVzcG9uc2l2ZW5lc3NUaW1lckRvZXNudEZp cmVFYXJseV9CdW5kbGUuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBm aWxlUmVmID0gQzBCRDY2OUUxMzFEM0NGRjAwRTE4RjJBIC8qIFJlc3BvbnNpdmVuZXNzVGltZXJE b2VzbnRGaXJlRWFybHlfQnVuZGxlLmNwcCAqLzsgfTsKIAkJQzBDNUQzQzYxNDU5OTEyOTAwQTgw MkE2IC8qIEdldEJhY2tpbmdTY2FsZUZhY3Rvcl9CdW5kbGUubW0gaW4gU291cmNlcyAqLyA9IHtp c2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBDMEM1RDNCRDE0NTk4QjZGMDBBODAyQTYgLyog R2V0QmFja2luZ1NjYWxlRmFjdG9yX0J1bmRsZS5tbSAqLzsgfTsKIAkJQzEzRDgyRDkyNDE2RjEz MjAwQTYyNzkzIC8qIEVuYWJsZUFjY2Vzc2liaWxpdHkubW0gaW4gU291cmNlcyAqLyA9IHtpc2Eg PSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBDMTNEODJEODI0MTZGMTMyMDBBNjI3OTMgLyogRW5h YmxlQWNjZXNzaWJpbGl0eS5tbSAqLzsgfTsKLQkJQzE0NUNDMEMyM0RBNUExRjAwM0E1RUVCIC8q IE1pbWVUeXBlcy5tbSBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJl ZiA9IEMxNDVDQzBCMjNEQTVBMEYwMDNBNUVFQiAvKiBNaW1lVHlwZXMubW0gKi87IH07CiAJCUMx NDlENTUwMjQyRTk4REYwMDNFQkIxMiAvKiBTbGVlcERpc2FibGVyLm1tIGluIFNvdXJjZXMgKi8g PSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gQzE0OUQ1NEYyNDJFOTg0NDAwM0VCQjEy IC8qIFNsZWVwRGlzYWJsZXIubW0gKi87IH07CiAJCUMxNUNCQjMwMjNGMUZGMUEwMDMwMENDNyAv KiBCYWNrbGlnaHRMZXZlbE5vdGlmaWNhdGlvbi5tbSBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBC WEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEMxNUNCQjJGMjNGMUZGMUEwMDMwMENDNyAvKiBCYWNrbGln aHRMZXZlbE5vdGlmaWNhdGlvbi5tbSAqLzsgfTsKIAkJQzE1Q0JCM0YyM0ZCMTc3QTAwMzAwQ0M3 IC8qIFByZWZlcmVuY2VDaGFuZ2VzLm1tIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRG aWxlOyBmaWxlUmVmID0gQzE1Q0JCM0UyM0ZCMTc3QTAwMzAwQ0M3IC8qIFByZWZlcmVuY2VDaGFu Z2VzLm1tICovOyB9OwpAQCAtMTIwMiw3ICsxMjAxLDYgQEAKIAkJCWRzdFBhdGggPSBUZXN0V2Vi S2l0QVBJLnJlc291cmNlczsKIAkJCWRzdFN1YmZvbGRlclNwZWMgPSA3OwogCQkJZmlsZXMgPSAo Ci0JCQkJNDk3MUIxMTgyNDUxRjI5QTAwOTY5OTREIC8qIGluY29ycmVjdENyZWF0ZVRhYmxlU2No ZW1hLmRiIGluIENvcHkgUmVzb3VyY2VzICovLAogCQkJCTU1QTgxN0ZGMjE4MTAyMUEwMDA0QTM5 QSAvKiAxMDB4MTAwLXJlZC50Z2EgaW4gQ29weSBSZXNvdXJjZXMgKi8sCiAJCQkJMUE5RTUyQzkx M0U2NUVGNDAwNjkxN0Y1IC8qIDE4LWNoYXJhY3RlcnMuaHRtbCBpbiBDb3B5IFJlc291cmNlcyAq LywKIAkJCQk1NUE4MTgwMDIxODEwMjIxMDAwNEEzOUEgLyogNDAweDQwMC1ncmVlbi5wbmcgaW4g Q29weSBSZXNvdXJjZXMgKi8sCkBAIC0xMzYxLDYgKzEzNTksNyBAQAogCQkJCTMxMjhBODE1MjM3 NjQxMzMwMEQ5MEQ0MCAvKiBpbWFnZS5odG1sIGluIENvcHkgUmVzb3VyY2VzICovLAogCQkJCTcy ODNBOUQwMjJGQTc1NDkwMEIyMUM3RCAvKiBpbWctd2l0aC1yb3RhdGVkLWltYWdlLmh0bWwgaW4g Q29weSBSZXNvdXJjZXMgKi8sCiAJCQkJNDk4OTdENkMyNDFGRTlFNDAwRUNGMTUzIC8qIGluLWFw cC1icm93c2VyLXByaXZhY3ktbG9jYWwtZmlsZS5odG1sIGluIENvcHkgUmVzb3VyY2VzICovLAor CQkJCTQ5NzFCMTE4MjQ1MUYyOUEwMDk2OTk0RCAvKiBpbmNvcnJlY3RDcmVhdGVUYWJsZVNjaGVt YS5kYiBpbiBDb3B5IFJlc291cmNlcyAqLywKIAkJCQk5MzU3ODZDRDIwRjZBMjkxMDAwMENERkMg LyogSW5kZXhlZERCLnNxbGl0ZTMgaW4gQ29weSBSZXNvdXJjZXMgKi8sCiAJCQkJOTM1Nzg2Q0Uy MEY2QTJBMTAwMDBDREZDIC8qIEluZGV4ZWREQi5zcWxpdGUzLXNobSBpbiBDb3B5IFJlc291cmNl cyAqLywKIAkJCQk5MzU3ODZDQzIwRjZBMjcwMDAwMENERkMgLyogSW5kZXhlZERCLnNxbGl0ZTMt d2FsIGluIENvcHkgUmVzb3VyY2VzICovLApAQCAtMjQ4NCw3ICsyNDgzLDYgQEAKIAkJQzBDNUQz QkMxNDU5OEI2RjAwQTgwMkE2IC8qIEdldEJhY2tpbmdTY2FsZUZhY3Rvci5tbSAqLyA9IHtpc2Eg PSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9 IHNvdXJjZWNvZGUuY3BwLm9iamNwcDsgcGF0aCA9IEdldEJhY2tpbmdTY2FsZUZhY3Rvci5tbTsg c291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJQzBDNUQzQkQxNDU5OEI2RjAwQTgwMkE2IC8q IEdldEJhY2tpbmdTY2FsZUZhY3Rvcl9CdW5kbGUubW0gKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVy ZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNw cC5vYmpjcHA7IHBhdGggPSBHZXRCYWNraW5nU2NhbGVGYWN0b3JfQnVuZGxlLm1tOyBzb3VyY2VU cmVlID0gIjxncm91cD4iOyB9OwogCQlDMTNEODJEODI0MTZGMTMyMDBBNjI3OTMgLyogRW5hYmxl QWNjZXNzaWJpbGl0eS5tbSAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBsYXN0S25vd25G aWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLm9iamNwcDsgcGF0aCA9IEVuYWJsZUFjY2Vzc2liaWxp dHkubW07IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07Ci0JCUMxNDVDQzBCMjNEQTVBMEYwMDNB NUVFQiAvKiBNaW1lVHlwZXMubW0gKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVu Y29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5vYmpjcHA7IHBh dGggPSBNaW1lVHlwZXMubW07IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCUMxNDlENTRG MjQyRTk4NDQwMDNFQkIxMiAvKiBTbGVlcERpc2FibGVyLm1tICovID0ge2lzYSA9IFBCWEZpbGVS ZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29k ZS5jcHAub2JqY3BwOyBwYXRoID0gU2xlZXBEaXNhYmxlci5tbTsgc291cmNlVHJlZSA9ICI8Z3Jv dXA+IjsgfTsKIAkJQzE1Q0JCMkYyM0YxRkYxQTAwMzAwQ0M3IC8qIEJhY2tsaWdodExldmVsTm90 aWZpY2F0aW9uLm1tICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGxhc3RLbm93bkZpbGVU eXBlID0gc291cmNlY29kZS5jcHAub2JqY3BwOyBwYXRoID0gQmFja2xpZ2h0TGV2ZWxOb3RpZmlj YXRpb24ubW07IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCUMxNUNCQjNFMjNGQjE3N0Ew MDMwMENDNyAvKiBQcmVmZXJlbmNlQ2hhbmdlcy5tbSAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJl bmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3Bw Lm9iamNwcDsgcGF0aCA9IFByZWZlcmVuY2VDaGFuZ2VzLm1tOyBzb3VyY2VUcmVlID0gIjxncm91 cD4iOyB9OwpAQCAtMjk1NCw3ICsyOTUyLDYgQEAKIAkJCQlFMzk0QUU2RTIzRjIzMDNFMDA1QjQ5 MzYgLyogR3JhbnRBY2Nlc3NUb01vYmlsZUFzc2V0cy5tbSAqLywKIAkJCQlFMzRBNkQxODI0MTJE RTM5MDAxMkFCNkUgLyogR3JhbnRBY2Nlc3NUb1ByZWZlcmVuY2VzU2VydmljZS5tbSAqLywKIAkJ CQlFMzVCOTA4MTIzRjYwREQwMDAwMDExRkYgLyogTG9jYWxpemVkRGV2aWNlTW9kZWwubW0gKi8s Ci0JCQkJQzE0NUNDMEIyM0RBNUEwRjAwM0E1RUVCIC8qIE1pbWVUeXBlcy5tbSAqLywKIAkJCQlF MzI1QzkwNjIzRTM4NzAyMDBCQzdEM0IgLyogUGljdHVyZUluUGljdHVyZVN1cHBvcnQubW0gKi8s CiAJCQkJQzE1Q0JCM0UyM0ZCMTc3QTAwMzAwQ0M3IC8qIFByZWZlcmVuY2VDaGFuZ2VzLm1tICov LAogCQkJCUMxNDlENTRGMjQyRTk4NDQwMDNFQkIxMiAvKiBTbGVlcERpc2FibGVyLm1tICovLApA QCAtMzQ1Niw3ICszNDUzLDYgQEAKIAkJQTE2RjY2QjgxQzQwRTlFMTAwQkQ0RDI0IC8qIFJlc291 cmNlcyAqLyA9IHsKIAkJCWlzYSA9IFBCWEdyb3VwOwogCQkJY2hpbGRyZW4gPSAoCi0JCQkJNDk3 MUIxMTcyNDUxRjI3ODAwOTY5OTREIC8qIGluY29ycmVjdENyZWF0ZVRhYmxlU2NoZW1hLmRiICov LAogCQkJCTU1QTgxN0ZFMjE4MTAxREYwMDA0QTM5QSAvKiAxMDB4MTAwLXJlZC50Z2EgKi8sCiAJ CQkJNTVBODE3RkQyMTgxMDFERjAwMDRBMzlBIC8qIDQwMHg0MDAtZ3JlZW4ucG5nICovLAogCQkJ CUMyNUNDQTBDMUU1MTQwRTUwMDI2Q0I4QSAvKiBBbGxBaGVtLnN2ZyAqLywKQEAgLTM1NTIsNiAr MzU0OCw3IEBACiAJCQkJMzEyOEE4MTQyMzc2NDBGRDAwRDkwRDQwIC8qIGltYWdlLmh0bWwgKi8s CiAJCQkJNzI4M0E5Q0UyMkZBNkJCRTAwQjIxQzdEIC8qIGltZy13aXRoLXJvdGF0ZWQtaW1hZ2Uu aHRtbCAqLywKIAkJCQk0OUQ3RkJBNzI0MUZERERBMDBBQjY3RkEgLyogaW4tYXBwLWJyb3dzZXIt cHJpdmFjeS1sb2NhbC1maWxlLmh0bWwgKi8sCisJCQkJNDk3MUIxMTcyNDUxRjI3ODAwOTY5OTRE IC8qIGluY29ycmVjdENyZWF0ZVRhYmxlU2NoZW1hLmRiICovLAogCQkJCTkzNEZBNUM3MjBGNjlG RUUwMDQwREMxQiAvKiBJbmRleGVkREIuc3FsaXRlMyAqLywKIAkJCQk5MzRGQTVDNjIwRjY5RkVE MDA0MERDMUIgLyogSW5kZXhlZERCLnNxbGl0ZTMtc2htICovLAogCQkJCTkzNEZBNUM1MjBGNjlG RUQwMDQwREMxQiAvKiBJbmRleGVkREIuc3FsaXRlMy13YWwgKi8sCkBAIC00OTg3LDcgKzQ5ODQs NiBAQAogCQkJCTVDMEJGODk0MURENTk5QzkwMEIwMDMyOCAvKiBNZW51VHlwZXNGb3JNb3VzZUV2 ZW50cy5tbSBpbiBTb3VyY2VzICovLAogCQkJCTUxNjVGRTA0MjAxRUU2MjAwMDlGN0VDMyAvKiBN ZXNzYWdlUG9ydFByb3ZpZGVycy5tbSBpbiBTb3VyY2VzICovLAogCQkJCUE1QjE0OURFMUY1QTE5 RUEwMEM2REFGRiAvKiBNSU1FVHlwZVJlZ2lzdHJ5LmNwcCBpbiBTb3VyY2VzICovLAotCQkJCUMx NDVDQzBDMjNEQTVBMUYwMDNBNUVFQiAvKiBNaW1lVHlwZXMubW0gaW4gU291cmNlcyAqLywKIAkJ CQk1MUNEMUM2QzFCMzhDRTQzMDAxNDJDQTUgLyogTW9kYWxBbGVydHMubW0gaW4gU291cmNlcyAq LywKIAkJCQk3QzgzRTBCNjFEMEE2NEIzMDBGRUJDRjMgLyogTW9kYWxBbGVydHNTUEkuY3BwIGlu IFNvdXJjZXMgKi8sCiAJCQkJN0NDRTdGMDExQTQxMUFFNjAwNDQ3QzRDIC8qIE1vdXNlTW92ZUFm dGVyQ3Jhc2guY3BwIGluIFNvdXJjZXMgKi8sCkluZGV4OiBUb29scy9UZXN0V2ViS2l0QVBJL1Rl c3RzL1dlYktpdC9NaW1lVHlwZXMubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvVGVzdFdlYktpdEFQ SS9UZXN0cy9XZWJLaXQvTWltZVR5cGVzLm1tCShyZXZpc2lvbiAyNjA2NjkpCisrKyBUb29scy9U ZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdC9NaW1lVHlwZXMubW0JKG5vbmV4aXN0ZW50KQpAQCAt MSw1MiArMCwwIEBACi0vKgotICogQ29weXJpZ2h0IChDKSAyMDIwIEFwcGxlIEluYy4gQWxsIHJp Z2h0cyByZXNlcnZlZC4KLSAqCi0gKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBh bmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKLSAqIG1vZGlmaWNhdGlvbiwgYXJlIHBl cm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwotICogYXJlIG1l dDoKLSAqIDEuIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUg YWJvdmUgY29weXJpZ2h0Ci0gKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFu ZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCi0gKiAyLiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmlu YXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdodAotICogICAgbm90aWNl LCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyIGlu IHRoZQotICogICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVk IHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KLSAqCi0gKiBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVE IEJZIEFQUExFIElOQy4gQU5EIElUUyBDT05UUklCVVRPUlMgYGBBUyBJUycnCi0gKiBBTkQgQU5Z IEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRF RCBUTywKLSAqIFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBG SVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIKLSAqIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuIElOIE5P IEVWRU5UIFNIQUxMIEFQUExFIElOQy4gT1IgSVRTIENPTlRSSUJVVE9SUwotICogQkUgTElBQkxF IEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwgRVhFTVBMQVJZ LCBPUgotICogQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRF RCBUTywgUFJPQ1VSRU1FTlQgT0YKLSAqIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExP U1MgT0YgVVNFLCBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUwotICogSU5URVJSVVBUSU9O KSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZIFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIg SU4KLSAqIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUIChJTkNMVURJTkcgTkVH TElHRU5DRSBPUiBPVEhFUldJU0UpCi0gKiBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBV U0UgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GCi0gKiBUSEUgUE9TU0lCSUxJ VFkgT0YgU1VDSCBEQU1BR0UuCi0gKi8KLQotI2ltcG9ydCAiY29uZmlnLmgiCi0KLSNpZiBXS19I QVZFX0NfU1BJCi0KLSNpbXBvcnQgIlBsYXRmb3JtVXRpbGl0aWVzLmgiCi0jaW1wb3J0ICJUZXN0 V0tXZWJWaWV3LmgiCi0jaW1wb3J0IDxXZWJDb3JlL01JTUVUeXBlUmVnaXN0cnkuaD4KLQotVEVT VChXZWJLaXQsIE1pbWVUeXBlcykKLXsKLSAgICBhdXRvIGNvbmZpZ3VyYXRpb24gPSBhZG9wdE5T KFtbV0tXZWJWaWV3Q29uZmlndXJhdGlvbiBhbGxvY10gaW5pdF0pOwotICAgIFdLUmV0YWluUHRy PFdLQ29udGV4dFJlZj4gY29udGV4dCA9IGFkb3B0V0soVGVzdFdlYktpdEFQSTo6VXRpbDo6Y3Jl YXRlQ29udGV4dEZvckluamVjdGVkQnVuZGxlVGVzdCgiSW50ZXJuYWxzSW5qZWN0ZWRCdW5kbGVU ZXN0IikpOwotICAgIGNvbmZpZ3VyYXRpb24uZ2V0KCkucHJvY2Vzc1Bvb2wgPSAoV0tQcm9jZXNz UG9vbCAqKWNvbnRleHQuZ2V0KCk7Ci0gICAgYXV0byB3ZWJWaWV3ID0gYWRvcHROUyhbW1Rlc3RX S1dlYlZpZXcgYWxsb2NdIGluaXRXaXRoRnJhbWU6TlNNYWtlUmVjdCgwLCAwLCAzMDAsIDMwMCkg Y29uZmlndXJhdGlvbjpjb25maWd1cmF0aW9uLmdldCgpIGFkZFRvV2luZG93OllFU10pOwotCi0g ICAgZm9yIChhdXRvJiBwYWlyIDogV2ViQ29yZTo6Y29tbW9uTWVkaWFUeXBlcygpKSB7Ci0gICAg ICAgIEFTQ0lJTGl0ZXJhbCBleHRlbnNpb24gPSBwYWlyLmV4dGVuc2lvbjsKLQotICAgICAgICBh dXRvIGpzID0gW05TU3RyaW5nIHN0cmluZ1dpdGhGb3JtYXQ6QCJ3aW5kb3cuaW50ZXJuYWxzLm1l ZGlhTUlNRVR5cGVGb3JFeHRlbnNpb24oXCIlc1wiKSIsIGV4dGVuc2lvbi5jaGFyYWN0ZXJzKCld OwotCi0gICAgICAgIGF1dG8gbWltZVR5cGUgPSBbd2ViVmlldyBzdHJpbmdCeUV2YWx1YXRpbmdK YXZhU2NyaXB0OmpzXTsKLQotICAgICAgICBBU1NFUlRfVFJVRShXZWJDb3JlOjpNSU1FVHlwZVJl Z2lzdHJ5OjpnZXRNZWRpYU1JTUVUeXBlRm9yRXh0ZW5zaW9uKGV4dGVuc2lvbikgPT0gU3RyaW5n KG1pbWVUeXBlKSk7Ci0gICAgfQotfQotCi0jZW5kaWYgLy8gV0tfSEFWRV9DX1NQSQo= 397699 2020-04-27 10:42:01 -0700 2020-04-28 07:27:29 -0700 Patch bug-211083-20200427104200.patch text/plain 17154 pvollan SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI2MDc2MikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBACisyMDIwLTA0LTI3ICBQZXIgQXJu ZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbQ29jb2FdIEFmdGVyIHIy NTg4OTEsIHIyNTUxMTkgY2FuIGJlIHJldmVydGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTEwODMKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzYw NzE0MzE4PgorCisgICAgICAgIFVucmV2aWV3ZWQgcmV2ZXJ0IG9mIHIyNTUxMTkuCisKKyAgICAg ICAgQ29weWluZyBhIE1JTUUgdHlwZSBtYXAgZnJvbSB0aGUgVUkgcHJvY2VzcyB0byB0aGUgV2Vi Q29udGVudCBwcm9jZXNzIG9uIHN0YXJ0dXAgaXMgbm90IG5lZWRlZCBhbnltb3JlLAorICAgICAg ICBzaW5jZSByMjU4ODkxIHdpbGwgbWFwIHRoZSBMYXVuY2ggU2VydmljZXMgZGF0YWJhc2UgaW4g dGhlIFdlYkNvbnRlbnQgcHJvY2Vzcy4KKworICAgICAgICAqIHBsYXRmb3JtL01JTUVUeXBlUmVn aXN0cnkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Y29tbW9uTWltZVR5cGVzTWFwKToKKyAgICAg ICAgKFdlYkNvcmU6OnR5cGVzRm9yQ29tbW9uRXh0ZW5zaW9uKToKKyAgICAgICAgKFdlYkNvcmU6 Om92ZXJyaWRkZW5NaW1lVHlwZXNNYXApOiBEZWxldGVkLgorICAgICAgICAqIHBsYXRmb3JtL01J TUVUeXBlUmVnaXN0cnkuaDoKKyAgICAgICAgKiB0ZXN0aW5nL0ludGVybmFscy5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpJbnRlcm5hbHM6Om1lZGlhTUlNRVR5cGVGb3JFeHRlbnNpb24pOiBEZWxl dGVkLgorICAgICAgICAqIHRlc3RpbmcvSW50ZXJuYWxzLmg6CisgICAgICAgICogdGVzdGluZy9J bnRlcm5hbHMuaWRsOgorCiAyMDIwLTA0LTI3ICBEYXJpbiBBZGxlciAgPGRhcmluQGFwcGxlLmNv bT4KIAogICAgICAgICBJbXByb3ZlIHBlcmZvcm1hbmNlIG9mIGNvbW1vbkluY2x1c2l2ZUFuY2Vz dG9yIGZvciBkZWVwbHkgbmVzdGVkIG5vZGVzCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9NSU1FVHlwZVJlZ2lzdHJ5LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9NSU1FVHlwZVJlZ2lzdHJ5LmNwcAkocmV2aXNpb24gMjYwNzYyKQorKysgU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vTUlNRVR5cGVSZWdpc3RyeS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI3 MCwxMiArMjcwLDYgQEAgY29uc3QgSGFzaFNldDxTdHJpbmcsIEFTQ0lJQ2FzZUluc2Vuc2l0aQog ICAgIHJldHVybiB1bnN1cHBvcnRlZFRleHRNSU1FVHlwZXM7CiB9CiAKLU9wdGlvbmFsPEhhc2hN YXA8U3RyaW5nLCBWZWN0b3I8U3RyaW5nPiwgQVNDSUlDYXNlSW5zZW5zaXRpdmVIYXNoPj4mIG92 ZXJyaWRkZW5NaW1lVHlwZXNNYXAoKQotewotICAgIHN0YXRpYyBOZXZlckRlc3Ryb3llZDxPcHRp b25hbDxIYXNoTWFwPFN0cmluZywgVmVjdG9yPFN0cmluZz4sIEFTQ0lJQ2FzZUluc2Vuc2l0aXZl SGFzaD4+PiBtYXA7Ci0gICAgcmV0dXJuIG1hcDsKLX0KLQogY29uc3Qgc3RkOjppbml0aWFsaXpl cl9saXN0PFR5cGVFeHRlbnNpb25QYWlyPiYgY29tbW9uTWVkaWFUeXBlcygpCiB7CiAgICAgLy8g QSB0YWJsZSBvZiBjb21tb24gbWVkaWEgTUlNRSB0eXBlcyBhbmQgZmlsZSBleHRlbnNpb25zIHVz ZWQgd2hlbiBhIHBsYXRmb3JtJ3MKQEAgLTM2Miw3ICszNTYsNyBAQCBjb25zdCBzdGQ6OmluaXRp YWxpemVyX2xpc3Q8VHlwZUV4dGVuc2lvCiAgICAgcmV0dXJuIGNvbW1vbk1lZGlhVHlwZXM7CiB9 CiAKLWNvbnN0IEhhc2hNYXA8U3RyaW5nLCBWZWN0b3I8U3RyaW5nPiwgQVNDSUlDYXNlSW5zZW5z aXRpdmVIYXNoPiYgY29tbW9uTWltZVR5cGVzTWFwKCkKK3N0YXRpYyBjb25zdCBIYXNoTWFwPFN0 cmluZywgVmVjdG9yPFN0cmluZz4sIEFTQ0lJQ2FzZUluc2Vuc2l0aXZlSGFzaD4mIGNvbW1vbk1p bWVUeXBlc01hcCgpCiB7CiAgICAgQVNTRVJUKGlzTWFpblRocmVhZCgpKTsKICAgICBzdGF0aWMg TmV2ZXJEZXN0cm95ZWQ8SGFzaE1hcDxTdHJpbmcsIFZlY3RvcjxTdHJpbmc+LCBBU0NJSUNhc2VJ bnNlbnNpdGl2ZUhhc2g+PiBtaW1lVHlwZXNNYXAgPSBbXSB7CkBAIC0zODcsMTIgKzM4MSw2IEBA IGNvbnN0IEhhc2hNYXA8U3RyaW5nLCBWZWN0b3I8U3RyaW5nPiwgQVMKIAogc3RhdGljIGNvbnN0 IFZlY3RvcjxTdHJpbmc+KiB0eXBlc0ZvckNvbW1vbkV4dGVuc2lvbihjb25zdCBTdHJpbmcmIGV4 dGVuc2lvbikKIHsKLSAgICBpZiAob3ZlcnJpZGRlbk1pbWVUeXBlc01hcCgpLmhhc1ZhbHVlKCkp IHsKLSAgICAgICAgYXV0byBtYXBFbnRyeSA9IG92ZXJyaWRkZW5NaW1lVHlwZXNNYXAoKS0+Zmlu ZChleHRlbnNpb24pOwotICAgICAgICBpZiAobWFwRW50cnkgPT0gb3ZlcnJpZGRlbk1pbWVUeXBl c01hcCgpLT5lbmQoKSkKLSAgICAgICAgICAgIHJldHVybiBudWxscHRyOwotICAgICAgICByZXR1 cm4gJm1hcEVudHJ5LT52YWx1ZTsKLSAgICB9CiAgICAgYXV0byBtYXBFbnRyeSA9IGNvbW1vbk1p bWVUeXBlc01hcCgpLmZpbmQoZXh0ZW5zaW9uKTsKICAgICBpZiAobWFwRW50cnkgPT0gY29tbW9u TWltZVR5cGVzTWFwKCkuZW5kKCkpCiAgICAgICAgIHJldHVybiBudWxscHRyOwpJbmRleDogU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vTUlNRVR5cGVSZWdpc3RyeS5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL01JTUVUeXBlUmVnaXN0cnkuaAkocmV2aXNpb24gMjYwNzYy KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vTUlNRVR5cGVSZWdpc3RyeS5oCSh3b3JraW5n IGNvcHkpCkBAIC0zMSw5ICszMSw2IEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotV0VCQ09S RV9FWFBPUlQgT3B0aW9uYWw8SGFzaE1hcDxTdHJpbmcsIFZlY3RvcjxTdHJpbmc+LCBBU0NJSUNh c2VJbnNlbnNpdGl2ZUhhc2g+PiYgb3ZlcnJpZGRlbk1pbWVUeXBlc01hcCgpOwotV0VCQ09SRV9F WFBPUlQgY29uc3QgSGFzaE1hcDxTdHJpbmcsIFZlY3RvcjxTdHJpbmc+LCBBU0NJSUNhc2VJbnNl bnNpdGl2ZUhhc2g+JiBjb21tb25NaW1lVHlwZXNNYXAoKTsKLQogc3RydWN0IFR5cGVFeHRlbnNp b25QYWlyIHsKICAgICBBU0NJSUxpdGVyYWwgdHlwZTsKICAgICBBU0NJSUxpdGVyYWwgZXh0ZW5z aW9uOwpJbmRleDogU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmNwcAkocmV2aXNpb24gMjYw NzYyKQorKysgU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC0xMTksNyArMTE5LDYgQEAKICNpbmNsdWRlICJMaWJXZWJSVENQcm92aWRlci5oIgog I2luY2x1ZGUgIkxvYWRlclN0cmF0ZWd5LmgiCiAjaW5jbHVkZSAiTG9jYXRpb24uaCIKLSNpbmNs dWRlICJNSU1FVHlwZVJlZ2lzdHJ5LmgiCiAjaW5jbHVkZSAiTWFsbG9jU3RhdGlzdGljcy5oIgog I2luY2x1ZGUgIk1lZGlhRGV2aWNlcy5oIgogI2luY2x1ZGUgIk1lZGlhRW5naW5lQ29uZmlndXJh dGlvbkZhY3RvcnkuaCIKQEAgLTU2MzMsMTEgKzU2MzIsNiBAQCBib29sIEludGVybmFsczo6aGFz U2FuZGJveElPS2l0T3BlbkFjY2VzCiB9CiAjZW5kaWYKIAotU3RyaW5nIEludGVybmFsczo6bWVk aWFNSU1FVHlwZUZvckV4dGVuc2lvbihjb25zdCBTdHJpbmcmIGV4dGVuc2lvbikKLXsKLSAgICBy ZXR1cm4gTUlNRVR5cGVSZWdpc3RyeTo6Z2V0TWVkaWFNSU1FVHlwZUZvckV4dGVuc2lvbihleHRl bnNpb24pOwotfQotCiBib29sIEludGVybmFsczo6c3VwcG9ydHNQaWN0dXJlSW5QaWN0dXJlKCkK IHsKICAgICByZXR1cm4gV2ViQ29yZTo6c3VwcG9ydHNQaWN0dXJlSW5QaWN0dXJlKCk7CkluZGV4 OiBTb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmgJKHJldmlzaW9uIDI2MDc2MikKKysrIFNvdXJj ZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmgJKHdvcmtpbmcgY29weSkKQEAgLTk5Myw4ICs5 OTMsNiBAQCBwdWJsaWM6CiAgICAgaW50IHJlYWRQcmVmZXJlbmNlSW50ZWdlcihjb25zdCBTdHJp bmcmIGRvbWFpbiwgY29uc3QgU3RyaW5nJiBrZXkpOwogICAgIFN0cmluZyBlbmNvZGVkUHJlZmVy ZW5jZVZhbHVlKGNvbnN0IFN0cmluZyYgZG9tYWluLCBjb25zdCBTdHJpbmcmIGtleSk7CiAKLSAg ICBTdHJpbmcgbWVkaWFNSU1FVHlwZUZvckV4dGVuc2lvbihjb25zdCBTdHJpbmcmIGV4dGVuc2lv bik7Ci0KICAgICBTdHJpbmcgZ2V0VVRJRnJvbVRhZyhjb25zdCBTdHJpbmcmIHRhZ0NsYXNzLCBj b25zdCBTdHJpbmcmIHRhZywgY29uc3QgU3RyaW5nJiBjb25mb3JtaW5nVG9VVEkpOwogCiAgICAg Ym9vbCBzdXBwb3J0c1BpY3R1cmVJblBpY3R1cmUoKTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3Rl c3RpbmcvSW50ZXJuYWxzLmlkbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS90ZXN0aW5n L0ludGVybmFscy5pZGwJKHJldmlzaW9uIDI2MDc2MikKKysrIFNvdXJjZS9XZWJDb3JlL3Rlc3Rp bmcvSW50ZXJuYWxzLmlkbAkod29ya2luZyBjb3B5KQpAQCAtODk2LDggKzg5Niw2IEBAIGVudW0g Q29tcG9zaXRpbmdQb2xpY3kgewogICAgIGxvbmcgcmVhZFByZWZlcmVuY2VJbnRlZ2VyKERPTVN0 cmluZyBkb21haW4sIERPTVN0cmluZyBrZXkpOwogICAgIERPTVN0cmluZyBlbmNvZGVkUHJlZmVy ZW5jZVZhbHVlKERPTVN0cmluZyBkb21haW4sIERPTVN0cmluZyBrZXkpOwogCi0gICAgRE9NU3Ry aW5nIG1lZGlhTUlNRVR5cGVGb3JFeHRlbnNpb24oRE9NU3RyaW5nIGV4dGVuc2lvbik7Ci0KICAg ICBET01TdHJpbmcgZ2V0VVRJRnJvbVRhZyhET01TdHJpbmcgdGFnQ2xhc3MsIERPTVN0cmluZyB0 YWcsIERPTVN0cmluZyBjb25mb3JtaW5nVG9VVEkpOwogCiAgICAgYm9vbGVhbiBzdXBwb3J0c1Bp Y3R1cmVJblBpY3R1cmUoKTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNjA3NjMpCisrKyBTb3Vy Y2UvV2ViS2l0L0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDIw LTA0LTI3ICBQZXIgQXJuZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBb Q29jb2FdIEFmdGVyIHIyNTg4OTEsIHIyNTUxMTkgY2FuIGJlIHJldmVydGVkCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTEwODMKKworICAgICAgICBV bnJldmlld2VkIHJldmVydCBvZiByMjU1MTE5LgorCisgICAgICAgICogU2hhcmVkL1dlYlByb2Nl c3NDcmVhdGlvblBhcmFtZXRlcnMuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzQ3Jl YXRpb25QYXJhbWV0ZXJzOjplbmNvZGUgY29uc3QpOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9j ZXNzQ3JlYXRpb25QYXJhbWV0ZXJzOjpkZWNvZGUpOgorICAgICAgICAqIFNoYXJlZC9XZWJQcm9j ZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmg6CisgICAgICAgICogVUlQcm9jZXNzL0NvY29hL1dlYlBy b2Nlc3NQb29sQ29jb2EubW06CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQb29sOjpwbGF0 Zm9ybUluaXRpYWxpemVXZWJQcm9jZXNzKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL2NvY29hL1dl YlByb2Nlc3NDb2NvYS5tbToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzczo6cGxhdGZvcm1J bml0aWFsaXplV2ViUHJvY2Vzcyk6CisKIDIwMjAtMDQtMjcgIFBlciBBcm5lIFZvbGxhbiAgPHB2 b2xsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQgc2FuZGJveCBjb21waWxlIGZp eC4KSW5kZXg6IFNvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRl cnMuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYlByb2Nlc3NDcmVh dGlvblBhcmFtZXRlcnMuY3BwCShyZXZpc2lvbiAyNjA3NjIpCisrKyBTb3VyY2UvV2ViS2l0L1No YXJlZC9XZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcAkod29ya2luZyBjb3B5KQpAQCAt MTc5LDcgKzE3OSw2IEBAIHZvaWQgV2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVyczo6ZW5jb2QK ICAgICBlbmNvZGVyIDw8IG5lU2Vzc2lvbk1hbmFnZXJFeHRlbnNpb25IYW5kbGU7CiAgICAgZW5j b2RlciA8PCBtYXBEQkV4dGVuc2lvbkhhbmRsZTsKICAgICBlbmNvZGVyIDw8IHN5c3RlbUhhc0Jh dHRlcnk7Ci0gICAgZW5jb2RlciA8PCBtaW1lVHlwZXNNYXA7CiAjZW5kaWYKIAogI2lmIFBMQVRG T1JNKElPU19GQU1JTFkpCkBAIC01MDMsMTIgKzUwMiw2IEBAIGJvb2wgV2ViUHJvY2Vzc0NyZWF0 aW9uUGFyYW1ldGVyczo6ZGVjb2QKICAgICBpZiAoIXN5c3RlbUhhc0JhdHRlcnkpCiAgICAgICAg IHJldHVybiBmYWxzZTsKICAgICBwYXJhbWV0ZXJzLnN5c3RlbUhhc0JhdHRlcnkgPSBXVEZNb3Zl KCpzeXN0ZW1IYXNCYXR0ZXJ5KTsKLQotICAgIE9wdGlvbmFsPE9wdGlvbmFsPEhhc2hNYXA8U3Ry aW5nLCBWZWN0b3I8U3RyaW5nPiwgQVNDSUlDYXNlSW5zZW5zaXRpdmVIYXNoPj4+IG1pbWVUeXBl c01hcDsKLSAgICBkZWNvZGVyID4+IG1pbWVUeXBlc01hcDsKLSAgICBpZiAoIW1pbWVUeXBlc01h cCkKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgIHBhcmFtZXRlcnMubWltZVR5cGVzTWFwID0g V1RGTW92ZSgqbWltZVR5cGVzTWFwKTsKICNlbmRpZgogCiAjaWYgUExBVEZPUk0oSU9TX0ZBTUlM WSkKSW5kZXg6IFNvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRl cnMuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJQcm9jZXNzQ3JlYXRp b25QYXJhbWV0ZXJzLmgJKHJldmlzaW9uIDI2MDc2MikKKysrIFNvdXJjZS9XZWJLaXQvU2hhcmVk L1dlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuaAkod29ya2luZyBjb3B5KQpAQCAtMjE3LDcg KzIxNyw2IEBAIHN0cnVjdCBXZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzIHsKICAgICBPcHRp b25hbDxTYW5kYm94RXh0ZW5zaW9uOjpIYW5kbGU+IG5lU2Vzc2lvbk1hbmFnZXJFeHRlbnNpb25I YW5kbGU7CiAgICAgT3B0aW9uYWw8U2FuZGJveEV4dGVuc2lvbjo6SGFuZGxlPiBtYXBEQkV4dGVu c2lvbkhhbmRsZTsKICAgICBib29sIHN5c3RlbUhhc0JhdHRlcnkgeyBmYWxzZSB9OwotICAgIE9w dGlvbmFsPEhhc2hNYXA8U3RyaW5nLCBWZWN0b3I8U3RyaW5nPiwgQVNDSUlDYXNlSW5zZW5zaXRp dmVIYXNoPj4gbWltZVR5cGVzTWFwOwogI2VuZGlmCiAKICNpZiBQTEFURk9STShJT1NfRkFNSUxZ KQpJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvV2ViUHJvY2Vzc1Bvb2xDb2Nv YS5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9XZWJQcm9j ZXNzUG9vbENvY29hLm1tCShyZXZpc2lvbiAyNjA3NjIpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9Db2NvYS9XZWJQcm9jZXNzUG9vbENvY29hLm1tCSh3b3JraW5nIGNvcHkpCkBAIC01MSw3 ICs1MSw2IEBACiAjaW1wb3J0IDxXZWJDb3JlL0FHWENvbXBpbGVyU2VydmljZS5oPgogI2ltcG9y dCA8V2ViQ29yZS9Db2xvci5oPgogI2ltcG9ydCA8V2ViQ29yZS9Mb2NhbGl6ZWREZXZpY2VNb2Rl bC5oPgotI2ltcG9ydCA8V2ViQ29yZS9NSU1FVHlwZVJlZ2lzdHJ5Lmg+CiAjaW1wb3J0IDxXZWJD b3JlL05ldHdvcmtTdG9yYWdlU2Vzc2lvbi5oPgogI2ltcG9ydCA8V2ViQ29yZS9Ob3RJbXBsZW1l bnRlZC5oPgogI2ltcG9ydCA8V2ViQ29yZS9QaWN0dXJlSW5QaWN0dXJlU3VwcG9ydC5oPgpAQCAt NDE0LDcgKzQxMyw2IEBAIHZvaWQgV2ViUHJvY2Vzc1Bvb2w6OnBsYXRmb3JtSW5pdGlhbGl6ZVcK ICAgICAgICAgcGFyYW1ldGVycy5uZVNlc3Npb25NYW5hZ2VyRXh0ZW5zaW9uSGFuZGxlID0gV1RG TW92ZShtYW5hZ2VySGFuZGxlKTsKICAgICB9CiAgICAgcGFyYW1ldGVycy5zeXN0ZW1IYXNCYXR0 ZXJ5ID0gc3lzdGVtSGFzQmF0dGVyeSgpOwotICAgIHBhcmFtZXRlcnMubWltZVR5cGVzTWFwID0g Y29tbW9uTWltZVR5cGVzTWFwKCk7CiAKICAgICBTYW5kYm94RXh0ZW5zaW9uOjpIYW5kbGUgbWFw REJIYW5kbGU7CiAgICAgaWYgKFNhbmRib3hFeHRlbnNpb246OmNyZWF0ZUhhbmRsZUZvck1hY2hM b29rdXAoImNvbS5hcHBsZS5sc2QubWFwZGIiLCBXVEY6Om51bGxvcHQsIG1hcERCSGFuZGxlLCBT YW5kYm94RXh0ZW5zaW9uOjpGbGFnczo6Tm9SZXBvcnQpKQpJbmRleDogU291cmNlL1dlYktpdC9X ZWJQcm9jZXNzL2NvY29hL1dlYlByb2Nlc3NDb2NvYS5tbQo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0L1dlYlByb2Nlc3MvY29jb2EvV2ViUHJvY2Vzc0NvY29hLm1tCShyZXZpc2lvbiAyNjA3 NjIpCisrKyBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29jb2EvV2ViUHJvY2Vzc0NvY29hLm1t CSh3b3JraW5nIGNvcHkpCkBAIC02MSw3ICs2MSw2IEBACiAjaW1wb3J0IDxXZWJDb3JlL0xvY2Fs aXplZERldmljZU1vZGVsLmg+CiAjaW1wb3J0IDxXZWJDb3JlL0xvY2FsaXplZFN0cmluZ3MuaD4K ICNpbXBvcnQgPFdlYkNvcmUvTG9nSW5pdGlhbGl6YXRpb24uaD4KLSNpbXBvcnQgPFdlYkNvcmUv TUlNRVR5cGVSZWdpc3RyeS5oPgogI2ltcG9ydCA8V2ViQ29yZS9NZW1vcnlSZWxlYXNlLmg+CiAj aW1wb3J0IDxXZWJDb3JlL05TU2Nyb2xsZXJJbXBEZXRhaWxzLmg+CiAjaW1wb3J0IDxXZWJDb3Jl L05ldHdvcmtFeHRlbnNpb25Db250ZW50RmlsdGVyLmg+CkBAIC0zMjcsOSArMzI2LDYgQEAgdm9p ZCBXZWJQcm9jZXNzOjpwbGF0Zm9ybUluaXRpYWxpemVXZWJQcgogCiAgICAgc2V0U3lzdGVtSGFz QmF0dGVyeShwYXJhbWV0ZXJzLnN5c3RlbUhhc0JhdHRlcnkpOwogCi0gICAgaWYgKHBhcmFtZXRl cnMubWltZVR5cGVzTWFwKQotICAgICAgICBvdmVycmlkZGVuTWltZVR5cGVzTWFwKCkgPSBXVEZN b3ZlKHBhcmFtZXRlcnMubWltZVR5cGVzTWFwKTsKLQogI2lmIFBMQVRGT1JNKElPU19GQU1JTFkp CiAgICAgUmVuZGVyVGhlbWVJT1M6OnNldENTU1ZhbHVlVG9TeXN0ZW1Db2xvck1hcChXVEZNb3Zl KHBhcmFtZXRlcnMuY3NzVmFsdWVUb1N5c3RlbUNvbG9yTWFwKSk7CiAgICAgUmVuZGVyVGhlbWVJ T1M6OnNldEZvY3VzUmluZ0NvbG9yKHBhcmFtZXRlcnMuZm9jdXNSaW5nQ29sb3IpOwpJbmRleDog VG9vbHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0NoYW5nZUxvZwkocmV2aXNpb24g MjYwNzYyKQorKysgVG9vbHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTMg QEAKKzIwMjAtMDQtMjcgIFBlciBBcm5lIFZvbGxhbiAgPHB2b2xsYW5AYXBwbGUuY29tPgorCisg ICAgICAgIFtDb2NvYV0gQWZ0ZXIgcjI1ODg5MSwgcjI1NTExOSBjYW4gYmUgcmV2ZXJ0ZWQKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMTA4MworCisg ICAgICAgIFVucmV2aWV3ZWQgcmV2ZXJ0IG9mIHIyNTUxMTkuCisKKyAgICAgICAgKiBUZXN0V2Vi S2l0QVBJL1Rlc3RXZWJLaXRBUEkueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvajoKKyAgICAgICAg KiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdC9NaW1lVHlwZXMubW06IFJlbW92ZWQuCisKIDIw MjAtMDQtMjcgIERhbmllbCBCYXRlcyAgPGRhYmF0ZXNAYXBwbGUuY29tPgogCiAgICAgICAgIENh cmV0IG1heSBiZSBwbGFjZWQgaW4gdGhlIHdyb25nIHNwb3QgZm9yIHRleHQgaW5wdXQgY29udGV4 dCB0aGF0IGlzIGEgZm9ybSBjb250cm9sCkluZGV4OiBUb29scy9UZXN0V2ViS2l0QVBJL1Rlc3RX ZWJLaXRBUEkueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvago9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9U ZXN0V2ViS2l0QVBJL1Rlc3RXZWJLaXRBUEkueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagkocmV2 aXNpb24gMjYwNzYyKQorKysgVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0V2ViS2l0QVBJLnhjb2Rl cHJvai9wcm9qZWN0LnBieHByb2oJKHdvcmtpbmcgY29weSkKQEAgLTg4OSw3ICs4ODksNiBAQAog CQlDMEJENjY5RjEzMUQzQ0ZGMDBFMThGMkEgLyogUmVzcG9uc2l2ZW5lc3NUaW1lckRvZXNudEZp cmVFYXJseV9CdW5kbGUuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBm aWxlUmVmID0gQzBCRDY2OUUxMzFEM0NGRjAwRTE4RjJBIC8qIFJlc3BvbnNpdmVuZXNzVGltZXJE b2VzbnRGaXJlRWFybHlfQnVuZGxlLmNwcCAqLzsgfTsKIAkJQzBDNUQzQzYxNDU5OTEyOTAwQTgw MkE2IC8qIEdldEJhY2tpbmdTY2FsZUZhY3Rvcl9CdW5kbGUubW0gaW4gU291cmNlcyAqLyA9IHtp c2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBDMEM1RDNCRDE0NTk4QjZGMDBBODAyQTYgLyog R2V0QmFja2luZ1NjYWxlRmFjdG9yX0J1bmRsZS5tbSAqLzsgfTsKIAkJQzEzRDgyRDkyNDE2RjEz MjAwQTYyNzkzIC8qIEVuYWJsZUFjY2Vzc2liaWxpdHkubW0gaW4gU291cmNlcyAqLyA9IHtpc2Eg PSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBDMTNEODJEODI0MTZGMTMyMDBBNjI3OTMgLyogRW5h YmxlQWNjZXNzaWJpbGl0eS5tbSAqLzsgfTsKLQkJQzE0NUNDMEMyM0RBNUExRjAwM0E1RUVCIC8q IE1pbWVUeXBlcy5tbSBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJl ZiA9IEMxNDVDQzBCMjNEQTVBMEYwMDNBNUVFQiAvKiBNaW1lVHlwZXMubW0gKi87IH07CiAJCUMx NDlENTUwMjQyRTk4REYwMDNFQkIxMiAvKiBTbGVlcERpc2FibGVyLm1tIGluIFNvdXJjZXMgKi8g PSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gQzE0OUQ1NEYyNDJFOTg0NDAwM0VCQjEy IC8qIFNsZWVwRGlzYWJsZXIubW0gKi87IH07CiAJCUMxNUNCQjMwMjNGMUZGMUEwMDMwMENDNyAv KiBCYWNrbGlnaHRMZXZlbE5vdGlmaWNhdGlvbi5tbSBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBC WEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEMxNUNCQjJGMjNGMUZGMUEwMDMwMENDNyAvKiBCYWNrbGln aHRMZXZlbE5vdGlmaWNhdGlvbi5tbSAqLzsgfTsKIAkJQzE1Q0JCM0YyM0ZCMTc3QTAwMzAwQ0M3 IC8qIFByZWZlcmVuY2VDaGFuZ2VzLm1tIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRG aWxlOyBmaWxlUmVmID0gQzE1Q0JCM0UyM0ZCMTc3QTAwMzAwQ0M3IC8qIFByZWZlcmVuY2VDaGFu Z2VzLm1tICovOyB9OwpAQCAtMjQ4NCw3ICsyNDgzLDYgQEAKIAkJQzBDNUQzQkMxNDU5OEI2RjAw QTgwMkE2IC8qIEdldEJhY2tpbmdTY2FsZUZhY3Rvci5tbSAqLyA9IHtpc2EgPSBQQlhGaWxlUmVm ZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUu Y3BwLm9iamNwcDsgcGF0aCA9IEdldEJhY2tpbmdTY2FsZUZhY3Rvci5tbTsgc291cmNlVHJlZSA9 ICI8Z3JvdXA+IjsgfTsKIAkJQzBDNUQzQkQxNDU5OEI2RjAwQTgwMkE2IC8qIEdldEJhY2tpbmdT Y2FsZUZhY3Rvcl9CdW5kbGUubW0gKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVu Y29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5vYmpjcHA7IHBh dGggPSBHZXRCYWNraW5nU2NhbGVGYWN0b3JfQnVuZGxlLm1tOyBzb3VyY2VUcmVlID0gIjxncm91 cD4iOyB9OwogCQlDMTNEODJEODI0MTZGMTMyMDBBNjI3OTMgLyogRW5hYmxlQWNjZXNzaWJpbGl0 eS5tbSAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBsYXN0S25vd25GaWxlVHlwZSA9IHNv dXJjZWNvZGUuY3BwLm9iamNwcDsgcGF0aCA9IEVuYWJsZUFjY2Vzc2liaWxpdHkubW07IHNvdXJj ZVRyZWUgPSAiPGdyb3VwPiI7IH07Ci0JCUMxNDVDQzBCMjNEQTVBMEYwMDNBNUVFQiAvKiBNaW1l VHlwZXMubW0gKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsg bGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5vYmpjcHA7IHBhdGggPSBNaW1lVHlw ZXMubW07IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCUMxNDlENTRGMjQyRTk4NDQwMDNF QkIxMiAvKiBTbGVlcERpc2FibGVyLm1tICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZp bGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAub2JqY3Bw OyBwYXRoID0gU2xlZXBEaXNhYmxlci5tbTsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJ QzE1Q0JCMkYyM0YxRkYxQTAwMzAwQ0M3IC8qIEJhY2tsaWdodExldmVsTm90aWZpY2F0aW9uLm1t ICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNl Y29kZS5jcHAub2JqY3BwOyBwYXRoID0gQmFja2xpZ2h0TGV2ZWxOb3RpZmljYXRpb24ubW07IHNv dXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCUMxNUNCQjNFMjNGQjE3N0EwMDMwMENDNyAvKiBQ cmVmZXJlbmNlQ2hhbmdlcy5tbSAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5j b2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLm9iamNwcDsgcGF0 aCA9IFByZWZlcmVuY2VDaGFuZ2VzLm1tOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwpAQCAt Mjk1NCw3ICsyOTUyLDYgQEAKIAkJCQlFMzk0QUU2RTIzRjIzMDNFMDA1QjQ5MzYgLyogR3JhbnRB Y2Nlc3NUb01vYmlsZUFzc2V0cy5tbSAqLywKIAkJCQlFMzRBNkQxODI0MTJERTM5MDAxMkFCNkUg LyogR3JhbnRBY2Nlc3NUb1ByZWZlcmVuY2VzU2VydmljZS5tbSAqLywKIAkJCQlFMzVCOTA4MTIz RjYwREQwMDAwMDExRkYgLyogTG9jYWxpemVkRGV2aWNlTW9kZWwubW0gKi8sCi0JCQkJQzE0NUND MEIyM0RBNUEwRjAwM0E1RUVCIC8qIE1pbWVUeXBlcy5tbSAqLywKIAkJCQlFMzI1QzkwNjIzRTM4 NzAyMDBCQzdEM0IgLyogUGljdHVyZUluUGljdHVyZVN1cHBvcnQubW0gKi8sCiAJCQkJQzE1Q0JC M0UyM0ZCMTc3QTAwMzAwQ0M3IC8qIFByZWZlcmVuY2VDaGFuZ2VzLm1tICovLAogCQkJCUMxNDlE NTRGMjQyRTk4NDQwMDNFQkIxMiAvKiBTbGVlcERpc2FibGVyLm1tICovLApAQCAtNDk4OCw3ICs0 OTg1LDYgQEAKIAkJCQk1QzBCRjg5NDFERDU5OUM5MDBCMDAzMjggLyogTWVudVR5cGVzRm9yTW91 c2VFdmVudHMubW0gaW4gU291cmNlcyAqLywKIAkJCQk1MTY1RkUwNDIwMUVFNjIwMDA5RjdFQzMg LyogTWVzc2FnZVBvcnRQcm92aWRlcnMubW0gaW4gU291cmNlcyAqLywKIAkJCQlBNUIxNDlERTFG NUExOUVBMDBDNkRBRkYgLyogTUlNRVR5cGVSZWdpc3RyeS5jcHAgaW4gU291cmNlcyAqLywKLQkJ CQlDMTQ1Q0MwQzIzREE1QTFGMDAzQTVFRUIgLyogTWltZVR5cGVzLm1tIGluIFNvdXJjZXMgKi8s CiAJCQkJNTFDRDFDNkMxQjM4Q0U0MzAwMTQyQ0E1IC8qIE1vZGFsQWxlcnRzLm1tIGluIFNvdXJj ZXMgKi8sCiAJCQkJN0M4M0UwQjYxRDBBNjRCMzAwRkVCQ0YzIC8qIE1vZGFsQWxlcnRzU1BJLmNw cCBpbiBTb3VyY2VzICovLAogCQkJCTdDQ0U3RjAxMUE0MTFBRTYwMDQ0N0M0QyAvKiBNb3VzZU1v dmVBZnRlckNyYXNoLmNwcCBpbiBTb3VyY2VzICovLApJbmRleDogVG9vbHMvVGVzdFdlYktpdEFQ SS9UZXN0cy9XZWJLaXQvTWltZVR5cGVzLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1Rlc3RXZWJL aXRBUEkvVGVzdHMvV2ViS2l0L01pbWVUeXBlcy5tbQkocmV2aXNpb24gMjYwNzYyKQorKysgVG9v bHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQvTWltZVR5cGVzLm1tCShub25leGlzdGVudCkK QEAgLTEsNTIgKzAsMCBAQAotLyoKLSAqIENvcHlyaWdodCAoQykgMjAyMCBBcHBsZSBJbmMuIEFs bCByaWdodHMgcmVzZXJ2ZWQuCi0gKgotICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3Vy Y2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0Ci0gKiBtb2RpZmljYXRpb24sIGFy ZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKLSAqIGFy ZSBtZXQ6Ci0gKiAxLiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4g dGhlIGFib3ZlIGNvcHlyaWdodAotICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9u cyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgotICogMi4gUmVkaXN0cmlidXRpb25zIGlu IGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQKLSAqICAgIG5v dGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1l ciBpbiB0aGUKLSAqICAgIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92 aWRlZCB3aXRoIHRoZSBkaXN0cmlidXRpb24uCi0gKgotICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9W SURFRCBCWSBBUFBMRSBJTkMuIEFORCBJVFMgQ09OVFJJQlVUT1JTIGBgQVMgSVMnJwotICogQU5E IEFOWSBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UIExJ TUlURUQgVE8sCi0gKiBUSEUgSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBB TkQgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSCi0gKiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiBJ TiBOTyBFVkVOVCBTSEFMTCBBUFBMRSBJTkMuIE9SIElUUyBDT05UUklCVVRPUlMKLSAqIEJFIExJ QUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJQUwsIEVYRU1Q TEFSWSwgT1IKLSAqIENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UIExJ TUlURUQgVE8sIFBST0NVUkVNRU5UIE9GCi0gKiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VT OyBMT1NTIE9GIFVTRSwgREFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5FU1MKLSAqIElOVEVSUlVQ VElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWSBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVU SEVSIElOCi0gKiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVCAoSU5DTFVESU5H IE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKQotICogQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBU SEUgVVNFIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRgotICogVEhFIFBPU1NJ QklMSVRZIE9GIFNVQ0ggREFNQUdFLgotICovCi0KLSNpbXBvcnQgImNvbmZpZy5oIgotCi0jaWYg V0tfSEFWRV9DX1NQSQotCi0jaW1wb3J0ICJQbGF0Zm9ybVV0aWxpdGllcy5oIgotI2ltcG9ydCAi VGVzdFdLV2ViVmlldy5oIgotI2ltcG9ydCA8V2ViQ29yZS9NSU1FVHlwZVJlZ2lzdHJ5Lmg+Ci0K LVRFU1QoV2ViS2l0LCBNaW1lVHlwZXMpCi17Ci0gICAgYXV0byBjb25maWd1cmF0aW9uID0gYWRv cHROUyhbW1dLV2ViVmlld0NvbmZpZ3VyYXRpb24gYWxsb2NdIGluaXRdKTsKLSAgICBXS1JldGFp blB0cjxXS0NvbnRleHRSZWY+IGNvbnRleHQgPSBhZG9wdFdLKFRlc3RXZWJLaXRBUEk6OlV0aWw6 OmNyZWF0ZUNvbnRleHRGb3JJbmplY3RlZEJ1bmRsZVRlc3QoIkludGVybmFsc0luamVjdGVkQnVu ZGxlVGVzdCIpKTsKLSAgICBjb25maWd1cmF0aW9uLmdldCgpLnByb2Nlc3NQb29sID0gKFdLUHJv Y2Vzc1Bvb2wgKiljb250ZXh0LmdldCgpOwotICAgIGF1dG8gd2ViVmlldyA9IGFkb3B0TlMoW1tU ZXN0V0tXZWJWaWV3IGFsbG9jXSBpbml0V2l0aEZyYW1lOk5TTWFrZVJlY3QoMCwgMCwgMzAwLCAz MDApIGNvbmZpZ3VyYXRpb246Y29uZmlndXJhdGlvbi5nZXQoKSBhZGRUb1dpbmRvdzpZRVNdKTsK LQotICAgIGZvciAoYXV0byYgcGFpciA6IFdlYkNvcmU6OmNvbW1vbk1lZGlhVHlwZXMoKSkgewot ICAgICAgICBBU0NJSUxpdGVyYWwgZXh0ZW5zaW9uID0gcGFpci5leHRlbnNpb247Ci0KLSAgICAg ICAgYXV0byBqcyA9IFtOU1N0cmluZyBzdHJpbmdXaXRoRm9ybWF0OkAid2luZG93LmludGVybmFs cy5tZWRpYU1JTUVUeXBlRm9yRXh0ZW5zaW9uKFwiJXNcIikiLCBleHRlbnNpb24uY2hhcmFjdGVy cygpXTsKLQotICAgICAgICBhdXRvIG1pbWVUeXBlID0gW3dlYlZpZXcgc3RyaW5nQnlFdmFsdWF0 aW5nSmF2YVNjcmlwdDpqc107Ci0KLSAgICAgICAgQVNTRVJUX1RSVUUoV2ViQ29yZTo6TUlNRVR5 cGVSZWdpc3RyeTo6Z2V0TWVkaWFNSU1FVHlwZUZvckV4dGVuc2lvbihleHRlbnNpb24pID09IFN0 cmluZyhtaW1lVHlwZSkpOwotICAgIH0KLX0KLQotI2VuZGlmIC8vIFdLX0hBVkVfQ19TUEkK