234082 2021-12-09 06:46:52 -0800 [CSS Cascade Layers] revert-layer should revert style attribute to regular author style 2021-12-14 02:16:20 -0800 1 1 1 Unclassified WebKit CSS WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 220779 1 koivisto koivisto simon.fraser webkit-bug-importer oldest_to_newest 1822112 0 koivisto 2021-12-09 06:46:52 -0800 It currently reverts to the next origin. 1822116 1 446544 koivisto 2021-12-09 06:52:17 -0800 Created attachment 446544 Patch 1822117 2 446545 koivisto 2021-12-09 06:54:36 -0800 Created attachment 446545 Patch 1823451 3 446981 koivisto 2021-12-13 02:10:34 -0800 Created attachment 446981 Patch 1823476 4 koivisto 2021-12-13 05:09:23 -0800 *** Bug 233937 has been marked as a duplicate of this bug. *** 1823537 5 446981 simon.fraser 2021-12-13 08:26:00 -0800 Comment on attachment 446981 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=446981&action=review > Source/WebCore/style/StyleBuilder.cpp:392 > +const PropertyCascade* Builder::ensureRollbackCascadeForRevertLayer() Mixing the terms "rollback" and "revert" make my head hurt. Can this just be "ensureRevertCascade"? And use "revert" instead of "rollback" for the rest of the patch? 1823577 6 koivisto 2021-12-13 09:42:58 -0800 > Mixing the terms "rollback" and "revert" make my head hurt. Can this just be > "ensureRevertCascade"? And use "revert" instead of "rollback" for the rest > of the patch? The spec calls the operation performed by revert keywords "rolling back" as in "If the cascaded value of a property is the revert-layer keyword, the cascaded value is rolled back to the layer below" This is trying to keep with the spec terms. 1823693 7 ews-feeder 2021-12-13 12:29:27 -0800 Tools/Scripts/svn-apply failed to apply attachment 446981 to trunk. Please resolve the conflicts and upload a new patch. 1823934 8 447116 koivisto 2021-12-14 01:29:15 -0800 Created attachment 447116 Patch for landing 1823942 9 ews-feeder 2021-12-14 02:15:03 -0800 Committed r287018 (245223@main): <https://commits.webkit.org/245223@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 447116. 1823943 10 webkit-bug-importer 2021-12-14 02:16:20 -0800 <rdar://problem/86458381> 446544 2021-12-09 06:52:17 -0800 2021-12-09 06:54:32 -0800 Patch bug-234082-20211209165216.patch text/plain 9750 koivisto U3VidmVyc2lvbiBSZXZpc2lvbjogMjg2NzY5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDEyYWY4MmQzODA5ZGZi YTZmOGNjNGUwOGYzNGRjNTQ3Yjk4Yzc4MS4uMGQzN2FkYmE5MWZmYWNlYTQwOTk4MjhhNzE5ODI2 M2RkZWE0ZGU4YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM3IEBACisyMDIxLTEyLTA5ICBBbnR0 aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBbQ1NTIENhc2NhZGUgTGF5 ZXJzXSByZXZlcnQtbGF5ZXIgc2hvdWxkIHJldmVydCBzdHlsZSBhdHRyaWJ1dGUgdG8gcmVndWxh ciBhdXRob3Igc3R5bGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIzNDA4MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIElmICdyZXZlcnQtbGF5ZXInIGtleXdvcmQgaXMgdXNlZCBpbiBzdHlsZSBhdHRyaWJ1 dGUgaXQgc2hvdWxkIHJldmVydCB0byByZWd1bGFyIGF1dGhvciBzdHlsZQorICAgICAgICBvbiB0 aGUgZGVmYXVsdCBjYXNjYWRlIGxldmVsLgorCisgICAgICAgIERvIHRoaXMgYnkgYWRkaW5nIGEg bmV3IGxheWVyIGZvciBzdHlsZSBhdHRyaWJ1dGUgd2hlcmUgd2UgY2FuIHJldmVydCB0byB0aGUg ZGVmYXVsdCBsYXllci4KKworICAgICAgICAqIHN0eWxlL0VsZW1lbnRSdWxlQ29sbGVjdG9yLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlOjpFbGVtZW50UnVsZUNvbGxlY3Rvcjo6YWRkRWxl bWVudFN0eWxlUHJvcGVydGllcyk6CisKKyAgICAgICAgQWRkIGVsZW1lbnQgc3R5bGUgcHJvcGVy dGllcyB0byBhIG5ldyBsYXllciB0aGF0IGhhcyBoaWdoZXIgcHJpb3JpdHkgdGhhbiB0aGUgZGVm YXVsdC4KKworICAgICAgICAqIHN0eWxlL1Byb3BlcnR5Q2FzY2FkZS5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpTdHlsZTo6UHJvcGVydHlDYXNjYWRlOjpQcm9wZXJ0eUNhc2NhZGUpOgorICAgICAg ICAoV2ViQ29yZTo6U3R5bGU6OlByb3BlcnR5Q2FzY2FkZTo6YWRkTWF0Y2gpOgorCisgICAgICAg IEZhY3RvciB0aGUgcmV2ZXJ0IHRlc3QgaW50byBhIGxhbWJkYS4KKworICAgICAgICAqIHN0eWxl L1Byb3BlcnR5Q2FzY2FkZS5oOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGU6OlByb3BlcnR5Q2Fz Y2FkZTo6UHJvcGVydHlDYXNjYWRlKToKKworICAgICAgICBNYWtlIHRoZSBtYXhpbXVtIGxldmVs IGFuIG9wdGlvbmFsLgorCisgICAgICAgIChXZWJDb3JlOjpTdHlsZTo6UHJvcGVydHlDYXNjYWRl OjptYXhpbXVtQ2FzY2FkZUxldmVsIGNvbnN0KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6 OlN0eWxlOjpQcm9wZXJ0eUNhc2NhZGU6Om1heGltdW1DYXNjYWRlTGF5ZXJQcmlvcml0eSBjb25z dCk6IERlbGV0ZWQuCisgICAgICAgICogc3R5bGUvUnVsZVNldC5oOgorICAgICAgICAqIHN0eWxl L1N0eWxlQnVpbGRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZTo6QnVpbGRlcjo6ZW5z dXJlUm9sbGJhY2tDYXNjYWRlRm9yUmV2ZXJ0KToKKwogMjAyMS0xMi0wOSAgQ2FybG9zIEdhcmNp YSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dUS11bYTExeV0gRW5z dXJlIGF0c3BpIHdyYXBwZXJzIGhhdmUgcm9vdCBzZXQgYXQgY29uc3RydWN0aW9uIHRpbWUKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3N0eWxlL0VsZW1lbnRSdWxlQ29sbGVjdG9yLmNwcCBi L1NvdXJjZS9XZWJDb3JlL3N0eWxlL0VsZW1lbnRSdWxlQ29sbGVjdG9yLmNwcAppbmRleCBmZWZh NDg1Y2FmYmY0YmJjODRiZTk1ZjQ1OWE3OTllMjc2OGQ2NWY1Li5mNDFmZDJlNjdkOGIyODM0Nzky M2JjMGJiZWJjYzk4ZjFmNzFjOTBmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9F bGVtZW50UnVsZUNvbGxlY3Rvci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvc3R5bGUvRWxlbWVu dFJ1bGVDb2xsZWN0b3IuY3BwCkBAIC0xMzQsNiArMTM0LDcgQEAgaW5saW5lIHZvaWQgRWxlbWVu dFJ1bGVDb2xsZWN0b3I6OmFkZEVsZW1lbnRTdHlsZVByb3BlcnRpZXMoY29uc3QgU3R5bGVQcm9w ZXJ0aWUKIAogICAgIGF1dG8gbWF0Y2hlZFByb3BlcnR5ID0gTWF0Y2hlZFByb3BlcnRpZXMgeyBw cm9wZXJ0eVNldCB9OwogICAgIG1hdGNoZWRQcm9wZXJ0eS5mcm9tU3R5bGVBdHRyaWJ1dGUgPSBm cm9tU3R5bGVBdHRyaWJ1dGU7CisgICAgbWF0Y2hlZFByb3BlcnR5LmNhc2NhZGVMYXllclByaW9y aXR5ID0gUnVsZVNldDo6Y2FzY2FkZUxheWVyUHJpb3JpdHlGb3JFbGVtZW50QXR0YWNoZWRTdHls ZTsKICAgICBhZGRNYXRjaGVkUHJvcGVydGllcyhXVEZNb3ZlKG1hdGNoZWRQcm9wZXJ0eSksIERl Y2xhcmF0aW9uT3JpZ2luOjpBdXRob3IpOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9zdHlsZS9Qcm9wZXJ0eUNhc2NhZGUuY3BwIGIvU291cmNlL1dlYkNvcmUvc3R5bGUvUHJvcGVy dHlDYXNjYWRlLmNwcAppbmRleCBkYWJkYTYwODc4YmEwYzA1NzdmMWQ0ZWJlY2E1YzI0YzM1MTg5 NjdlLi41N2NlMzhjOTc2N2I4ZTRkOGQ2ZDk0YjlmYmI5NzFmNTY0YWNiMGVhIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9Qcm9wZXJ0eUNhc2NhZGUuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3N0eWxlL1Byb3BlcnR5Q2FzY2FkZS5jcHAKQEAgLTgwLDExICs4MCwxMSBAQCBQcm9w ZXJ0eUNhc2NhZGU6OlByb3BlcnR5Q2FzY2FkZShjb25zdCBNYXRjaFJlc3VsdCYgbWF0Y2hSZXN1 bHQsIENhc2NhZGVMZXZlbCBtYQogICAgIGJ1aWxkQ2FzY2FkZSgpOwogfQogCi1Qcm9wZXJ0eUNh c2NhZGU6OlByb3BlcnR5Q2FzY2FkZShjb25zdCBQcm9wZXJ0eUNhc2NhZGUmIHBhcmVudCwgQ2Fz Y2FkZUxldmVsIG1heGltdW1DYXNjYWRlTGV2ZWwsIENhc2NhZGVMYXllclByaW9yaXR5IG1heGlt dW1DYXNjYWRlTGF5ZXJQcmlvcml0eSkKK1Byb3BlcnR5Q2FzY2FkZTo6UHJvcGVydHlDYXNjYWRl KGNvbnN0IFByb3BlcnR5Q2FzY2FkZSYgcGFyZW50LCBDYXNjYWRlTGV2ZWwgbWF4aW11bUNhc2Nh ZGVMZXZlbCwgc3RkOjpvcHRpb25hbDxDYXNjYWRlTGF5ZXJQcmlvcml0eT4gbWF4aW11bUNhc2Nh ZGVMYXllclByaW9yaXR5Rm9yUm9sbGJhY2spCiAgICAgOiBtX21hdGNoUmVzdWx0KHBhcmVudC5t X21hdGNoUmVzdWx0KQogICAgICwgbV9pbmNsdWRlZFByb3BlcnRpZXMocGFyZW50Lm1faW5jbHVk ZWRQcm9wZXJ0aWVzKQogICAgICwgbV9tYXhpbXVtQ2FzY2FkZUxldmVsKG1heGltdW1DYXNjYWRl TGV2ZWwpCi0gICAgLCBtX21heGltdW1DYXNjYWRlTGF5ZXJQcmlvcml0eShtYXhpbXVtQ2FzY2Fk ZUxheWVyUHJpb3JpdHkpCisgICAgLCBtX21heGltdW1DYXNjYWRlTGF5ZXJQcmlvcml0eUZvclJv bGxiYWNrKG1heGltdW1DYXNjYWRlTGF5ZXJQcmlvcml0eUZvclJvbGxiYWNrKQogICAgICwgbV9k aXJlY3Rpb24ocGFyZW50LmRpcmVjdGlvbigpKQogICAgICwgbV9kaXJlY3Rpb25Jc1VucmVzb2x2 ZWQoZmFsc2UpCiB7CkBAIC0xNzcsNyArMTc3LDE4IEBAIHZvaWQgUHJvcGVydHlDYXNjYWRlOjpz ZXREZWZlcnJlZChDU1NQcm9wZXJ0eUlEIGlkLCBDU1NWYWx1ZSYgY3NzVmFsdWUsIGNvbnN0IE1h CiAKIGJvb2wgUHJvcGVydHlDYXNjYWRlOjphZGRNYXRjaChjb25zdCBNYXRjaGVkUHJvcGVydGll cyYgbWF0Y2hlZFByb3BlcnRpZXMsIENhc2NhZGVMZXZlbCBjYXNjYWRlTGV2ZWwsIGJvb2wgaW1w b3J0YW50KQogewotICAgIGlmIChtYXRjaGVkUHJvcGVydGllcy5jYXNjYWRlTGF5ZXJQcmlvcml0 eSA+IG1fbWF4aW11bUNhc2NhZGVMYXllclByaW9yaXR5ICYmIGNhc2NhZGVMZXZlbCA9PSBtX21h eGltdW1DYXNjYWRlTGV2ZWwgJiYgbWF0Y2hlZFByb3BlcnRpZXMuc3R5bGVTY29wZU9yZGluYWwg PT0gU2NvcGVPcmRpbmFsOjpFbGVtZW50KQorICAgIGF1dG8gc2tpcEZvclJvbGxiYWNrID0gWyZd IHsKKyAgICAgICAgaWYgKCFtX21heGltdW1DYXNjYWRlTGF5ZXJQcmlvcml0eUZvclJvbGxiYWNr KQorICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICBpZiAobWF0Y2hlZFByb3BlcnRp ZXMuc3R5bGVTY29wZU9yZGluYWwgIT0gU2NvcGVPcmRpbmFsOjpFbGVtZW50KQorICAgICAgICAg ICAgcmV0dXJuIGZhbHNlOworICAgICAgICBpZiAoY2FzY2FkZUxldmVsIDwgbV9tYXhpbXVtQ2Fz Y2FkZUxldmVsKQorICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICBpZiAobWF0Y2hl ZFByb3BlcnRpZXMuY2FzY2FkZUxheWVyUHJpb3JpdHkgPD0gKm1fbWF4aW11bUNhc2NhZGVMYXll clByaW9yaXR5Rm9yUm9sbGJhY2spCisgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAg IHJldHVybiB0cnVlOworICAgIH07CisgICAgaWYgKHNraXBGb3JSb2xsYmFjaygpKQogICAgICAg ICByZXR1cm4gZmFsc2U7CiAKICAgICBhdXRvJiBzdHlsZVByb3BlcnRpZXMgPSAqbWF0Y2hlZFBy b3BlcnRpZXMucHJvcGVydGllczsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1By b3BlcnR5Q2FzY2FkZS5oIGIvU291cmNlL1dlYkNvcmUvc3R5bGUvUHJvcGVydHlDYXNjYWRlLmgK aW5kZXggNTFkMjE3NjFjNzUwMzNjYTMzNmM2N2ZhODk5NTg3YWEwMjY1OTVkZi4uNDJhYTllZjM2 YjUyZGY1MzFkNGM0OGVmOWNmNzc4MDQ4ZTFiZTg0MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvc3R5bGUvUHJvcGVydHlDYXNjYWRlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvc3R5bGUvUHJv cGVydHlDYXNjYWRlLmgKQEAgLTQ3LDcgKzQ3LDcgQEAgcHVibGljOgogICAgIH07CiAKICAgICBQ cm9wZXJ0eUNhc2NhZGUoY29uc3QgTWF0Y2hSZXN1bHQmLCBDYXNjYWRlTGV2ZWwsIEluY2x1ZGVk UHJvcGVydGllcywgRGlyZWN0aW9uKTsKLSAgICBQcm9wZXJ0eUNhc2NhZGUoY29uc3QgUHJvcGVy dHlDYXNjYWRlJiwgQ2FzY2FkZUxldmVsLCBDYXNjYWRlTGF5ZXJQcmlvcml0eSBtYXhpbXVtQ2Fz Y2FkZUxheWVyUHJpb3JpdHkgPSBSdWxlU2V0OjpjYXNjYWRlTGF5ZXJQcmlvcml0eUZvclVubGF5 ZXJlZCk7CisgICAgUHJvcGVydHlDYXNjYWRlKGNvbnN0IFByb3BlcnR5Q2FzY2FkZSYsIENhc2Nh ZGVMZXZlbCwgc3RkOjpvcHRpb25hbDxDYXNjYWRlTGF5ZXJQcmlvcml0eT4gbWF4aW11bUNhc2Nh ZGVMYXllclByaW9yaXR5Rm9yUm9sbGJhY2sgPSB7IH0pOwogCiAgICAgflByb3BlcnR5Q2FzY2Fk ZSgpOwogCkBAIC03MCw5ICs3MCw2IEBAIHB1YmxpYzoKIAogICAgIERpcmVjdGlvbiBkaXJlY3Rp b24oKSBjb25zdDsKIAotICAgIGF1dG8gbWF4aW11bUNhc2NhZGVMZXZlbCgpIGNvbnN0IHsgcmV0 dXJuIG1fbWF4aW11bUNhc2NhZGVMZXZlbDsgfQotICAgIGF1dG8gbWF4aW11bUNhc2NhZGVMYXll clByaW9yaXR5KCkgY29uc3QgeyByZXR1cm4gbV9tYXhpbXVtQ2FzY2FkZUxheWVyUHJpb3JpdHk7 IH0KLQogcHJpdmF0ZToKICAgICB2b2lkIGJ1aWxkQ2FzY2FkZSgpOwogICAgIGJvb2wgYWRkTm9y bWFsTWF0Y2hlcyhDYXNjYWRlTGV2ZWwpOwpAQCAtODgsNyArODUsNyBAQCBwcml2YXRlOgogICAg IGNvbnN0IE1hdGNoUmVzdWx0JiBtX21hdGNoUmVzdWx0OwogICAgIGNvbnN0IEluY2x1ZGVkUHJv cGVydGllcyBtX2luY2x1ZGVkUHJvcGVydGllczsKICAgICBjb25zdCBDYXNjYWRlTGV2ZWwgbV9t YXhpbXVtQ2FzY2FkZUxldmVsOwotICAgIGNvbnN0IENhc2NhZGVMYXllclByaW9yaXR5IG1fbWF4 aW11bUNhc2NhZGVMYXllclByaW9yaXR5IHsgUnVsZVNldDo6Y2FzY2FkZUxheWVyUHJpb3JpdHlG b3JVbmxheWVyZWQgfTsKKyAgICBjb25zdCBzdGQ6Om9wdGlvbmFsPENhc2NhZGVMYXllclByaW9y aXR5PiBtX21heGltdW1DYXNjYWRlTGF5ZXJQcmlvcml0eUZvclJvbGxiYWNrOwogICAgIG11dGFi bGUgRGlyZWN0aW9uIG1fZGlyZWN0aW9uOwogICAgIG11dGFibGUgYm9vbCBtX2RpcmVjdGlvbklz VW5yZXNvbHZlZCB7IHRydWUgfTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvc3R5bGUv UnVsZVNldC5oIGIvU291cmNlL1dlYkNvcmUvc3R5bGUvUnVsZVNldC5oCmluZGV4IGY4MTI2N2U5 ZWFiZTQ4OGU5YmQyMDA1M2U0NDZiZDljODUyMGNlZWMuLjhkZGIyMDdjOWI2NzYzNWRkYjMyMWVi NmMzYTU4YTNlMzE4MDQ0ZjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1J1bGVT ZXQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9SdWxlU2V0LmgKQEAgLTEwNSw3ICsxMDUs OSBAQCBwdWJsaWM6CiAgICAgYm9vbCBoYXNTaGFkb3dQc2V1ZG9FbGVtZW50UnVsZXMoKSBjb25z dCB7IHJldHVybiAhbV9zaGFkb3dQc2V1ZG9FbGVtZW50UnVsZXMuaXNFbXB0eSgpOyB9CiAgICAg Ym9vbCBoYXNIb3N0UHNldWRvQ2xhc3NSdWxlc01hdGNoaW5nSW5TaGFkb3dUcmVlKCkgY29uc3Qg eyByZXR1cm4gbV9oYXNIb3N0UHNldWRvQ2xhc3NSdWxlc01hdGNoaW5nSW5TaGFkb3dUcmVlOyB9 CiAKLSAgICBzdGF0aWMgY29uc3RleHByIGF1dG8gY2FzY2FkZUxheWVyUHJpb3JpdHlGb3JVbmxh eWVyZWQgPSBzdGQ6Om51bWVyaWNfbGltaXRzPENhc2NhZGVMYXllclByaW9yaXR5Pjo6bWF4KCk7 CisgICAgc3RhdGljIGNvbnN0ZXhwciBhdXRvIGNhc2NhZGVMYXllclByaW9yaXR5Rm9yVW5sYXll cmVkID0gc3RhdGljX2Nhc3Q8Q2FzY2FkZUxheWVyUHJpb3JpdHk+KHN0ZDo6bnVtZXJpY19saW1p dHM8Q2FzY2FkZUxheWVyUHJpb3JpdHk+OjptYXgoKSAtIDEpOworICAgIHN0YXRpYyBjb25zdGV4 cHIgYXV0byBjYXNjYWRlTGF5ZXJQcmlvcml0eUZvckVsZW1lbnRBdHRhY2hlZFN0eWxlID0gc3Rk OjpudW1lcmljX2xpbWl0czxDYXNjYWRlTGF5ZXJQcmlvcml0eT46Om1heCgpOworCiAgICAgQ2Fz Y2FkZUxheWVyUHJpb3JpdHkgY2FzY2FkZUxheWVyUHJpb3JpdHlGb3IoY29uc3QgUnVsZURhdGEm KSBjb25zdDsKIAogcHJpdmF0ZToKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0 eWxlQnVpbGRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZUJ1aWxkZXIuY3BwCmlu ZGV4IGM0ZTEwMmI2OGJkZTQ1NTI3NTljYzI3YzZmOTdlZjc3MjU2MDE3YjMuLjg0ZDdkMTk0NDJj NTZjYWVhNzhlZWE0OTI3YzYwMWFkZTI2YjBlYzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3N0eWxlL1N0eWxlQnVpbGRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVC dWlsZGVyLmNwcApAQCAtMzg2LDkgKzM4Niw5IEBAIGNvbnN0IFByb3BlcnR5Q2FzY2FkZSogQnVp bGRlcjo6ZW5zdXJlUm9sbGJhY2tDYXNjYWRlRm9yUmV2ZXJ0KENhc2NhZGVMZXZlbCByb2xsCiAK ICAgICAtLXJvbGxiYWNrQ2FzY2FkZUxldmVsOwogCi0gICAgYXV0byBrZXkgPSBtYWtlUm9sbGJh Y2tDYXNjYWRlS2V5KHJvbGxiYWNrQ2FzY2FkZUxldmVsLCBSdWxlU2V0OjpjYXNjYWRlTGF5ZXJQ cmlvcml0eUZvclVubGF5ZXJlZCk7CisgICAgYXV0byBrZXkgPSBtYWtlUm9sbGJhY2tDYXNjYWRl S2V5KHJvbGxiYWNrQ2FzY2FkZUxldmVsLCAwKTsKICAgICByZXR1cm4gbV9yb2xsYmFja0Nhc2Nh ZGVzLmVuc3VyZShrZXksIFsmXSB7Ci0gICAgICAgIHJldHVybiBtYWtlVW5pcXVlPGNvbnN0IFBy b3BlcnR5Q2FzY2FkZT4obV9jYXNjYWRlLCByb2xsYmFja0Nhc2NhZGVMZXZlbCwgUnVsZVNldDo6 Y2FzY2FkZUxheWVyUHJpb3JpdHlGb3JVbmxheWVyZWQpOworICAgICAgICByZXR1cm4gbWFrZVVu aXF1ZTxjb25zdCBQcm9wZXJ0eUNhc2NhZGU+KG1fY2FzY2FkZSwgcm9sbGJhY2tDYXNjYWRlTGV2 ZWwpOwogICAgIH0pLml0ZXJhdG9yLT52YWx1ZS5nZXQoKTsKIH0KIApkaWZmIC0tZ2l0IGEvTGF5 b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IGY5N2UwYzRk OGE2ODIxNmQ1MGEwZDlkZjc3OTVjZjhlZmJmMDA4ZWYuLmFhNjcwZThjYmE0Mjg4NzczZTY1ODdm NjBjOTRjOWE4ZWM0Yzc3OWYgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysg Yi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMiBAQAorMjAyMS0xMi0wOSAgQW50 dGkgS29pdmlzdG8gIDxhbnR0aUBhcHBsZS5jb20+CisKKyAgICAgICAgW0NTUyBDYXNjYWRlIExh eWVyc10gcmV2ZXJ0LWxheWVyIHNob3VsZCByZXZlcnQgc3R5bGUgYXR0cmlidXRlIHRvIHJlZ3Vs YXIgYXV0aG9yIHN0eWxlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMzQwODIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIFRlc3RFeHBlY3RhdGlvbnM6CisKIDIwMjEtMTItMDggIFBhdHJpY2sgR3JpZmZp cyAgPHBncmlmZmlzQGlnYWxpYS5jb20+CiAKICAgICAgICAgQ1NQOiBTa2lwIHdoaXRlc3BhY2Ug YXQgYmVnaW5uaW5nIG9mIHBvbGljeSBoZWFkZXIKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL1Rl c3RFeHBlY3RhdGlvbnMgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCmluZGV4IDcyNGU0 ZTQ1YzRkODA4YWI2NDMxZDlkYjlmNTVjZWE5MjM3NWE0NWYuLmMyNTUwNTYzNGJmYzFkMTM2MjQ2 ZjhhM2Y0ZjFmMmRlOWE4ODEyNGQgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL1Rlc3RFeHBlY3Rh dGlvbnMKKysrIGIvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwpAQCAtMjEzOSwxMCArMjEz OSw4IEBAIHdlYmtpdC5vcmcvYi8xNDg2NTAgZmFzdC9yZXBhaW50L2FkZC10YWJsZS1vdmVycGFp bnQuaHRtbCBbIFBhc3MgRmFpbHVyZSBdCiAKIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVz dHMvY3NzL2Nzcy1jYXNjYWRlL2ltcG9ydGFudC1wcm9wLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJl IF0KIHdlYmtpdC5vcmcvYi8xODcwOTMgWyBEZWJ1ZyBdIGltcG9ydGVkL3czYy93ZWItcGxhdGZv cm0tdGVzdHMvY3NzL2Nzcy1jYXNjYWRlL2FsbC1wcm9wLWluaXRpYWwteG1sLmh0bWwgWyBTa2lw IF0KLXdlYmtpdC5vcmcvYi8yMzM5MzcgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9j c3MvY3NzLWNhc2NhZGUvcmV2ZXJ0LWxheWVyLTAwOS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBd CiB3ZWJraXQub3JnL2IvMjMzOTM3IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3Nz L2Nzcy1jYXNjYWRlL3JldmVydC1sYXllci0wMTAuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQog d2Via2l0Lm9yZy9iLzIzMzkzNyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9j c3MtY2FzY2FkZS9yZXZlcnQtbGF5ZXItMDExLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdl YmtpdC5vcmcvYi8yMzM5MzcgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3Nz LWNhc2NhZGUvcmV2ZXJ0LWxheWVyLTAxMi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJr aXQub3JnL2IvMjMzOTQ0IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1j YXNjYWRlL2xheWVyLXN0YXRlbWVudC1iZWZvcmUtaW1wb3J0Lmh0bWwgWyBQYXNzIEZhaWx1cmUg XQogCiB3ZWJraXQub3JnL2IvMTQ4ODAxIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMv Y3NzL2Nzcy1jb2xvci90NDIyLXJnYmEtb25zY3JlZW4tYi54aHQgWyBJbWFnZU9ubHlGYWlsdXJl IF0K 446545 2021-12-09 06:54:36 -0800 2021-12-13 02:10:30 -0800 Patch bug-234082-20211209165435.patch text/plain 9703 koivisto U3VidmVyc2lvbiBSZXZpc2lvbjogMjg2NzY5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDEyYWY4MmQzODA5ZGZi YTZmOGNjNGUwOGYzNGRjNTQ3Yjk4Yzc4MS4uMGQzN2FkYmE5MWZmYWNlYTQwOTk4MjhhNzE5ODI2 M2RkZWE0ZGU4YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM3IEBACisyMDIxLTEyLTA5ICBBbnR0 aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBbQ1NTIENhc2NhZGUgTGF5 ZXJzXSByZXZlcnQtbGF5ZXIgc2hvdWxkIHJldmVydCBzdHlsZSBhdHRyaWJ1dGUgdG8gcmVndWxh ciBhdXRob3Igc3R5bGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIzNDA4MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIElmICdyZXZlcnQtbGF5ZXInIGtleXdvcmQgaXMgdXNlZCBpbiBzdHlsZSBhdHRyaWJ1 dGUgaXQgc2hvdWxkIHJldmVydCB0byByZWd1bGFyIGF1dGhvciBzdHlsZQorICAgICAgICBvbiB0 aGUgZGVmYXVsdCBjYXNjYWRlIGxldmVsLgorCisgICAgICAgIERvIHRoaXMgYnkgYWRkaW5nIGEg bmV3IGxheWVyIGZvciBzdHlsZSBhdHRyaWJ1dGUgd2hlcmUgd2UgY2FuIHJldmVydCB0byB0aGUg ZGVmYXVsdCBsYXllci4KKworICAgICAgICAqIHN0eWxlL0VsZW1lbnRSdWxlQ29sbGVjdG9yLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlOjpFbGVtZW50UnVsZUNvbGxlY3Rvcjo6YWRkRWxl bWVudFN0eWxlUHJvcGVydGllcyk6CisKKyAgICAgICAgQWRkIGVsZW1lbnQgc3R5bGUgcHJvcGVy dGllcyB0byBhIG5ldyBsYXllciB0aGF0IGhhcyBoaWdoZXIgcHJpb3JpdHkgdGhhbiB0aGUgZGVm YXVsdC4KKworICAgICAgICAqIHN0eWxlL1Byb3BlcnR5Q2FzY2FkZS5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpTdHlsZTo6UHJvcGVydHlDYXNjYWRlOjpQcm9wZXJ0eUNhc2NhZGUpOgorICAgICAg ICAoV2ViQ29yZTo6U3R5bGU6OlByb3BlcnR5Q2FzY2FkZTo6YWRkTWF0Y2gpOgorCisgICAgICAg IEZhY3RvciB0aGUgcmV2ZXJ0IHRlc3QgaW50byBhIGxhbWJkYS4KKworICAgICAgICAqIHN0eWxl L1Byb3BlcnR5Q2FzY2FkZS5oOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGU6OlByb3BlcnR5Q2Fz Y2FkZTo6UHJvcGVydHlDYXNjYWRlKToKKworICAgICAgICBNYWtlIHRoZSBtYXhpbXVtIGxldmVs IGFuIG9wdGlvbmFsLgorCisgICAgICAgIChXZWJDb3JlOjpTdHlsZTo6UHJvcGVydHlDYXNjYWRl OjptYXhpbXVtQ2FzY2FkZUxldmVsIGNvbnN0KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6 OlN0eWxlOjpQcm9wZXJ0eUNhc2NhZGU6Om1heGltdW1DYXNjYWRlTGF5ZXJQcmlvcml0eSBjb25z dCk6IERlbGV0ZWQuCisgICAgICAgICogc3R5bGUvUnVsZVNldC5oOgorICAgICAgICAqIHN0eWxl L1N0eWxlQnVpbGRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZTo6QnVpbGRlcjo6ZW5z dXJlUm9sbGJhY2tDYXNjYWRlRm9yUmV2ZXJ0KToKKwogMjAyMS0xMi0wOSAgQ2FybG9zIEdhcmNp YSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dUS11bYTExeV0gRW5z dXJlIGF0c3BpIHdyYXBwZXJzIGhhdmUgcm9vdCBzZXQgYXQgY29uc3RydWN0aW9uIHRpbWUKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3N0eWxlL0VsZW1lbnRSdWxlQ29sbGVjdG9yLmNwcCBi L1NvdXJjZS9XZWJDb3JlL3N0eWxlL0VsZW1lbnRSdWxlQ29sbGVjdG9yLmNwcAppbmRleCBmZWZh NDg1Y2FmYmY0YmJjODRiZTk1ZjQ1OWE3OTllMjc2OGQ2NWY1Li5mNDFmZDJlNjdkOGIyODM0Nzky M2JjMGJiZWJjYzk4ZjFmNzFjOTBmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9F bGVtZW50UnVsZUNvbGxlY3Rvci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvc3R5bGUvRWxlbWVu dFJ1bGVDb2xsZWN0b3IuY3BwCkBAIC0xMzQsNiArMTM0LDcgQEAgaW5saW5lIHZvaWQgRWxlbWVu dFJ1bGVDb2xsZWN0b3I6OmFkZEVsZW1lbnRTdHlsZVByb3BlcnRpZXMoY29uc3QgU3R5bGVQcm9w ZXJ0aWUKIAogICAgIGF1dG8gbWF0Y2hlZFByb3BlcnR5ID0gTWF0Y2hlZFByb3BlcnRpZXMgeyBw cm9wZXJ0eVNldCB9OwogICAgIG1hdGNoZWRQcm9wZXJ0eS5mcm9tU3R5bGVBdHRyaWJ1dGUgPSBm cm9tU3R5bGVBdHRyaWJ1dGU7CisgICAgbWF0Y2hlZFByb3BlcnR5LmNhc2NhZGVMYXllclByaW9y aXR5ID0gUnVsZVNldDo6Y2FzY2FkZUxheWVyUHJpb3JpdHlGb3JFbGVtZW50QXR0YWNoZWRTdHls ZTsKICAgICBhZGRNYXRjaGVkUHJvcGVydGllcyhXVEZNb3ZlKG1hdGNoZWRQcm9wZXJ0eSksIERl Y2xhcmF0aW9uT3JpZ2luOjpBdXRob3IpOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9zdHlsZS9Qcm9wZXJ0eUNhc2NhZGUuY3BwIGIvU291cmNlL1dlYkNvcmUvc3R5bGUvUHJvcGVy dHlDYXNjYWRlLmNwcAppbmRleCBkYWJkYTYwODc4YmEwYzA1NzdmMWQ0ZWJlY2E1YzI0YzM1MTg5 NjdlLi4xY2ZiY2ExY2I1NjQwMDNjYWYxMzdkZWZjNWNkODlkNTQ3MmM3YzQzIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9Qcm9wZXJ0eUNhc2NhZGUuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3N0eWxlL1Byb3BlcnR5Q2FzY2FkZS5jcHAKQEAgLTgwLDExICs4MCwxMSBAQCBQcm9w ZXJ0eUNhc2NhZGU6OlByb3BlcnR5Q2FzY2FkZShjb25zdCBNYXRjaFJlc3VsdCYgbWF0Y2hSZXN1 bHQsIENhc2NhZGVMZXZlbCBtYQogICAgIGJ1aWxkQ2FzY2FkZSgpOwogfQogCi1Qcm9wZXJ0eUNh c2NhZGU6OlByb3BlcnR5Q2FzY2FkZShjb25zdCBQcm9wZXJ0eUNhc2NhZGUmIHBhcmVudCwgQ2Fz Y2FkZUxldmVsIG1heGltdW1DYXNjYWRlTGV2ZWwsIENhc2NhZGVMYXllclByaW9yaXR5IG1heGlt dW1DYXNjYWRlTGF5ZXJQcmlvcml0eSkKK1Byb3BlcnR5Q2FzY2FkZTo6UHJvcGVydHlDYXNjYWRl KGNvbnN0IFByb3BlcnR5Q2FzY2FkZSYgcGFyZW50LCBDYXNjYWRlTGV2ZWwgbWF4aW11bUNhc2Nh ZGVMZXZlbCwgc3RkOjpvcHRpb25hbDxDYXNjYWRlTGF5ZXJQcmlvcml0eT4gbWF4aW11bUNhc2Nh ZGVMYXllclByaW9yaXR5Rm9yUm9sbGJhY2spCiAgICAgOiBtX21hdGNoUmVzdWx0KHBhcmVudC5t X21hdGNoUmVzdWx0KQogICAgICwgbV9pbmNsdWRlZFByb3BlcnRpZXMocGFyZW50Lm1faW5jbHVk ZWRQcm9wZXJ0aWVzKQogICAgICwgbV9tYXhpbXVtQ2FzY2FkZUxldmVsKG1heGltdW1DYXNjYWRl TGV2ZWwpCi0gICAgLCBtX21heGltdW1DYXNjYWRlTGF5ZXJQcmlvcml0eShtYXhpbXVtQ2FzY2Fk ZUxheWVyUHJpb3JpdHkpCisgICAgLCBtX21heGltdW1DYXNjYWRlTGF5ZXJQcmlvcml0eUZvclJv bGxiYWNrKG1heGltdW1DYXNjYWRlTGF5ZXJQcmlvcml0eUZvclJvbGxiYWNrKQogICAgICwgbV9k aXJlY3Rpb24ocGFyZW50LmRpcmVjdGlvbigpKQogICAgICwgbV9kaXJlY3Rpb25Jc1VucmVzb2x2 ZWQoZmFsc2UpCiB7CkBAIC0xNzcsNyArMTc3LDE2IEBAIHZvaWQgUHJvcGVydHlDYXNjYWRlOjpz ZXREZWZlcnJlZChDU1NQcm9wZXJ0eUlEIGlkLCBDU1NWYWx1ZSYgY3NzVmFsdWUsIGNvbnN0IE1h CiAKIGJvb2wgUHJvcGVydHlDYXNjYWRlOjphZGRNYXRjaChjb25zdCBNYXRjaGVkUHJvcGVydGll cyYgbWF0Y2hlZFByb3BlcnRpZXMsIENhc2NhZGVMZXZlbCBjYXNjYWRlTGV2ZWwsIGJvb2wgaW1w b3J0YW50KQogewotICAgIGlmIChtYXRjaGVkUHJvcGVydGllcy5jYXNjYWRlTGF5ZXJQcmlvcml0 eSA+IG1fbWF4aW11bUNhc2NhZGVMYXllclByaW9yaXR5ICYmIGNhc2NhZGVMZXZlbCA9PSBtX21h eGltdW1DYXNjYWRlTGV2ZWwgJiYgbWF0Y2hlZFByb3BlcnRpZXMuc3R5bGVTY29wZU9yZGluYWwg PT0gU2NvcGVPcmRpbmFsOjpFbGVtZW50KQorICAgIGF1dG8gc2tpcEZvclJvbGxiYWNrID0gWyZd IHsKKyAgICAgICAgaWYgKCFtX21heGltdW1DYXNjYWRlTGF5ZXJQcmlvcml0eUZvclJvbGxiYWNr KQorICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICBpZiAobWF0Y2hlZFByb3BlcnRp ZXMuc3R5bGVTY29wZU9yZGluYWwgIT0gU2NvcGVPcmRpbmFsOjpFbGVtZW50KQorICAgICAgICAg ICAgcmV0dXJuIGZhbHNlOworICAgICAgICBpZiAoY2FzY2FkZUxldmVsIDwgbV9tYXhpbXVtQ2Fz Y2FkZUxldmVsKQorICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICByZXR1cm4gbWF0 Y2hlZFByb3BlcnRpZXMuY2FzY2FkZUxheWVyUHJpb3JpdHkgPiAqbV9tYXhpbXVtQ2FzY2FkZUxh eWVyUHJpb3JpdHlGb3JSb2xsYmFjazsKKyAgICB9OworICAgIGlmIChza2lwRm9yUm9sbGJhY2so KSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgYXV0byYgc3R5bGVQcm9wZXJ0aWVzID0g Km1hdGNoZWRQcm9wZXJ0aWVzLnByb3BlcnRpZXM7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9zdHlsZS9Qcm9wZXJ0eUNhc2NhZGUuaCBiL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1Byb3BlcnR5 Q2FzY2FkZS5oCmluZGV4IDUxZDIxNzYxYzc1MDMzY2EzMzZjNjdmYTg5OTU4N2FhMDI2NTk1ZGYu LjQyYWE5ZWYzNmI1MmRmNTMxZDRjNDhlZjljZjc3ODA0OGUxYmU4NDAgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3N0eWxlL1Byb3BlcnR5Q2FzY2FkZS5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3N0eWxlL1Byb3BlcnR5Q2FzY2FkZS5oCkBAIC00Nyw3ICs0Nyw3IEBAIHB1YmxpYzoKICAgICB9 OwogCiAgICAgUHJvcGVydHlDYXNjYWRlKGNvbnN0IE1hdGNoUmVzdWx0JiwgQ2FzY2FkZUxldmVs LCBJbmNsdWRlZFByb3BlcnRpZXMsIERpcmVjdGlvbik7Ci0gICAgUHJvcGVydHlDYXNjYWRlKGNv bnN0IFByb3BlcnR5Q2FzY2FkZSYsIENhc2NhZGVMZXZlbCwgQ2FzY2FkZUxheWVyUHJpb3JpdHkg bWF4aW11bUNhc2NhZGVMYXllclByaW9yaXR5ID0gUnVsZVNldDo6Y2FzY2FkZUxheWVyUHJpb3Jp dHlGb3JVbmxheWVyZWQpOworICAgIFByb3BlcnR5Q2FzY2FkZShjb25zdCBQcm9wZXJ0eUNhc2Nh ZGUmLCBDYXNjYWRlTGV2ZWwsIHN0ZDo6b3B0aW9uYWw8Q2FzY2FkZUxheWVyUHJpb3JpdHk+IG1h eGltdW1DYXNjYWRlTGF5ZXJQcmlvcml0eUZvclJvbGxiYWNrID0geyB9KTsKIAogICAgIH5Qcm9w ZXJ0eUNhc2NhZGUoKTsKIApAQCAtNzAsOSArNzAsNiBAQCBwdWJsaWM6CiAKICAgICBEaXJlY3Rp b24gZGlyZWN0aW9uKCkgY29uc3Q7CiAKLSAgICBhdXRvIG1heGltdW1DYXNjYWRlTGV2ZWwoKSBj b25zdCB7IHJldHVybiBtX21heGltdW1DYXNjYWRlTGV2ZWw7IH0KLSAgICBhdXRvIG1heGltdW1D YXNjYWRlTGF5ZXJQcmlvcml0eSgpIGNvbnN0IHsgcmV0dXJuIG1fbWF4aW11bUNhc2NhZGVMYXll clByaW9yaXR5OyB9Ci0KIHByaXZhdGU6CiAgICAgdm9pZCBidWlsZENhc2NhZGUoKTsKICAgICBi b29sIGFkZE5vcm1hbE1hdGNoZXMoQ2FzY2FkZUxldmVsKTsKQEAgLTg4LDcgKzg1LDcgQEAgcHJp dmF0ZToKICAgICBjb25zdCBNYXRjaFJlc3VsdCYgbV9tYXRjaFJlc3VsdDsKICAgICBjb25zdCBJ bmNsdWRlZFByb3BlcnRpZXMgbV9pbmNsdWRlZFByb3BlcnRpZXM7CiAgICAgY29uc3QgQ2FzY2Fk ZUxldmVsIG1fbWF4aW11bUNhc2NhZGVMZXZlbDsKLSAgICBjb25zdCBDYXNjYWRlTGF5ZXJQcmlv cml0eSBtX21heGltdW1DYXNjYWRlTGF5ZXJQcmlvcml0eSB7IFJ1bGVTZXQ6OmNhc2NhZGVMYXll clByaW9yaXR5Rm9yVW5sYXllcmVkIH07CisgICAgY29uc3Qgc3RkOjpvcHRpb25hbDxDYXNjYWRl TGF5ZXJQcmlvcml0eT4gbV9tYXhpbXVtQ2FzY2FkZUxheWVyUHJpb3JpdHlGb3JSb2xsYmFjazsK ICAgICBtdXRhYmxlIERpcmVjdGlvbiBtX2RpcmVjdGlvbjsKICAgICBtdXRhYmxlIGJvb2wgbV9k aXJlY3Rpb25Jc1VucmVzb2x2ZWQgeyB0cnVlIH07CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3N0eWxlL1J1bGVTZXQuaCBiL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1J1bGVTZXQuaAppbmRl eCBmODEyNjdlOWVhYmU0ODhlOWJkMjAwNTNlNDQ2YmQ5Yzg1MjBjZWVjLi44ZGRiMjA3YzliNjc2 MzVkZGIzMjFlYjZjM2E1OGEzZTMxODA0NGYwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9z dHlsZS9SdWxlU2V0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvc3R5bGUvUnVsZVNldC5oCkBAIC0x MDUsNyArMTA1LDkgQEAgcHVibGljOgogICAgIGJvb2wgaGFzU2hhZG93UHNldWRvRWxlbWVudFJ1 bGVzKCkgY29uc3QgeyByZXR1cm4gIW1fc2hhZG93UHNldWRvRWxlbWVudFJ1bGVzLmlzRW1wdHko KTsgfQogICAgIGJvb2wgaGFzSG9zdFBzZXVkb0NsYXNzUnVsZXNNYXRjaGluZ0luU2hhZG93VHJl ZSgpIGNvbnN0IHsgcmV0dXJuIG1faGFzSG9zdFBzZXVkb0NsYXNzUnVsZXNNYXRjaGluZ0luU2hh ZG93VHJlZTsgfQogCi0gICAgc3RhdGljIGNvbnN0ZXhwciBhdXRvIGNhc2NhZGVMYXllclByaW9y aXR5Rm9yVW5sYXllcmVkID0gc3RkOjpudW1lcmljX2xpbWl0czxDYXNjYWRlTGF5ZXJQcmlvcml0 eT46Om1heCgpOworICAgIHN0YXRpYyBjb25zdGV4cHIgYXV0byBjYXNjYWRlTGF5ZXJQcmlvcml0 eUZvclVubGF5ZXJlZCA9IHN0YXRpY19jYXN0PENhc2NhZGVMYXllclByaW9yaXR5PihzdGQ6Om51 bWVyaWNfbGltaXRzPENhc2NhZGVMYXllclByaW9yaXR5Pjo6bWF4KCkgLSAxKTsKKyAgICBzdGF0 aWMgY29uc3RleHByIGF1dG8gY2FzY2FkZUxheWVyUHJpb3JpdHlGb3JFbGVtZW50QXR0YWNoZWRT dHlsZSA9IHN0ZDo6bnVtZXJpY19saW1pdHM8Q2FzY2FkZUxheWVyUHJpb3JpdHk+OjptYXgoKTsK KwogICAgIENhc2NhZGVMYXllclByaW9yaXR5IGNhc2NhZGVMYXllclByaW9yaXR5Rm9yKGNvbnN0 IFJ1bGVEYXRhJikgY29uc3Q7CiAKIHByaXZhdGU6CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9zdHlsZS9TdHlsZUJ1aWxkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVCdWls ZGVyLmNwcAppbmRleCBjNGUxMDJiNjhiZGU0NTUyNzU5Y2MyN2M2Zjk3ZWY3NzI1NjAxN2IzLi44 NGQ3ZDE5NDQyYzU2Y2FlYTc4ZWVhNDkyN2M2MDFhZGUyNmIwZWM2IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9zdHlsZS9TdHlsZUJ1aWxkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3N0 eWxlL1N0eWxlQnVpbGRlci5jcHAKQEAgLTM4Niw5ICszODYsOSBAQCBjb25zdCBQcm9wZXJ0eUNh c2NhZGUqIEJ1aWxkZXI6OmVuc3VyZVJvbGxiYWNrQ2FzY2FkZUZvclJldmVydChDYXNjYWRlTGV2 ZWwgcm9sbAogCiAgICAgLS1yb2xsYmFja0Nhc2NhZGVMZXZlbDsKIAotICAgIGF1dG8ga2V5ID0g bWFrZVJvbGxiYWNrQ2FzY2FkZUtleShyb2xsYmFja0Nhc2NhZGVMZXZlbCwgUnVsZVNldDo6Y2Fz Y2FkZUxheWVyUHJpb3JpdHlGb3JVbmxheWVyZWQpOworICAgIGF1dG8ga2V5ID0gbWFrZVJvbGxi YWNrQ2FzY2FkZUtleShyb2xsYmFja0Nhc2NhZGVMZXZlbCwgMCk7CiAgICAgcmV0dXJuIG1fcm9s bGJhY2tDYXNjYWRlcy5lbnN1cmUoa2V5LCBbJl0gewotICAgICAgICByZXR1cm4gbWFrZVVuaXF1 ZTxjb25zdCBQcm9wZXJ0eUNhc2NhZGU+KG1fY2FzY2FkZSwgcm9sbGJhY2tDYXNjYWRlTGV2ZWws IFJ1bGVTZXQ6OmNhc2NhZGVMYXllclByaW9yaXR5Rm9yVW5sYXllcmVkKTsKKyAgICAgICAgcmV0 dXJuIG1ha2VVbmlxdWU8Y29uc3QgUHJvcGVydHlDYXNjYWRlPihtX2Nhc2NhZGUsIHJvbGxiYWNr Q2FzY2FkZUxldmVsKTsKICAgICB9KS5pdGVyYXRvci0+dmFsdWUuZ2V0KCk7CiB9CiAKZGlmZiAt LWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRl eCBmOTdlMGM0ZDhhNjgyMTZkNTBhMGQ5ZGY3Nzk1Y2Y4ZWZiZjAwOGVmLi5hYTY3MGU4Y2JhNDI4 ODc3M2U2NTg3ZjYwYzk0YzlhOGVjNGM3NzlmIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMjEt MTItMDkgIEFudHRpIEtvaXZpc3RvICA8YW50dGlAYXBwbGUuY29tPgorCisgICAgICAgIFtDU1Mg Q2FzY2FkZSBMYXllcnNdIHJldmVydC1sYXllciBzaG91bGQgcmV2ZXJ0IHN0eWxlIGF0dHJpYnV0 ZSB0byByZWd1bGFyIGF1dGhvciBzdHlsZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjM0MDgyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBUZXN0RXhwZWN0YXRpb25zOgorCiAyMDIxLTEyLTA4ICBQYXRy aWNrIEdyaWZmaXMgIDxwZ3JpZmZpc0BpZ2FsaWEuY29tPgogCiAgICAgICAgIENTUDogU2tpcCB3 aGl0ZXNwYWNlIGF0IGJlZ2lubmluZyBvZiBwb2xpY3kgaGVhZGVyCmRpZmYgLS1naXQgYS9MYXlv dXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zIGIvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwpp bmRleCA3MjRlNGU0NWM0ZDgwOGFiNjQzMWQ5ZGI5ZjU1Y2VhOTIzNzVhNDVmLi5jMjU1MDU2MzRi ZmMxZDEzNjI0NmY4YTNmNGYxZjJkZTlhODgxMjRkIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9U ZXN0RXhwZWN0YXRpb25zCisrKyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKQEAgLTIx MzksMTAgKzIxMzksOCBAQCB3ZWJraXQub3JnL2IvMTQ4NjUwIGZhc3QvcmVwYWludC9hZGQtdGFi bGUtb3ZlcnBhaW50Lmh0bWwgWyBQYXNzIEZhaWx1cmUgXQogCiBpbXBvcnRlZC93M2Mvd2ViLXBs YXRmb3JtLXRlc3RzL2Nzcy9jc3MtY2FzY2FkZS9pbXBvcnRhbnQtcHJvcC5odG1sIFsgSW1hZ2VP bmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMTg3MDkzIFsgRGVidWcgXSBpbXBvcnRlZC93M2Mv d2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtY2FzY2FkZS9hbGwtcHJvcC1pbml0aWFsLXhtbC5o dG1sIFsgU2tpcCBdCi13ZWJraXQub3JnL2IvMjMzOTM3IGltcG9ydGVkL3czYy93ZWItcGxhdGZv cm0tdGVzdHMvY3NzL2Nzcy1jYXNjYWRlL3JldmVydC1sYXllci0wMDkuaHRtbCBbIEltYWdlT25s eUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIzMzkzNyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3Jt LXRlc3RzL2Nzcy9jc3MtY2FzY2FkZS9yZXZlcnQtbGF5ZXItMDEwLmh0bWwgWyBJbWFnZU9ubHlG YWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMzM5MzcgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10 ZXN0cy9jc3MvY3NzLWNhc2NhZGUvcmV2ZXJ0LWxheWVyLTAxMS5odG1sIFsgSW1hZ2VPbmx5RmFp bHVyZSBdCi13ZWJraXQub3JnL2IvMjMzOTM3IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVz dHMvY3NzL2Nzcy1jYXNjYWRlL3JldmVydC1sYXllci0wMTIuaHRtbCBbIEltYWdlT25seUZhaWx1 cmUgXQogd2Via2l0Lm9yZy9iLzIzMzk0NCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3Rz L2Nzcy9jc3MtY2FzY2FkZS9sYXllci1zdGF0ZW1lbnQtYmVmb3JlLWltcG9ydC5odG1sIFsgUGFz cyBGYWlsdXJlIF0KIAogd2Via2l0Lm9yZy9iLzE0ODgwMSBpbXBvcnRlZC93M2Mvd2ViLXBsYXRm b3JtLXRlc3RzL2Nzcy9jc3MtY29sb3IvdDQyMi1yZ2JhLW9uc2NyZWVuLWIueGh0IFsgSW1hZ2VP bmx5RmFpbHVyZSBdCg== 446981 2021-12-13 02:10:34 -0800 2021-12-14 01:29:09 -0800 Patch bug-234082-20211213121032.patch text/plain 16627 koivisto U3VidmVyc2lvbiBSZXZpc2lvbjogMjg2OTIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTRkNjBiOWJiMjJiNTU2 ZTZlOWVjM2FhZGU1NmIxNzRkN2FmYTI0YS4uMTM3Y2I2NzU4MjhiZGNiNzczODI4MjEzMTJkZDA2 YmRiZTRjMzA4NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ2IEBACisyMDIxLTEyLTEzICBBbnR0 aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBbQ1NTIENhc2NhZGUgTGF5 ZXJzXSByZXZlcnQtbGF5ZXIgc2hvdWxkIHJldmVydCBzdHlsZSBhdHRyaWJ1dGUgdG8gcmVndWxh ciBhdXRob3Igc3R5bGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIzNDA4MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIElmICdyZXZlcnQtbGF5ZXInIGtleXdvcmQgaXMgdXNlZCBpbiBzdHlsZSBhdHRyaWJ1 dGUgaXQgc2hvdWxkIHJldmVydCB0byByZWd1bGFyIGF1dGhvciBzdHlsZQorICAgICAgICBvbiB0 aGUgZGVmYXVsdCBjYXNjYWRlIGxldmVsLgorCisgICAgICAgICogc3R5bGUvUHJvcGVydHlDYXNj YWRlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlOjpQcm9wZXJ0eUNhc2NhZGU6OlByb3Bl cnR5Q2FzY2FkZSk6CisKKyAgICAgICAgTWFrZSB0aGUgbWF4aW11bSBsZXZlbCAodXNlZCBmb3Ig cmV2ZXJ0IGNhc2NhZGVzKSBhbiBzdGQ6Om9wdGlvbmFsLgorCisgICAgICAgIChXZWJDb3JlOjpT dHlsZTo6UHJvcGVydHlDYXNjYWRlOjpzZXRQcm9wZXJ0eUludGVybmFsKToKKyAgICAgICAgKFdl YkNvcmU6OlN0eWxlOjpQcm9wZXJ0eUNhc2NhZGU6OmFkZE1hdGNoKToKKworICAgICAgICBGYWN0 b3IgdGhlIHJldmVydCB0ZXN0IGludG8gYSBsYW1iZGEuCisgICAgICAgIFdlIGNhbiBuZXZlciBy ZXZlcnQgdG8gYW4gYXR0cmlidXRlIHN0eWxlIHNvIGFsd2F5cyBza2lwIHRoZW0uCisKKyAgICAg ICAgKiBzdHlsZS9Qcm9wZXJ0eUNhc2NhZGUuaDoKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlOjpQ cm9wZXJ0eUNhc2NhZGU6OlByb3BlcnR5Q2FzY2FkZSk6CisgICAgICAgIChXZWJDb3JlOjpTdHls ZTo6UHJvcGVydHlDYXNjYWRlOjptYXhpbXVtQ2FzY2FkZUxldmVsIGNvbnN0KTogRGVsZXRlZC4K KyAgICAgICAgKFdlYkNvcmU6OlN0eWxlOjpQcm9wZXJ0eUNhc2NhZGU6Om1heGltdW1DYXNjYWRl TGF5ZXJQcmlvcml0eSBjb25zdCk6IERlbGV0ZWQuCisgICAgICAgICogc3R5bGUvUnVsZVNldC5o OgorICAgICAgICAqIHN0eWxlL1N0eWxlQnVpbGRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpT dHlsZTo6QnVpbGRlcjo6YXBwbHlDdXN0b21Qcm9wZXJ0eSk6CisgICAgICAgIChXZWJDb3JlOjpT dHlsZTo6QnVpbGRlcjo6YXBwbHlDYXNjYWRlUHJvcGVydHkpOgorICAgICAgICAoV2ViQ29yZTo6 U3R5bGU6OkJ1aWxkZXI6OmFwcGx5Um9sbGJhY2tDYXNjYWRlUHJvcGVydHkpOgorCisgICAgICAg IEtlZXAgYSBwb2ludGVyIHRvIHRoZSBjdXJyZW50IHByb3BlcnR5IGJlaW5nIGFwcGxpZWQgaW4g c3RhdGUgaW5zdGVhZCBvZiBpbmRpdmlkdWFsIHByaW9yaXR5IHZhbHVlcy4KKworICAgICAgICAo V2ViQ29yZTo6U3R5bGU6OkJ1aWxkZXI6OmFwcGx5UHJvcGVydHkpOgorICAgICAgICAoV2ViQ29y ZTo6U3R5bGU6OkJ1aWxkZXI6OmVuc3VyZVJvbGxiYWNrQ2FzY2FkZUZvclJldmVydCk6CisgICAg ICAgIChXZWJDb3JlOjpTdHlsZTo6QnVpbGRlcjo6ZW5zdXJlUm9sbGJhY2tDYXNjYWRlRm9yUmV2 ZXJ0TGF5ZXIpOgorCisgICAgICAgIElmIHRoZSBjdXJyZW50IHByb3BlcnR5IGlzIGZyb20gYXR0 cmlidXRlIHN0eWxlIGl0IHJldmVydHMgdG8gdGhlIHNhbWUgbGF5ZXIuCisKKyAgICAgICAgKiBz dHlsZS9TdHlsZUJ1aWxkZXIuaDoKKyAgICAgICAgKiBzdHlsZS9TdHlsZUJ1aWxkZXJTdGF0ZS5o OgorICAgICAgICAoV2ViQ29yZTo6U3R5bGU6OkJ1aWxkZXJTdGF0ZTo6c3R5bGVTY29wZU9yZGlu YWwgY29uc3QpOgorCiAyMDIxLTEyLTExICBEb24gT2xtc3RlYWQgIDxkb24ub2xtc3RlYWRAc29u eS5jb20+CiAKICAgICAgICAgU2hhcmVkQnVmZmVyIHNob3VsZCB1c2UgV1RGOjpGaWxlU3lzdGVt IHdoZW4gY3JlYXRpbmcgZnJvbSBhIGZpbGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3N0 eWxlL1Byb3BlcnR5Q2FzY2FkZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9Qcm9wZXJ0eUNh c2NhZGUuY3BwCmluZGV4IGRhYmRhNjA4NzhiYTBjMDU3N2YxZDRlYmVjYTVjMjRjMzUxODk2N2Uu LjllOWIyOWI3YzQ1NDQ4NjE1MmVlYTNhZWU4Yzc2ZGVkN2FkNzgxMGUgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3N0eWxlL1Byb3BlcnR5Q2FzY2FkZS5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvc3R5bGUvUHJvcGVydHlDYXNjYWRlLmNwcApAQCAtMjYsNiArMjYsNyBAQAogI2luY2x1ZGUg ImNvbmZpZy5oIgogI2luY2x1ZGUgIlByb3BlcnR5Q2FzY2FkZS5oIgogCisjaW5jbHVkZSAiQ1NT Q3VzdG9tUHJvcGVydHlWYWx1ZS5oIgogI2luY2x1ZGUgIkNTU1BhaW50SW1hZ2VWYWx1ZS5oIgog I2luY2x1ZGUgIkNTU1ByaW1pdGl2ZVZhbHVlTWFwcGluZ3MuaCIKICNpbmNsdWRlICJDU1NWYWx1 ZVBvb2wuaCIKQEAgLTgwLDExICs4MSwxMSBAQCBQcm9wZXJ0eUNhc2NhZGU6OlByb3BlcnR5Q2Fz Y2FkZShjb25zdCBNYXRjaFJlc3VsdCYgbWF0Y2hSZXN1bHQsIENhc2NhZGVMZXZlbCBtYQogICAg IGJ1aWxkQ2FzY2FkZSgpOwogfQogCi1Qcm9wZXJ0eUNhc2NhZGU6OlByb3BlcnR5Q2FzY2FkZShj b25zdCBQcm9wZXJ0eUNhc2NhZGUmIHBhcmVudCwgQ2FzY2FkZUxldmVsIG1heGltdW1DYXNjYWRl TGV2ZWwsIENhc2NhZGVMYXllclByaW9yaXR5IG1heGltdW1DYXNjYWRlTGF5ZXJQcmlvcml0eSkK K1Byb3BlcnR5Q2FzY2FkZTo6UHJvcGVydHlDYXNjYWRlKGNvbnN0IFByb3BlcnR5Q2FzY2FkZSYg cGFyZW50LCBDYXNjYWRlTGV2ZWwgbWF4aW11bUNhc2NhZGVMZXZlbCwgc3RkOjpvcHRpb25hbDxD YXNjYWRlTGF5ZXJQcmlvcml0eT4gbWF4aW11bUNhc2NhZGVMYXllclByaW9yaXR5Rm9yUm9sbGJh Y2spCiAgICAgOiBtX21hdGNoUmVzdWx0KHBhcmVudC5tX21hdGNoUmVzdWx0KQogICAgICwgbV9p bmNsdWRlZFByb3BlcnRpZXMocGFyZW50Lm1faW5jbHVkZWRQcm9wZXJ0aWVzKQogICAgICwgbV9t YXhpbXVtQ2FzY2FkZUxldmVsKG1heGltdW1DYXNjYWRlTGV2ZWwpCi0gICAgLCBtX21heGltdW1D YXNjYWRlTGF5ZXJQcmlvcml0eShtYXhpbXVtQ2FzY2FkZUxheWVyUHJpb3JpdHkpCisgICAgLCBt X21heGltdW1DYXNjYWRlTGF5ZXJQcmlvcml0eUZvclJvbGxiYWNrKG1heGltdW1DYXNjYWRlTGF5 ZXJQcmlvcml0eUZvclJvbGxiYWNrKQogICAgICwgbV9kaXJlY3Rpb24ocGFyZW50LmRpcmVjdGlv bigpKQogICAgICwgbV9kaXJlY3Rpb25Jc1VucmVzb2x2ZWQoZmFsc2UpCiB7CkBAIC0xMTYsOSAr MTE3LDEwIEBAIHZvaWQgUHJvcGVydHlDYXNjYWRlOjpzZXRQcm9wZXJ0eUludGVybmFsKFByb3Bl cnR5JiBwcm9wZXJ0eSwgQ1NTUHJvcGVydHlJRCBpZCwKIHsKICAgICBBU1NFUlQobWF0Y2hlZFBy b3BlcnRpZXMubGlua01hdGNoVHlwZSA8PSBTZWxlY3RvckNoZWNrZXI6Ok1hdGNoQWxsKTsKICAg ICBwcm9wZXJ0eS5pZCA9IGlkOwotICAgIHByb3BlcnR5LmxldmVsID0gY2FzY2FkZUxldmVsOwor ICAgIHByb3BlcnR5LmNhc2NhZGVMZXZlbCA9IGNhc2NhZGVMZXZlbDsKICAgICBwcm9wZXJ0eS5z dHlsZVNjb3BlT3JkaW5hbCA9IG1hdGNoZWRQcm9wZXJ0aWVzLnN0eWxlU2NvcGVPcmRpbmFsOwog ICAgIHByb3BlcnR5LmNhc2NhZGVMYXllclByaW9yaXR5ID0gbWF0Y2hlZFByb3BlcnRpZXMuY2Fz Y2FkZUxheWVyUHJpb3JpdHk7CisgICAgcHJvcGVydHkuZnJvbVN0eWxlQXR0cmlidXRlID0gbWF0 Y2hlZFByb3BlcnRpZXMuZnJvbVN0eWxlQXR0cmlidXRlOwogCiAgICAgaWYgKG1hdGNoZWRQcm9w ZXJ0aWVzLmxpbmtNYXRjaFR5cGUgPT0gU2VsZWN0b3JDaGVja2VyOjpNYXRjaEFsbCkgewogICAg ICAgICBwcm9wZXJ0eS5jc3NWYWx1ZVswXSA9ICZjc3NWYWx1ZTsKQEAgLTE3Nyw3ICsxNzksMTgg QEAgdm9pZCBQcm9wZXJ0eUNhc2NhZGU6OnNldERlZmVycmVkKENTU1Byb3BlcnR5SUQgaWQsIENT U1ZhbHVlJiBjc3NWYWx1ZSwgY29uc3QgTWEKIAogYm9vbCBQcm9wZXJ0eUNhc2NhZGU6OmFkZE1h dGNoKGNvbnN0IE1hdGNoZWRQcm9wZXJ0aWVzJiBtYXRjaGVkUHJvcGVydGllcywgQ2FzY2FkZUxl dmVsIGNhc2NhZGVMZXZlbCwgYm9vbCBpbXBvcnRhbnQpCiB7Ci0gICAgaWYgKG1hdGNoZWRQcm9w ZXJ0aWVzLmNhc2NhZGVMYXllclByaW9yaXR5ID4gbV9tYXhpbXVtQ2FzY2FkZUxheWVyUHJpb3Jp dHkgJiYgY2FzY2FkZUxldmVsID09IG1fbWF4aW11bUNhc2NhZGVMZXZlbCAmJiBtYXRjaGVkUHJv cGVydGllcy5zdHlsZVNjb3BlT3JkaW5hbCA9PSBTY29wZU9yZGluYWw6OkVsZW1lbnQpCisgICAg YXV0byBza2lwRm9yUm9sbGJhY2sgPSBbJl0geworICAgICAgICBpZiAoIW1fbWF4aW11bUNhc2Nh ZGVMYXllclByaW9yaXR5Rm9yUm9sbGJhY2spCisgICAgICAgICAgICByZXR1cm4gZmFsc2U7Cisg ICAgICAgIGlmIChtYXRjaGVkUHJvcGVydGllcy5zdHlsZVNjb3BlT3JkaW5hbCAhPSBTY29wZU9y ZGluYWw6OkVsZW1lbnQpCisgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgIGlmIChj YXNjYWRlTGV2ZWwgPCBtX21heGltdW1DYXNjYWRlTGV2ZWwpCisgICAgICAgICAgICByZXR1cm4g ZmFsc2U7CisgICAgICAgIGlmIChtYXRjaGVkUHJvcGVydGllcy5mcm9tU3R5bGVBdHRyaWJ1dGUg PT0gRnJvbVN0eWxlQXR0cmlidXRlOjpZZXMpCisgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAg ICAgICAgcmV0dXJuIG1hdGNoZWRQcm9wZXJ0aWVzLmNhc2NhZGVMYXllclByaW9yaXR5ID4gKm1f bWF4aW11bUNhc2NhZGVMYXllclByaW9yaXR5Rm9yUm9sbGJhY2s7CisgICAgfTsKKyAgICBpZiAo c2tpcEZvclJvbGxiYWNrKCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIGF1dG8mIHN0 eWxlUHJvcGVydGllcyA9ICptYXRjaGVkUHJvcGVydGllcy5wcm9wZXJ0aWVzOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvc3R5bGUvUHJvcGVydHlDYXNjYWRlLmggYi9Tb3VyY2UvV2ViQ29y ZS9zdHlsZS9Qcm9wZXJ0eUNhc2NhZGUuaAppbmRleCA1MWQyMTc2MWM3NTAzM2NhMzM2YzY3ZmE4 OTk1ODdhYTAyNjU5NWRmLi41MDY0Zjc4MWIzNGU3MDY1ODQwMTMwMjVmOGI5NWVjNjgxYTc2ODRh IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9Qcm9wZXJ0eUNhc2NhZGUuaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9Qcm9wZXJ0eUNhc2NhZGUuaApAQCAtMjcsNyArMjcsNiBA QAogCiAjaW5jbHVkZSAiQ2FzY2FkZUxldmVsLmgiCiAjaW5jbHVkZSAiTWF0Y2hSZXN1bHQuaCIK LSNpbmNsdWRlICJTdHlsZUJ1aWxkZXJTdGF0ZS5oIgogI2luY2x1ZGUgPGJpdHNldD4KIAogbmFt ZXNwYWNlIFdlYkNvcmUgewpAQCAtNDcsMTUgKzQ2LDE2IEBAIHB1YmxpYzoKICAgICB9OwogCiAg ICAgUHJvcGVydHlDYXNjYWRlKGNvbnN0IE1hdGNoUmVzdWx0JiwgQ2FzY2FkZUxldmVsLCBJbmNs dWRlZFByb3BlcnRpZXMsIERpcmVjdGlvbik7Ci0gICAgUHJvcGVydHlDYXNjYWRlKGNvbnN0IFBy b3BlcnR5Q2FzY2FkZSYsIENhc2NhZGVMZXZlbCwgQ2FzY2FkZUxheWVyUHJpb3JpdHkgbWF4aW11 bUNhc2NhZGVMYXllclByaW9yaXR5ID0gUnVsZVNldDo6Y2FzY2FkZUxheWVyUHJpb3JpdHlGb3JV bmxheWVyZWQpOworICAgIFByb3BlcnR5Q2FzY2FkZShjb25zdCBQcm9wZXJ0eUNhc2NhZGUmLCBD YXNjYWRlTGV2ZWwsIHN0ZDo6b3B0aW9uYWw8Q2FzY2FkZUxheWVyUHJpb3JpdHk+IG1heGltdW1D YXNjYWRlTGF5ZXJQcmlvcml0eUZvclJvbGxiYWNrID0geyB9KTsKIAogICAgIH5Qcm9wZXJ0eUNh c2NhZGUoKTsKIAogICAgIHN0cnVjdCBQcm9wZXJ0eSB7CiAgICAgICAgIENTU1Byb3BlcnR5SUQg aWQ7Ci0gICAgICAgIENhc2NhZGVMZXZlbCBsZXZlbDsKKyAgICAgICAgQ2FzY2FkZUxldmVsIGNh c2NhZGVMZXZlbDsKICAgICAgICAgU2NvcGVPcmRpbmFsIHN0eWxlU2NvcGVPcmRpbmFsOwogICAg ICAgICBDYXNjYWRlTGF5ZXJQcmlvcml0eSBjYXNjYWRlTGF5ZXJQcmlvcml0eTsKKyAgICAgICAg RnJvbVN0eWxlQXR0cmlidXRlIGZyb21TdHlsZUF0dHJpYnV0ZTsKICAgICAgICAgQ1NTVmFsdWUq IGNzc1ZhbHVlWzNdOyAvLyBWYWx1ZXMgZm9yIGxpbmsgbWF0Y2ggc3RhdGVzIE1hdGNoRGVmYXVs dCwgTWF0Y2hMaW5rIGFuZCBNYXRjaFZpc2l0ZWQKICAgICB9OwogCkBAIC03MCw5ICs3MCw2IEBA IHB1YmxpYzoKIAogICAgIERpcmVjdGlvbiBkaXJlY3Rpb24oKSBjb25zdDsKIAotICAgIGF1dG8g bWF4aW11bUNhc2NhZGVMZXZlbCgpIGNvbnN0IHsgcmV0dXJuIG1fbWF4aW11bUNhc2NhZGVMZXZl bDsgfQotICAgIGF1dG8gbWF4aW11bUNhc2NhZGVMYXllclByaW9yaXR5KCkgY29uc3QgeyByZXR1 cm4gbV9tYXhpbXVtQ2FzY2FkZUxheWVyUHJpb3JpdHk7IH0KLQogcHJpdmF0ZToKICAgICB2b2lk IGJ1aWxkQ2FzY2FkZSgpOwogICAgIGJvb2wgYWRkTm9ybWFsTWF0Y2hlcyhDYXNjYWRlTGV2ZWwp OwpAQCAtODgsNyArODUsNyBAQCBwcml2YXRlOgogICAgIGNvbnN0IE1hdGNoUmVzdWx0JiBtX21h dGNoUmVzdWx0OwogICAgIGNvbnN0IEluY2x1ZGVkUHJvcGVydGllcyBtX2luY2x1ZGVkUHJvcGVy dGllczsKICAgICBjb25zdCBDYXNjYWRlTGV2ZWwgbV9tYXhpbXVtQ2FzY2FkZUxldmVsOwotICAg IGNvbnN0IENhc2NhZGVMYXllclByaW9yaXR5IG1fbWF4aW11bUNhc2NhZGVMYXllclByaW9yaXR5 IHsgUnVsZVNldDo6Y2FzY2FkZUxheWVyUHJpb3JpdHlGb3JVbmxheWVyZWQgfTsKKyAgICBjb25z dCBzdGQ6Om9wdGlvbmFsPENhc2NhZGVMYXllclByaW9yaXR5PiBtX21heGltdW1DYXNjYWRlTGF5 ZXJQcmlvcml0eUZvclJvbGxiYWNrOwogICAgIG11dGFibGUgRGlyZWN0aW9uIG1fZGlyZWN0aW9u OwogICAgIG11dGFibGUgYm9vbCBtX2RpcmVjdGlvbklzVW5yZXNvbHZlZCB7IHRydWUgfTsKIApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvc3R5bGUvUnVsZVNldC5oIGIvU291cmNlL1dlYkNv cmUvc3R5bGUvUnVsZVNldC5oCmluZGV4IGY4MTI2N2U5ZWFiZTQ4OGU5YmQyMDA1M2U0NDZiZDlj ODUyMGNlZWMuLjM0NjEyMWU0ZGI2YjAzMTRkNmFkZWY4NWU4NjA4NzNlMWMzYzExNWMgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1J1bGVTZXQuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9zdHlsZS9SdWxlU2V0LmgKQEAgLTEwNiw2ICsxMDYsNyBAQCBwdWJsaWM6CiAgICAgYm9vbCBo YXNIb3N0UHNldWRvQ2xhc3NSdWxlc01hdGNoaW5nSW5TaGFkb3dUcmVlKCkgY29uc3QgeyByZXR1 cm4gbV9oYXNIb3N0UHNldWRvQ2xhc3NSdWxlc01hdGNoaW5nSW5TaGFkb3dUcmVlOyB9CiAKICAg ICBzdGF0aWMgY29uc3RleHByIGF1dG8gY2FzY2FkZUxheWVyUHJpb3JpdHlGb3JVbmxheWVyZWQg PSBzdGQ6Om51bWVyaWNfbGltaXRzPENhc2NhZGVMYXllclByaW9yaXR5Pjo6bWF4KCk7CisKICAg ICBDYXNjYWRlTGF5ZXJQcmlvcml0eSBjYXNjYWRlTGF5ZXJQcmlvcml0eUZvcihjb25zdCBSdWxl RGF0YSYpIGNvbnN0OwogCiBwcml2YXRlOgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvc3R5 bGUvU3R5bGVCdWlsZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlQnVpbGRlci5j cHAKaW5kZXggYzRlMTAyYjY4YmRlNDU1Mjc1OWNjMjdjNmY5N2VmNzcyNTYwMTdiMy4uYjIxNmJh MmE0YjkzYWFkYmEwZWMyZjNmZWJkNzE2MWIwOTU3ZjhmYyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvc3R5bGUvU3R5bGVCdWlsZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9T dHlsZUJ1aWxkZXIuY3BwCkBAIC0xODAsNiArMTgwLDggQEAgdm9pZCBCdWlsZGVyOjphcHBseUN1 c3RvbVByb3BlcnR5KGNvbnN0IFN0cmluZyYgbmFtZSkKICAgICBhdXRvIHByb3BlcnR5ID0gbV9j YXNjYWRlLmN1c3RvbVByb3BlcnR5KG5hbWUpOwogICAgIGJvb2wgaW5DeWNsZSA9IG1fc3RhdGUu bV9pblByb2dyZXNzUHJvcGVydGllc0N1c3RvbS5jb250YWlucyhuYW1lKTsKIAorICAgIFNldEZv clNjb3BlIGxldmVsU2NvcGUobV9zdGF0ZS5tX2N1cnJlbnRQcm9wZXJ0eSwgJnByb3BlcnR5KTsK KwogICAgIGZvciAoYXV0byBpbmRleCA6IHsgU2VsZWN0b3JDaGVja2VyOjpNYXRjaERlZmF1bHQs IFNlbGVjdG9yQ2hlY2tlcjo6TWF0Y2hMaW5rLCBTZWxlY3RvckNoZWNrZXI6Ok1hdGNoVmlzaXRl ZCB9KSB7CiAgICAgICAgIGlmICghcHJvcGVydHkuY3NzVmFsdWVbaW5kZXhdKQogICAgICAgICAg ICAgY29udGludWU7CkBAIC0yMzMsOSArMjM1LDcgQEAgdm9pZCBCdWlsZGVyOjphcHBseUN1c3Rv bVByb3BlcnR5KGNvbnN0IFN0cmluZyYgbmFtZSkKIAogaW5saW5lIHZvaWQgQnVpbGRlcjo6YXBw bHlDYXNjYWRlUHJvcGVydHkoY29uc3QgUHJvcGVydHlDYXNjYWRlOjpQcm9wZXJ0eSYgcHJvcGVy dHkpCiB7Ci0gICAgbV9zdGF0ZS5tX2Nhc2NhZGVMZXZlbCA9IHByb3BlcnR5LmxldmVsOwotICAg IG1fc3RhdGUubV9zdHlsZVNjb3BlT3JkaW5hbCA9IHByb3BlcnR5LnN0eWxlU2NvcGVPcmRpbmFs OwotICAgIG1fc3RhdGUubV9jYXNjYWRlTGF5ZXJQcmlvcml0eSA9IHByb3BlcnR5LmNhc2NhZGVM YXllclByaW9yaXR5OworICAgIFNldEZvclNjb3BlIGxldmVsU2NvcGUobV9zdGF0ZS5tX2N1cnJl bnRQcm9wZXJ0eSwgJnByb3BlcnR5KTsKIAogICAgIGF1dG8gYXBwbHlXaXRoTGlua01hdGNoID0g WyZdKFNlbGVjdG9yQ2hlY2tlcjo6TGlua01hdGNoTWFzayBsaW5rTWF0Y2gpIHsKICAgICAgICAg aWYgKHByb3BlcnR5LmNzc1ZhbHVlW2xpbmtNYXRjaF0pIHsKQEAgLTI2MSw5ICsyNjEsNyBAQCB2 b2lkIEJ1aWxkZXI6OmFwcGx5Um9sbGJhY2tDYXNjYWRlUHJvcGVydHkoY29uc3QgUHJvcGVydHlD YXNjYWRlOjpQcm9wZXJ0eSYgcHJvcAogICAgIGlmICghdmFsdWUpCiAgICAgICAgIHJldHVybjsK IAotICAgIFNldEZvclNjb3BlIGxldmVsU2NvcGUobV9zdGF0ZS5tX2Nhc2NhZGVMZXZlbCwgcHJv cGVydHkubGV2ZWwpOwotICAgIFNldEZvclNjb3BlIHNjb3BlU2NvcGUobV9zdGF0ZS5tX3N0eWxl U2NvcGVPcmRpbmFsLCBwcm9wZXJ0eS5zdHlsZVNjb3BlT3JkaW5hbCk7Ci0gICAgU2V0Rm9yU2Nv cGUgbGF5ZXJTY29wZShtX3N0YXRlLm1fY2FzY2FkZUxheWVyUHJpb3JpdHksIHByb3BlcnR5LmNh c2NhZGVMYXllclByaW9yaXR5KTsKKyAgICBTZXRGb3JTY29wZSBsZXZlbFNjb3BlKG1fc3RhdGUu bV9jdXJyZW50UHJvcGVydHksICZwcm9wZXJ0eSk7CiAKICAgICBhcHBseVByb3BlcnR5KHByb3Bl cnR5LmlkLCAqdmFsdWUsIGxpbmtNYXRjaE1hc2spOwogfQpAQCAtMzAyLDkgKzMwMCw3IEBAIHZv aWQgQnVpbGRlcjo6YXBwbHlQcm9wZXJ0eShDU1NQcm9wZXJ0eUlEIGlkLCBDU1NWYWx1ZSYgdmFs dWUsIFNlbGVjdG9yQ2hlY2tlcjo6CiAgICAgYm9vbCBpc1JldmVydExheWVyID0gdmFsdWVUb0Fw cGx5LT5pc1JldmVydExheWVyVmFsdWUoKSB8fCBjdXN0b21Qcm9wZXJ0eVZhbHVlSUQgPT0gQ1NT VmFsdWVSZXZlcnRMYXllcjsKIAogICAgIGlmIChpc1JldmVydCB8fCBpc1JldmVydExheWVyKSB7 Ci0gICAgICAgIGF1dG8qIHJvbGxiYWNrQ2FzY2FkZSA9IGlzUmV2ZXJ0Ci0gICAgICAgICAgICA/ IGVuc3VyZVJvbGxiYWNrQ2FzY2FkZUZvclJldmVydChtX3N0YXRlLm1fY2FzY2FkZUxldmVsKQot ICAgICAgICAgICAgOiBlbnN1cmVSb2xsYmFja0Nhc2NhZGVGb3JSZXZlcnRMYXllcihtX3N0YXRl Lm1fY2FzY2FkZUxldmVsLCBtX3N0YXRlLm1fY2FzY2FkZUxheWVyUHJpb3JpdHkpOworICAgICAg ICBhdXRvKiByb2xsYmFja0Nhc2NhZGUgPSBpc1JldmVydCA/IGVuc3VyZVJvbGxiYWNrQ2FzY2Fk ZUZvclJldmVydCgpIDogZW5zdXJlUm9sbGJhY2tDYXNjYWRlRm9yUmV2ZXJ0TGF5ZXIoKTsKIAog ICAgICAgICBpZiAocm9sbGJhY2tDYXNjYWRlKSB7CiAgICAgICAgICAgICAvLyBXaXRoIHRoZSBy b2xsYmFjayBjYXNjYWRlIGJ1aWx0LCB3ZSBuZWVkIHRvIG9idGFpbiB0aGUgcHJvcGVydHkgYW5k IGFwcGx5IGl0LiBJZiB0aGUgcHJvcGVydHkgaXMKQEAgLTM3OSwyOSArMzc1LDM2IEBAIFJlZlB0 cjxDU1NWYWx1ZT4gQnVpbGRlcjo6cmVzb2x2ZWRWYXJpYWJsZVZhbHVlKENTU1Byb3BlcnR5SUQg cHJvcGVydHlJRCwgY29uc3QKICAgICByZXR1cm4gQ1NTUGFyc2VyKG1fc3RhdGUuZG9jdW1lbnQo KSkucGFyc2VWYWx1ZVdpdGhWYXJpYWJsZVJlZmVyZW5jZXMocHJvcGVydHlJRCwgdmFsdWUsIG1f c3RhdGUpOwogfQogCi1jb25zdCBQcm9wZXJ0eUNhc2NhZGUqIEJ1aWxkZXI6OmVuc3VyZVJvbGxi YWNrQ2FzY2FkZUZvclJldmVydChDYXNjYWRlTGV2ZWwgcm9sbGJhY2tDYXNjYWRlTGV2ZWwpCitj b25zdCBQcm9wZXJ0eUNhc2NhZGUqIEJ1aWxkZXI6OmVuc3VyZVJvbGxiYWNrQ2FzY2FkZUZvclJl dmVydCgpCiB7CisgICAgYXV0byByb2xsYmFja0Nhc2NhZGVMZXZlbCA9IG1fc3RhdGUubV9jdXJy ZW50UHJvcGVydHktPmNhc2NhZGVMZXZlbDsKICAgICBpZiAocm9sbGJhY2tDYXNjYWRlTGV2ZWwg PT0gQ2FzY2FkZUxldmVsOjpVc2VyQWdlbnQpCiAgICAgICAgIHJldHVybiBudWxscHRyOwogCiAg ICAgLS1yb2xsYmFja0Nhc2NhZGVMZXZlbDsKIAotICAgIGF1dG8ga2V5ID0gbWFrZVJvbGxiYWNr Q2FzY2FkZUtleShyb2xsYmFja0Nhc2NhZGVMZXZlbCwgUnVsZVNldDo6Y2FzY2FkZUxheWVyUHJp b3JpdHlGb3JVbmxheWVyZWQpOworICAgIGF1dG8ga2V5ID0gbWFrZVJvbGxiYWNrQ2FzY2FkZUtl eShyb2xsYmFja0Nhc2NhZGVMZXZlbCwgMCk7CiAgICAgcmV0dXJuIG1fcm9sbGJhY2tDYXNjYWRl cy5lbnN1cmUoa2V5LCBbJl0gewotICAgICAgICByZXR1cm4gbWFrZVVuaXF1ZTxjb25zdCBQcm9w ZXJ0eUNhc2NhZGU+KG1fY2FzY2FkZSwgcm9sbGJhY2tDYXNjYWRlTGV2ZWwsIFJ1bGVTZXQ6OmNh c2NhZGVMYXllclByaW9yaXR5Rm9yVW5sYXllcmVkKTsKKyAgICAgICAgcmV0dXJuIG1ha2VVbmlx dWU8Y29uc3QgUHJvcGVydHlDYXNjYWRlPihtX2Nhc2NhZGUsIHJvbGxiYWNrQ2FzY2FkZUxldmVs KTsKICAgICB9KS5pdGVyYXRvci0+dmFsdWUuZ2V0KCk7CiB9CiAKLWNvbnN0IFByb3BlcnR5Q2Fz Y2FkZSogQnVpbGRlcjo6ZW5zdXJlUm9sbGJhY2tDYXNjYWRlRm9yUmV2ZXJ0TGF5ZXIoQ2FzY2Fk ZUxldmVsIGNhc2NhZGVMZXZlbCwgQ2FzY2FkZUxheWVyUHJpb3JpdHkgcm9sbGJhY2tMYXllclBy aW9yaXR5KQorY29uc3QgUHJvcGVydHlDYXNjYWRlKiBCdWlsZGVyOjplbnN1cmVSb2xsYmFja0Nh c2NhZGVGb3JSZXZlcnRMYXllcigpCiB7CisgICAgYXV0byYgcHJvcGVydHkgPSAqbV9zdGF0ZS5t X2N1cnJlbnRQcm9wZXJ0eTsKKyAgICBhdXRvIHJvbGxiYWNrTGF5ZXJQcmlvcml0eSA9IHByb3Bl cnR5LmNhc2NhZGVMYXllclByaW9yaXR5OwogICAgIGlmICghcm9sbGJhY2tMYXllclByaW9yaXR5 KQogICAgICAgICByZXR1cm4gbnVsbHB0cjsKIAotICAgIC0tcm9sbGJhY2tMYXllclByaW9yaXR5 OworICAgIEFTU0VSVChwcm9wZXJ0eS5mcm9tU3R5bGVBdHRyaWJ1dGUgPT0gRnJvbVN0eWxlQXR0 cmlidXRlOjpObyB8fCBwcm9wZXJ0eS5jYXNjYWRlTGF5ZXJQcmlvcml0eSA9PSBSdWxlU2V0Ojpj YXNjYWRlTGF5ZXJQcmlvcml0eUZvclVubGF5ZXJlZCk7CisKKyAgICAvLyBTdHlsZSBhdHRyaWJ1 dGUgcmV2ZXJ0cyB0byB0aGUgcmVndWxhciBhdXRob3Igc3R5bGUuCisgICAgaWYgKHByb3BlcnR5 LmZyb21TdHlsZUF0dHJpYnV0ZSA9PSBGcm9tU3R5bGVBdHRyaWJ1dGU6Ok5vKQorICAgICAgICAt LXJvbGxiYWNrTGF5ZXJQcmlvcml0eTsKIAotICAgIGF1dG8ga2V5ID0gbWFrZVJvbGxiYWNrQ2Fz Y2FkZUtleShjYXNjYWRlTGV2ZWwsIHJvbGxiYWNrTGF5ZXJQcmlvcml0eSk7CisgICAgYXV0byBr ZXkgPSBtYWtlUm9sbGJhY2tDYXNjYWRlS2V5KHByb3BlcnR5LmNhc2NhZGVMZXZlbCwgcm9sbGJh Y2tMYXllclByaW9yaXR5KTsKICAgICByZXR1cm4gbV9yb2xsYmFja0Nhc2NhZGVzLmVuc3VyZShr ZXksIFsmXSB7Ci0gICAgICAgIHJldHVybiBtYWtlVW5pcXVlPGNvbnN0IFByb3BlcnR5Q2FzY2Fk ZT4obV9jYXNjYWRlLCBjYXNjYWRlTGV2ZWwsIHJvbGxiYWNrTGF5ZXJQcmlvcml0eSk7CisgICAg ICAgIHJldHVybiBtYWtlVW5pcXVlPGNvbnN0IFByb3BlcnR5Q2FzY2FkZT4obV9jYXNjYWRlLCBw cm9wZXJ0eS5jYXNjYWRlTGV2ZWwsIHJvbGxiYWNrTGF5ZXJQcmlvcml0eSk7CiAgICAgfSkuaXRl cmF0b3ItPnZhbHVlLmdldCgpOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9zdHls ZS9TdHlsZUJ1aWxkZXIuaCBiL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlQnVpbGRlci5oCmlu ZGV4IDc5NTJhYWU0MzNiZjQ2OGU5MTM2NzIxNTJiYTgyODhhOGRmZjA5Y2MuLjYzMjVmM2JmN2Y4 MWMyNjIyMjA3ZWUwMjE4Nzk0ODNiYTY3M2Q2YmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3N0eWxlL1N0eWxlQnVpbGRlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlQnVp bGRlci5oCkBAIC02Miw4ICs2Miw4IEBAIHByaXZhdGU6CiAgICAgUmVmPENTU1ZhbHVlPiByZXNv bHZlVmFsdWUoQ1NTUHJvcGVydHlJRCwgQ1NTVmFsdWUmKTsKICAgICBSZWZQdHI8Q1NTVmFsdWU+ IHJlc29sdmVkVmFyaWFibGVWYWx1ZShDU1NQcm9wZXJ0eUlELCBjb25zdCBDU1NWYWx1ZSYpOwog Ci0gICAgY29uc3QgUHJvcGVydHlDYXNjYWRlKiBlbnN1cmVSb2xsYmFja0Nhc2NhZGVGb3JSZXZl cnQoQ2FzY2FkZUxldmVsKTsKLSAgICBjb25zdCBQcm9wZXJ0eUNhc2NhZGUqIGVuc3VyZVJvbGxi YWNrQ2FzY2FkZUZvclJldmVydExheWVyKENhc2NhZGVMZXZlbCwgQ2FzY2FkZUxheWVyUHJpb3Jp dHkpOworICAgIGNvbnN0IFByb3BlcnR5Q2FzY2FkZSogZW5zdXJlUm9sbGJhY2tDYXNjYWRlRm9y UmV2ZXJ0KCk7CisgICAgY29uc3QgUHJvcGVydHlDYXNjYWRlKiBlbnN1cmVSb2xsYmFja0Nhc2Nh ZGVGb3JSZXZlcnRMYXllcigpOwogCiAgICAgdXNpbmcgUm9sbGJhY2tDYXNjYWRlS2V5ID0gc3Rk OjpwYWlyPHVuc2lnbmVkLCB1bnNpZ25lZD47CiAgICAgUm9sbGJhY2tDYXNjYWRlS2V5IG1ha2VS b2xsYmFja0Nhc2NhZGVLZXkoQ2FzY2FkZUxldmVsLCBDYXNjYWRlTGF5ZXJQcmlvcml0eSk7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZUJ1aWxkZXJTdGF0ZS5oIGIvU291 cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVCdWlsZGVyU3RhdGUuaAppbmRleCBjNTFmMmFlYWQ0N2Fh NGI2ZGNjOTllMTA3NjAzNWM0Njc5YjJhMzcwLi5jYzE0NjMxYTEzNTU1OTMzNzkyYmM4ZjAxZTg1 M2NkMzE0OGFiOWU0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZUJ1aWxk ZXJTdGF0ZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlQnVpbGRlclN0YXRlLmgK QEAgLTI4LDYgKzI4LDcgQEAKICNpbmNsdWRlICJDU1NUb0xlbmd0aENvbnZlcnNpb25EYXRhLmgi CiAjaW5jbHVkZSAiQ1NTVG9TdHlsZU1hcC5oIgogI2luY2x1ZGUgIkNhc2NhZGVMZXZlbC5oIgor I2luY2x1ZGUgIlByb3BlcnR5Q2FzY2FkZS5oIgogI2luY2x1ZGUgIlJlbmRlclN0eWxlLmgiCiAj aW5jbHVkZSAiUnVsZVNldC5oIgogI2luY2x1ZGUgIlNlbGVjdG9yQ2hlY2tlci5oIgpAQCAtODks NyArOTAsNyBAQCBwdWJsaWM6CiAKICAgICBib29sIHVzZVNWR1pvb21SdWxlcygpIGNvbnN0Owog ICAgIGJvb2wgdXNlU1ZHWm9vbVJ1bGVzRm9yTGVuZ3RoKCkgY29uc3Q7Ci0gICAgU2NvcGVPcmRp bmFsIHN0eWxlU2NvcGVPcmRpbmFsKCkgY29uc3QgeyByZXR1cm4gbV9zdHlsZVNjb3BlT3JkaW5h bDsgfQorICAgIFNjb3BlT3JkaW5hbCBzdHlsZVNjb3BlT3JkaW5hbCgpIGNvbnN0IHsgcmV0dXJu IG1fY3VycmVudFByb3BlcnR5LT5zdHlsZVNjb3BlT3JkaW5hbDsgfQogCiAgICAgUmVmPENTU1Zh bHVlPiByZXNvbHZlSW1hZ2VTdHlsZXMoQ1NTVmFsdWUmKTsKICAgICBSZWZQdHI8U3R5bGVJbWFn ZT4gY3JlYXRlU3R5bGVJbWFnZShDU1NWYWx1ZSYpOwpAQCAtMTM1LDkgKzEzNiw3IEBAIHByaXZh dGU6CiAgICAgQml0bWFwPG51bUNTU1Byb3BlcnRpZXM+IG1faW5Qcm9ncmVzc1Byb3BlcnRpZXM7 CiAgICAgSGFzaFNldDxTdHJpbmc+IG1faW5Qcm9ncmVzc1Byb3BlcnRpZXNDdXN0b207CiAKLSAg ICBDYXNjYWRlTGV2ZWwgbV9jYXNjYWRlTGV2ZWwgeyBDYXNjYWRlTGV2ZWw6OkF1dGhvciB9Owot ICAgIFNjb3BlT3JkaW5hbCBtX3N0eWxlU2NvcGVPcmRpbmFsIHsgfTsKLSAgICBDYXNjYWRlTGF5 ZXJQcmlvcml0eSBtX2Nhc2NhZGVMYXllclByaW9yaXR5IHsgfTsKKyAgICBjb25zdCBQcm9wZXJ0 eUNhc2NhZGU6OlByb3BlcnR5KiBtX2N1cnJlbnRQcm9wZXJ0eSB7IG51bGxwdHIgfTsKICAgICBT ZWxlY3RvckNoZWNrZXI6OkxpbmtNYXRjaE1hc2sgbV9saW5rTWF0Y2ggeyB9OwogCiAgICAgYm9v bCBtX2ZvbnREaXJ0eSB7IGZhbHNlIH07CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggY2U2NDJhYWEwYjZkZTY1ZDlmODgyNzk1 ODhkYmIzNDU4N2ZkYzcxZi4uYTJkM2Q5NDE2YTE1YWUwYzcxNDAyOTFjNDYzOTlkZTM2NTAyMzAx ZiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0No YW5nZUxvZwpAQCAtMSwzICsxLDEyIEBACisyMDIxLTEyLTEzICBBbnR0aSBLb2l2aXN0byAgPGFu dHRpQGFwcGxlLmNvbT4KKworICAgICAgICBbQ1NTIENhc2NhZGUgTGF5ZXJzXSByZXZlcnQtbGF5 ZXIgc2hvdWxkIHJldmVydCBzdHlsZSBhdHRyaWJ1dGUgdG8gcmVndWxhciBhdXRob3Igc3R5bGUK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNDA4Mgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVGVzdEV4 cGVjdGF0aW9uczoKKwogMjAyMS0xMi0xMiAgQW50b2luZSBRdWludCAgPGdyYW91dHNAd2Via2l0 Lm9yZz4KIAogICAgICAgICBBZGQgYSB0ZXN0IGZvciBkb2N1bWVudC50aW1lbGluZS5tYXhpbXVt RnJhbWVSYXRlCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zIGIvTGF5 b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwppbmRleCAyYWJhNjZiMDljMDEyNGY4ODg4YWQ3ZDMw NTlkOWI0NjJlOTE2ZmRkLi42ZWNkYTk4ZjMxNzVhNzQwMzM4ODhhMTNiOWQ0NDNkNWUyZTlhN2E2 IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCisrKyBiL0xheW91dFRl c3RzL1Rlc3RFeHBlY3RhdGlvbnMKQEAgLTIxODEsMTAgKzIxODEsOCBAQCB3ZWJraXQub3JnL2Iv MTQ4NjUwIGZhc3QvcmVwYWludC9hZGQtdGFibGUtb3ZlcnBhaW50Lmh0bWwgWyBQYXNzIEZhaWx1 cmUgXQogCiBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtY2FzY2FkZS9p bXBvcnRhbnQtcHJvcC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMTg3 MDkzIFsgRGVidWcgXSBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtY2Fz Y2FkZS9hbGwtcHJvcC1pbml0aWFsLXhtbC5odG1sIFsgU2tpcCBdCi13ZWJraXQub3JnL2IvMjMz OTM3IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1jYXNjYWRlL3JldmVy dC1sYXllci0wMDkuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIzMzkz NyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtY2FzY2FkZS9yZXZlcnQt bGF5ZXItMDEwLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMzM5Mzcg aW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWNhc2NhZGUvcmV2ZXJ0LWxh eWVyLTAxMS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjMzOTM3IGlt cG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1jYXNjYWRlL3JldmVydC1sYXll ci0wMTIuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIzMzk0NCBpbXBv cnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtY2FzY2FkZS9sYXllci1zdGF0ZW1l bnQtYmVmb3JlLWltcG9ydC5odG1sIFsgUGFzcyBGYWlsdXJlIF0KIAogd2Via2l0Lm9yZy9iLzE0 ODgwMSBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtY29sb3IvdDQyMi1y Z2JhLW9uc2NyZWVuLWIueGh0IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCg== 447116 2021-12-14 01:29:15 -0800 2021-12-14 02:15:04 -0800 Patch for landing bug-234082-20211214112913.patch text/plain 16643 koivisto U3VidmVyc2lvbiBSZXZpc2lvbjogMjg3MDE2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2JmMDE5YzZlNDEzZTQ2 ZDYwMGFlOWM2OWNjNTkzZjcyMGQ5YmYzNi4uODk4NzljNDZhODVlNzdlNjQ4MDhhYWE2ZmY5Y2Ex ZWM4MjJlZjg0MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ2IEBACisyMDIxLTEyLTA5ICBBbnR0 aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBbQ1NTIENhc2NhZGUgTGF5 ZXJzXSByZXZlcnQtbGF5ZXIgc2hvdWxkIHJldmVydCBzdHlsZSBhdHRyaWJ1dGUgdG8gcmVndWxh ciBhdXRob3Igc3R5bGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIzNDA4MgorCisgICAgICAgIFJldmlld2VkIGJ5IFNpbW9uIEZyYXNlci4KKworICAg ICAgICBJZiAncmV2ZXJ0LWxheWVyJyBrZXl3b3JkIGlzIHVzZWQgaW4gc3R5bGUgYXR0cmlidXRl IGl0IHNob3VsZCByZXZlcnQgdG8gcmVndWxhciBhdXRob3Igc3R5bGUKKyAgICAgICAgb24gdGhl IGRlZmF1bHQgY2FzY2FkZSBsZXZlbC4KKworICAgICAgICAqIHN0eWxlL1Byb3BlcnR5Q2FzY2Fk ZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZTo6UHJvcGVydHlDYXNjYWRlOjpQcm9wZXJ0 eUNhc2NhZGUpOgorCisgICAgICAgIE1ha2UgdGhlIG1heGltdW0gbGV2ZWwgKHVzZWQgZm9yIHJl dmVydCBjYXNjYWRlcykgYW4gc3RkOjpvcHRpb25hbC4KKworICAgICAgICAoV2ViQ29yZTo6U3R5 bGU6OlByb3BlcnR5Q2FzY2FkZTo6c2V0UHJvcGVydHlJbnRlcm5hbCk6CisgICAgICAgIChXZWJD b3JlOjpTdHlsZTo6UHJvcGVydHlDYXNjYWRlOjphZGRNYXRjaCk6CisKKyAgICAgICAgRmFjdG9y IHRoZSByZXZlcnQgdGVzdCBpbnRvIGEgbGFtYmRhLgorICAgICAgICBXZSBjYW4gbmV2ZXIgcmV2 ZXJ0IHRvIGFuIGF0dHJpYnV0ZSBzdHlsZSBzbyBhbHdheXMgc2tpcCB0aGVtLgorCisgICAgICAg ICogc3R5bGUvUHJvcGVydHlDYXNjYWRlLmg6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZTo6UHJv cGVydHlDYXNjYWRlOjpQcm9wZXJ0eUNhc2NhZGUpOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGU6 OlByb3BlcnR5Q2FzY2FkZTo6bWF4aW11bUNhc2NhZGVMZXZlbCBjb25zdCk6IERlbGV0ZWQuCisg ICAgICAgIChXZWJDb3JlOjpTdHlsZTo6UHJvcGVydHlDYXNjYWRlOjptYXhpbXVtQ2FzY2FkZUxh eWVyUHJpb3JpdHkgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAqIHN0eWxlL1J1bGVTZXQuaDoK KyAgICAgICAgKiBzdHlsZS9TdHlsZUJ1aWxkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U3R5 bGU6OkJ1aWxkZXI6OmFwcGx5Q3VzdG9tUHJvcGVydHkpOgorICAgICAgICAoV2ViQ29yZTo6U3R5 bGU6OkJ1aWxkZXI6OmFwcGx5Q2FzY2FkZVByb3BlcnR5KToKKyAgICAgICAgKFdlYkNvcmU6OlN0 eWxlOjpCdWlsZGVyOjphcHBseVJvbGxiYWNrQ2FzY2FkZVByb3BlcnR5KToKKworICAgICAgICBL ZWVwIGEgcG9pbnRlciB0byB0aGUgY3VycmVudCBwcm9wZXJ0eSBiZWluZyBhcHBsaWVkIGluIHN0 YXRlIGluc3RlYWQgb2YgaW5kaXZpZHVhbCBwcmlvcml0eSB2YWx1ZXMuCisKKyAgICAgICAgKFdl YkNvcmU6OlN0eWxlOjpCdWlsZGVyOjphcHBseVByb3BlcnR5KToKKyAgICAgICAgKFdlYkNvcmU6 OlN0eWxlOjpCdWlsZGVyOjplbnN1cmVSb2xsYmFja0Nhc2NhZGVGb3JSZXZlcnQpOgorICAgICAg ICAoV2ViQ29yZTo6U3R5bGU6OkJ1aWxkZXI6OmVuc3VyZVJvbGxiYWNrQ2FzY2FkZUZvclJldmVy dExheWVyKToKKworICAgICAgICBJZiB0aGUgY3VycmVudCBwcm9wZXJ0eSBpcyBmcm9tIGF0dHJp YnV0ZSBzdHlsZSBpdCByZXZlcnRzIHRvIHRoZSBzYW1lIGxheWVyLgorCisgICAgICAgICogc3R5 bGUvU3R5bGVCdWlsZGVyLmg6CisgICAgICAgICogc3R5bGUvU3R5bGVCdWlsZGVyU3RhdGUuaDoK KyAgICAgICAgKFdlYkNvcmU6OlN0eWxlOjpCdWlsZGVyU3RhdGU6OnN0eWxlU2NvcGVPcmRpbmFs IGNvbnN0KToKKwogMjAyMS0xMi0xNCAgQmVuIE5oYW0gIDxuaGFtQGFwcGxlLmNvbT4KIAogICAg ICAgICBBZGQgd2ViIHB1c2ggbWVzc2FnZSBkZWNyeXB0aW9uIHJvdXRpbmVzCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9Qcm9wZXJ0eUNhc2NhZGUuY3BwIGIvU291cmNlL1dlYkNv cmUvc3R5bGUvUHJvcGVydHlDYXNjYWRlLmNwcAppbmRleCBkYWJkYTYwODc4YmEwYzA1NzdmMWQ0 ZWJlY2E1YzI0YzM1MTg5NjdlLi45ZTliMjliN2M0NTQ0ODYxNTJlZWEzYWVlOGM3NmRlZDdhZDc4 MTBlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9Qcm9wZXJ0eUNhc2NhZGUuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1Byb3BlcnR5Q2FzY2FkZS5jcHAKQEAgLTI2LDYg KzI2LDcgQEAKICNpbmNsdWRlICJjb25maWcuaCIKICNpbmNsdWRlICJQcm9wZXJ0eUNhc2NhZGUu aCIKIAorI2luY2x1ZGUgIkNTU0N1c3RvbVByb3BlcnR5VmFsdWUuaCIKICNpbmNsdWRlICJDU1NQ YWludEltYWdlVmFsdWUuaCIKICNpbmNsdWRlICJDU1NQcmltaXRpdmVWYWx1ZU1hcHBpbmdzLmgi CiAjaW5jbHVkZSAiQ1NTVmFsdWVQb29sLmgiCkBAIC04MCwxMSArODEsMTEgQEAgUHJvcGVydHlD YXNjYWRlOjpQcm9wZXJ0eUNhc2NhZGUoY29uc3QgTWF0Y2hSZXN1bHQmIG1hdGNoUmVzdWx0LCBD YXNjYWRlTGV2ZWwgbWEKICAgICBidWlsZENhc2NhZGUoKTsKIH0KIAotUHJvcGVydHlDYXNjYWRl OjpQcm9wZXJ0eUNhc2NhZGUoY29uc3QgUHJvcGVydHlDYXNjYWRlJiBwYXJlbnQsIENhc2NhZGVM ZXZlbCBtYXhpbXVtQ2FzY2FkZUxldmVsLCBDYXNjYWRlTGF5ZXJQcmlvcml0eSBtYXhpbXVtQ2Fz Y2FkZUxheWVyUHJpb3JpdHkpCitQcm9wZXJ0eUNhc2NhZGU6OlByb3BlcnR5Q2FzY2FkZShjb25z dCBQcm9wZXJ0eUNhc2NhZGUmIHBhcmVudCwgQ2FzY2FkZUxldmVsIG1heGltdW1DYXNjYWRlTGV2 ZWwsIHN0ZDo6b3B0aW9uYWw8Q2FzY2FkZUxheWVyUHJpb3JpdHk+IG1heGltdW1DYXNjYWRlTGF5 ZXJQcmlvcml0eUZvclJvbGxiYWNrKQogICAgIDogbV9tYXRjaFJlc3VsdChwYXJlbnQubV9tYXRj aFJlc3VsdCkKICAgICAsIG1faW5jbHVkZWRQcm9wZXJ0aWVzKHBhcmVudC5tX2luY2x1ZGVkUHJv cGVydGllcykKICAgICAsIG1fbWF4aW11bUNhc2NhZGVMZXZlbChtYXhpbXVtQ2FzY2FkZUxldmVs KQotICAgICwgbV9tYXhpbXVtQ2FzY2FkZUxheWVyUHJpb3JpdHkobWF4aW11bUNhc2NhZGVMYXll clByaW9yaXR5KQorICAgICwgbV9tYXhpbXVtQ2FzY2FkZUxheWVyUHJpb3JpdHlGb3JSb2xsYmFj ayhtYXhpbXVtQ2FzY2FkZUxheWVyUHJpb3JpdHlGb3JSb2xsYmFjaykKICAgICAsIG1fZGlyZWN0 aW9uKHBhcmVudC5kaXJlY3Rpb24oKSkKICAgICAsIG1fZGlyZWN0aW9uSXNVbnJlc29sdmVkKGZh bHNlKQogewpAQCAtMTE2LDkgKzExNywxMCBAQCB2b2lkIFByb3BlcnR5Q2FzY2FkZTo6c2V0UHJv cGVydHlJbnRlcm5hbChQcm9wZXJ0eSYgcHJvcGVydHksIENTU1Byb3BlcnR5SUQgaWQsCiB7CiAg ICAgQVNTRVJUKG1hdGNoZWRQcm9wZXJ0aWVzLmxpbmtNYXRjaFR5cGUgPD0gU2VsZWN0b3JDaGVj a2VyOjpNYXRjaEFsbCk7CiAgICAgcHJvcGVydHkuaWQgPSBpZDsKLSAgICBwcm9wZXJ0eS5sZXZl bCA9IGNhc2NhZGVMZXZlbDsKKyAgICBwcm9wZXJ0eS5jYXNjYWRlTGV2ZWwgPSBjYXNjYWRlTGV2 ZWw7CiAgICAgcHJvcGVydHkuc3R5bGVTY29wZU9yZGluYWwgPSBtYXRjaGVkUHJvcGVydGllcy5z dHlsZVNjb3BlT3JkaW5hbDsKICAgICBwcm9wZXJ0eS5jYXNjYWRlTGF5ZXJQcmlvcml0eSA9IG1h dGNoZWRQcm9wZXJ0aWVzLmNhc2NhZGVMYXllclByaW9yaXR5OworICAgIHByb3BlcnR5LmZyb21T dHlsZUF0dHJpYnV0ZSA9IG1hdGNoZWRQcm9wZXJ0aWVzLmZyb21TdHlsZUF0dHJpYnV0ZTsKIAog ICAgIGlmIChtYXRjaGVkUHJvcGVydGllcy5saW5rTWF0Y2hUeXBlID09IFNlbGVjdG9yQ2hlY2tl cjo6TWF0Y2hBbGwpIHsKICAgICAgICAgcHJvcGVydHkuY3NzVmFsdWVbMF0gPSAmY3NzVmFsdWU7 CkBAIC0xNzcsNyArMTc5LDE4IEBAIHZvaWQgUHJvcGVydHlDYXNjYWRlOjpzZXREZWZlcnJlZChD U1NQcm9wZXJ0eUlEIGlkLCBDU1NWYWx1ZSYgY3NzVmFsdWUsIGNvbnN0IE1hCiAKIGJvb2wgUHJv cGVydHlDYXNjYWRlOjphZGRNYXRjaChjb25zdCBNYXRjaGVkUHJvcGVydGllcyYgbWF0Y2hlZFBy b3BlcnRpZXMsIENhc2NhZGVMZXZlbCBjYXNjYWRlTGV2ZWwsIGJvb2wgaW1wb3J0YW50KQogewot ICAgIGlmIChtYXRjaGVkUHJvcGVydGllcy5jYXNjYWRlTGF5ZXJQcmlvcml0eSA+IG1fbWF4aW11 bUNhc2NhZGVMYXllclByaW9yaXR5ICYmIGNhc2NhZGVMZXZlbCA9PSBtX21heGltdW1DYXNjYWRl TGV2ZWwgJiYgbWF0Y2hlZFByb3BlcnRpZXMuc3R5bGVTY29wZU9yZGluYWwgPT0gU2NvcGVPcmRp bmFsOjpFbGVtZW50KQorICAgIGF1dG8gc2tpcEZvclJvbGxiYWNrID0gWyZdIHsKKyAgICAgICAg aWYgKCFtX21heGltdW1DYXNjYWRlTGF5ZXJQcmlvcml0eUZvclJvbGxiYWNrKQorICAgICAgICAg ICAgcmV0dXJuIGZhbHNlOworICAgICAgICBpZiAobWF0Y2hlZFByb3BlcnRpZXMuc3R5bGVTY29w ZU9yZGluYWwgIT0gU2NvcGVPcmRpbmFsOjpFbGVtZW50KQorICAgICAgICAgICAgcmV0dXJuIGZh bHNlOworICAgICAgICBpZiAoY2FzY2FkZUxldmVsIDwgbV9tYXhpbXVtQ2FzY2FkZUxldmVsKQor ICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICBpZiAobWF0Y2hlZFByb3BlcnRpZXMu ZnJvbVN0eWxlQXR0cmlidXRlID09IEZyb21TdHlsZUF0dHJpYnV0ZTo6WWVzKQorICAgICAgICAg ICAgcmV0dXJuIHRydWU7CisgICAgICAgIHJldHVybiBtYXRjaGVkUHJvcGVydGllcy5jYXNjYWRl TGF5ZXJQcmlvcml0eSA+ICptX21heGltdW1DYXNjYWRlTGF5ZXJQcmlvcml0eUZvclJvbGxiYWNr OworICAgIH07CisgICAgaWYgKHNraXBGb3JSb2xsYmFjaygpKQogICAgICAgICByZXR1cm4gZmFs c2U7CiAKICAgICBhdXRvJiBzdHlsZVByb3BlcnRpZXMgPSAqbWF0Y2hlZFByb3BlcnRpZXMucHJv cGVydGllczsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1Byb3BlcnR5Q2FzY2Fk ZS5oIGIvU291cmNlL1dlYkNvcmUvc3R5bGUvUHJvcGVydHlDYXNjYWRlLmgKaW5kZXggNTFkMjE3 NjFjNzUwMzNjYTMzNmM2N2ZhODk5NTg3YWEwMjY1OTVkZi4uNTA2NGY3ODFiMzRlNzA2NTg0MDEz MDI1ZjhiOTVlYzY4MWE3Njg0YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvc3R5bGUvUHJv cGVydHlDYXNjYWRlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvc3R5bGUvUHJvcGVydHlDYXNjYWRl LmgKQEAgLTI3LDcgKzI3LDYgQEAKIAogI2luY2x1ZGUgIkNhc2NhZGVMZXZlbC5oIgogI2luY2x1 ZGUgIk1hdGNoUmVzdWx0LmgiCi0jaW5jbHVkZSAiU3R5bGVCdWlsZGVyU3RhdGUuaCIKICNpbmNs dWRlIDxiaXRzZXQ+CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKQEAgLTQ3LDE1ICs0NiwxNiBAQCBw dWJsaWM6CiAgICAgfTsKIAogICAgIFByb3BlcnR5Q2FzY2FkZShjb25zdCBNYXRjaFJlc3VsdCYs IENhc2NhZGVMZXZlbCwgSW5jbHVkZWRQcm9wZXJ0aWVzLCBEaXJlY3Rpb24pOwotICAgIFByb3Bl cnR5Q2FzY2FkZShjb25zdCBQcm9wZXJ0eUNhc2NhZGUmLCBDYXNjYWRlTGV2ZWwsIENhc2NhZGVM YXllclByaW9yaXR5IG1heGltdW1DYXNjYWRlTGF5ZXJQcmlvcml0eSA9IFJ1bGVTZXQ6OmNhc2Nh ZGVMYXllclByaW9yaXR5Rm9yVW5sYXllcmVkKTsKKyAgICBQcm9wZXJ0eUNhc2NhZGUoY29uc3Qg UHJvcGVydHlDYXNjYWRlJiwgQ2FzY2FkZUxldmVsLCBzdGQ6Om9wdGlvbmFsPENhc2NhZGVMYXll clByaW9yaXR5PiBtYXhpbXVtQ2FzY2FkZUxheWVyUHJpb3JpdHlGb3JSb2xsYmFjayA9IHsgfSk7 CiAKICAgICB+UHJvcGVydHlDYXNjYWRlKCk7CiAKICAgICBzdHJ1Y3QgUHJvcGVydHkgewogICAg ICAgICBDU1NQcm9wZXJ0eUlEIGlkOwotICAgICAgICBDYXNjYWRlTGV2ZWwgbGV2ZWw7CisgICAg ICAgIENhc2NhZGVMZXZlbCBjYXNjYWRlTGV2ZWw7CiAgICAgICAgIFNjb3BlT3JkaW5hbCBzdHls ZVNjb3BlT3JkaW5hbDsKICAgICAgICAgQ2FzY2FkZUxheWVyUHJpb3JpdHkgY2FzY2FkZUxheWVy UHJpb3JpdHk7CisgICAgICAgIEZyb21TdHlsZUF0dHJpYnV0ZSBmcm9tU3R5bGVBdHRyaWJ1dGU7 CiAgICAgICAgIENTU1ZhbHVlKiBjc3NWYWx1ZVszXTsgLy8gVmFsdWVzIGZvciBsaW5rIG1hdGNo IHN0YXRlcyBNYXRjaERlZmF1bHQsIE1hdGNoTGluayBhbmQgTWF0Y2hWaXNpdGVkCiAgICAgfTsK IApAQCAtNzAsOSArNzAsNiBAQCBwdWJsaWM6CiAKICAgICBEaXJlY3Rpb24gZGlyZWN0aW9uKCkg Y29uc3Q7CiAKLSAgICBhdXRvIG1heGltdW1DYXNjYWRlTGV2ZWwoKSBjb25zdCB7IHJldHVybiBt X21heGltdW1DYXNjYWRlTGV2ZWw7IH0KLSAgICBhdXRvIG1heGltdW1DYXNjYWRlTGF5ZXJQcmlv cml0eSgpIGNvbnN0IHsgcmV0dXJuIG1fbWF4aW11bUNhc2NhZGVMYXllclByaW9yaXR5OyB9Ci0K IHByaXZhdGU6CiAgICAgdm9pZCBidWlsZENhc2NhZGUoKTsKICAgICBib29sIGFkZE5vcm1hbE1h dGNoZXMoQ2FzY2FkZUxldmVsKTsKQEAgLTg4LDcgKzg1LDcgQEAgcHJpdmF0ZToKICAgICBjb25z dCBNYXRjaFJlc3VsdCYgbV9tYXRjaFJlc3VsdDsKICAgICBjb25zdCBJbmNsdWRlZFByb3BlcnRp ZXMgbV9pbmNsdWRlZFByb3BlcnRpZXM7CiAgICAgY29uc3QgQ2FzY2FkZUxldmVsIG1fbWF4aW11 bUNhc2NhZGVMZXZlbDsKLSAgICBjb25zdCBDYXNjYWRlTGF5ZXJQcmlvcml0eSBtX21heGltdW1D YXNjYWRlTGF5ZXJQcmlvcml0eSB7IFJ1bGVTZXQ6OmNhc2NhZGVMYXllclByaW9yaXR5Rm9yVW5s YXllcmVkIH07CisgICAgY29uc3Qgc3RkOjpvcHRpb25hbDxDYXNjYWRlTGF5ZXJQcmlvcml0eT4g bV9tYXhpbXVtQ2FzY2FkZUxheWVyUHJpb3JpdHlGb3JSb2xsYmFjazsKICAgICBtdXRhYmxlIERp cmVjdGlvbiBtX2RpcmVjdGlvbjsKICAgICBtdXRhYmxlIGJvb2wgbV9kaXJlY3Rpb25Jc1VucmVz b2x2ZWQgeyB0cnVlIH07CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1J1bGVT ZXQuaCBiL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1J1bGVTZXQuaAppbmRleCBmODEyNjdlOWVhYmU0 ODhlOWJkMjAwNTNlNDQ2YmQ5Yzg1MjBjZWVjLi4zNDYxMjFlNGRiNmIwMzE0ZDZhZGVmODVlODYw ODczZTFjM2MxMTVjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9SdWxlU2V0LmgK KysrIGIvU291cmNlL1dlYkNvcmUvc3R5bGUvUnVsZVNldC5oCkBAIC0xMDYsNiArMTA2LDcgQEAg cHVibGljOgogICAgIGJvb2wgaGFzSG9zdFBzZXVkb0NsYXNzUnVsZXNNYXRjaGluZ0luU2hhZG93 VHJlZSgpIGNvbnN0IHsgcmV0dXJuIG1faGFzSG9zdFBzZXVkb0NsYXNzUnVsZXNNYXRjaGluZ0lu U2hhZG93VHJlZTsgfQogCiAgICAgc3RhdGljIGNvbnN0ZXhwciBhdXRvIGNhc2NhZGVMYXllclBy aW9yaXR5Rm9yVW5sYXllcmVkID0gc3RkOjpudW1lcmljX2xpbWl0czxDYXNjYWRlTGF5ZXJQcmlv cml0eT46Om1heCgpOworCiAgICAgQ2FzY2FkZUxheWVyUHJpb3JpdHkgY2FzY2FkZUxheWVyUHJp b3JpdHlGb3IoY29uc3QgUnVsZURhdGEmKSBjb25zdDsKIAogcHJpdmF0ZToKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlQnVpbGRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9z dHlsZS9TdHlsZUJ1aWxkZXIuY3BwCmluZGV4IGM0ZTEwMmI2OGJkZTQ1NTI3NTljYzI3YzZmOTdl Zjc3MjU2MDE3YjMuLmIyMTZiYTJhNGI5M2FhZGJhMGVjMmYzZmViZDcxNjFiMDk1N2Y4ZmMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlQnVpbGRlci5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVCdWlsZGVyLmNwcApAQCAtMTgwLDYgKzE4MCw4IEBAIHZv aWQgQnVpbGRlcjo6YXBwbHlDdXN0b21Qcm9wZXJ0eShjb25zdCBTdHJpbmcmIG5hbWUpCiAgICAg YXV0byBwcm9wZXJ0eSA9IG1fY2FzY2FkZS5jdXN0b21Qcm9wZXJ0eShuYW1lKTsKICAgICBib29s IGluQ3ljbGUgPSBtX3N0YXRlLm1faW5Qcm9ncmVzc1Byb3BlcnRpZXNDdXN0b20uY29udGFpbnMo bmFtZSk7CiAKKyAgICBTZXRGb3JTY29wZSBsZXZlbFNjb3BlKG1fc3RhdGUubV9jdXJyZW50UHJv cGVydHksICZwcm9wZXJ0eSk7CisKICAgICBmb3IgKGF1dG8gaW5kZXggOiB7IFNlbGVjdG9yQ2hl Y2tlcjo6TWF0Y2hEZWZhdWx0LCBTZWxlY3RvckNoZWNrZXI6Ok1hdGNoTGluaywgU2VsZWN0b3JD aGVja2VyOjpNYXRjaFZpc2l0ZWQgfSkgewogICAgICAgICBpZiAoIXByb3BlcnR5LmNzc1ZhbHVl W2luZGV4XSkKICAgICAgICAgICAgIGNvbnRpbnVlOwpAQCAtMjMzLDkgKzIzNSw3IEBAIHZvaWQg QnVpbGRlcjo6YXBwbHlDdXN0b21Qcm9wZXJ0eShjb25zdCBTdHJpbmcmIG5hbWUpCiAKIGlubGlu ZSB2b2lkIEJ1aWxkZXI6OmFwcGx5Q2FzY2FkZVByb3BlcnR5KGNvbnN0IFByb3BlcnR5Q2FzY2Fk ZTo6UHJvcGVydHkmIHByb3BlcnR5KQogewotICAgIG1fc3RhdGUubV9jYXNjYWRlTGV2ZWwgPSBw cm9wZXJ0eS5sZXZlbDsKLSAgICBtX3N0YXRlLm1fc3R5bGVTY29wZU9yZGluYWwgPSBwcm9wZXJ0 eS5zdHlsZVNjb3BlT3JkaW5hbDsKLSAgICBtX3N0YXRlLm1fY2FzY2FkZUxheWVyUHJpb3JpdHkg PSBwcm9wZXJ0eS5jYXNjYWRlTGF5ZXJQcmlvcml0eTsKKyAgICBTZXRGb3JTY29wZSBsZXZlbFNj b3BlKG1fc3RhdGUubV9jdXJyZW50UHJvcGVydHksICZwcm9wZXJ0eSk7CiAKICAgICBhdXRvIGFw cGx5V2l0aExpbmtNYXRjaCA9IFsmXShTZWxlY3RvckNoZWNrZXI6OkxpbmtNYXRjaE1hc2sgbGlu a01hdGNoKSB7CiAgICAgICAgIGlmIChwcm9wZXJ0eS5jc3NWYWx1ZVtsaW5rTWF0Y2hdKSB7CkBA IC0yNjEsOSArMjYxLDcgQEAgdm9pZCBCdWlsZGVyOjphcHBseVJvbGxiYWNrQ2FzY2FkZVByb3Bl cnR5KGNvbnN0IFByb3BlcnR5Q2FzY2FkZTo6UHJvcGVydHkmIHByb3AKICAgICBpZiAoIXZhbHVl KQogICAgICAgICByZXR1cm47CiAKLSAgICBTZXRGb3JTY29wZSBsZXZlbFNjb3BlKG1fc3RhdGUu bV9jYXNjYWRlTGV2ZWwsIHByb3BlcnR5LmxldmVsKTsKLSAgICBTZXRGb3JTY29wZSBzY29wZVNj b3BlKG1fc3RhdGUubV9zdHlsZVNjb3BlT3JkaW5hbCwgcHJvcGVydHkuc3R5bGVTY29wZU9yZGlu YWwpOwotICAgIFNldEZvclNjb3BlIGxheWVyU2NvcGUobV9zdGF0ZS5tX2Nhc2NhZGVMYXllclBy aW9yaXR5LCBwcm9wZXJ0eS5jYXNjYWRlTGF5ZXJQcmlvcml0eSk7CisgICAgU2V0Rm9yU2NvcGUg bGV2ZWxTY29wZShtX3N0YXRlLm1fY3VycmVudFByb3BlcnR5LCAmcHJvcGVydHkpOwogCiAgICAg YXBwbHlQcm9wZXJ0eShwcm9wZXJ0eS5pZCwgKnZhbHVlLCBsaW5rTWF0Y2hNYXNrKTsKIH0KQEAg LTMwMiw5ICszMDAsNyBAQCB2b2lkIEJ1aWxkZXI6OmFwcGx5UHJvcGVydHkoQ1NTUHJvcGVydHlJ RCBpZCwgQ1NTVmFsdWUmIHZhbHVlLCBTZWxlY3RvckNoZWNrZXI6OgogICAgIGJvb2wgaXNSZXZl cnRMYXllciA9IHZhbHVlVG9BcHBseS0+aXNSZXZlcnRMYXllclZhbHVlKCkgfHwgY3VzdG9tUHJv cGVydHlWYWx1ZUlEID09IENTU1ZhbHVlUmV2ZXJ0TGF5ZXI7CiAKICAgICBpZiAoaXNSZXZlcnQg fHwgaXNSZXZlcnRMYXllcikgewotICAgICAgICBhdXRvKiByb2xsYmFja0Nhc2NhZGUgPSBpc1Jl dmVydAotICAgICAgICAgICAgPyBlbnN1cmVSb2xsYmFja0Nhc2NhZGVGb3JSZXZlcnQobV9zdGF0 ZS5tX2Nhc2NhZGVMZXZlbCkKLSAgICAgICAgICAgIDogZW5zdXJlUm9sbGJhY2tDYXNjYWRlRm9y UmV2ZXJ0TGF5ZXIobV9zdGF0ZS5tX2Nhc2NhZGVMZXZlbCwgbV9zdGF0ZS5tX2Nhc2NhZGVMYXll clByaW9yaXR5KTsKKyAgICAgICAgYXV0byogcm9sbGJhY2tDYXNjYWRlID0gaXNSZXZlcnQgPyBl bnN1cmVSb2xsYmFja0Nhc2NhZGVGb3JSZXZlcnQoKSA6IGVuc3VyZVJvbGxiYWNrQ2FzY2FkZUZv clJldmVydExheWVyKCk7CiAKICAgICAgICAgaWYgKHJvbGxiYWNrQ2FzY2FkZSkgewogICAgICAg ICAgICAgLy8gV2l0aCB0aGUgcm9sbGJhY2sgY2FzY2FkZSBidWlsdCwgd2UgbmVlZCB0byBvYnRh aW4gdGhlIHByb3BlcnR5IGFuZCBhcHBseSBpdC4gSWYgdGhlIHByb3BlcnR5IGlzCkBAIC0zNzks MjkgKzM3NSwzNiBAQCBSZWZQdHI8Q1NTVmFsdWU+IEJ1aWxkZXI6OnJlc29sdmVkVmFyaWFibGVW YWx1ZShDU1NQcm9wZXJ0eUlEIHByb3BlcnR5SUQsIGNvbnN0CiAgICAgcmV0dXJuIENTU1BhcnNl cihtX3N0YXRlLmRvY3VtZW50KCkpLnBhcnNlVmFsdWVXaXRoVmFyaWFibGVSZWZlcmVuY2VzKHBy b3BlcnR5SUQsIHZhbHVlLCBtX3N0YXRlKTsKIH0KIAotY29uc3QgUHJvcGVydHlDYXNjYWRlKiBC dWlsZGVyOjplbnN1cmVSb2xsYmFja0Nhc2NhZGVGb3JSZXZlcnQoQ2FzY2FkZUxldmVsIHJvbGxi YWNrQ2FzY2FkZUxldmVsKQorY29uc3QgUHJvcGVydHlDYXNjYWRlKiBCdWlsZGVyOjplbnN1cmVS b2xsYmFja0Nhc2NhZGVGb3JSZXZlcnQoKQogeworICAgIGF1dG8gcm9sbGJhY2tDYXNjYWRlTGV2 ZWwgPSBtX3N0YXRlLm1fY3VycmVudFByb3BlcnR5LT5jYXNjYWRlTGV2ZWw7CiAgICAgaWYgKHJv bGxiYWNrQ2FzY2FkZUxldmVsID09IENhc2NhZGVMZXZlbDo6VXNlckFnZW50KQogICAgICAgICBy ZXR1cm4gbnVsbHB0cjsKIAogICAgIC0tcm9sbGJhY2tDYXNjYWRlTGV2ZWw7CiAKLSAgICBhdXRv IGtleSA9IG1ha2VSb2xsYmFja0Nhc2NhZGVLZXkocm9sbGJhY2tDYXNjYWRlTGV2ZWwsIFJ1bGVT ZXQ6OmNhc2NhZGVMYXllclByaW9yaXR5Rm9yVW5sYXllcmVkKTsKKyAgICBhdXRvIGtleSA9IG1h a2VSb2xsYmFja0Nhc2NhZGVLZXkocm9sbGJhY2tDYXNjYWRlTGV2ZWwsIDApOwogICAgIHJldHVy biBtX3JvbGxiYWNrQ2FzY2FkZXMuZW5zdXJlKGtleSwgWyZdIHsKLSAgICAgICAgcmV0dXJuIG1h a2VVbmlxdWU8Y29uc3QgUHJvcGVydHlDYXNjYWRlPihtX2Nhc2NhZGUsIHJvbGxiYWNrQ2FzY2Fk ZUxldmVsLCBSdWxlU2V0OjpjYXNjYWRlTGF5ZXJQcmlvcml0eUZvclVubGF5ZXJlZCk7CisgICAg ICAgIHJldHVybiBtYWtlVW5pcXVlPGNvbnN0IFByb3BlcnR5Q2FzY2FkZT4obV9jYXNjYWRlLCBy b2xsYmFja0Nhc2NhZGVMZXZlbCk7CiAgICAgfSkuaXRlcmF0b3ItPnZhbHVlLmdldCgpOwogfQog Ci1jb25zdCBQcm9wZXJ0eUNhc2NhZGUqIEJ1aWxkZXI6OmVuc3VyZVJvbGxiYWNrQ2FzY2FkZUZv clJldmVydExheWVyKENhc2NhZGVMZXZlbCBjYXNjYWRlTGV2ZWwsIENhc2NhZGVMYXllclByaW9y aXR5IHJvbGxiYWNrTGF5ZXJQcmlvcml0eSkKK2NvbnN0IFByb3BlcnR5Q2FzY2FkZSogQnVpbGRl cjo6ZW5zdXJlUm9sbGJhY2tDYXNjYWRlRm9yUmV2ZXJ0TGF5ZXIoKQogeworICAgIGF1dG8mIHBy b3BlcnR5ID0gKm1fc3RhdGUubV9jdXJyZW50UHJvcGVydHk7CisgICAgYXV0byByb2xsYmFja0xh eWVyUHJpb3JpdHkgPSBwcm9wZXJ0eS5jYXNjYWRlTGF5ZXJQcmlvcml0eTsKICAgICBpZiAoIXJv bGxiYWNrTGF5ZXJQcmlvcml0eSkKICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAKLSAgICAtLXJv bGxiYWNrTGF5ZXJQcmlvcml0eTsKKyAgICBBU1NFUlQocHJvcGVydHkuZnJvbVN0eWxlQXR0cmli dXRlID09IEZyb21TdHlsZUF0dHJpYnV0ZTo6Tm8gfHwgcHJvcGVydHkuY2FzY2FkZUxheWVyUHJp b3JpdHkgPT0gUnVsZVNldDo6Y2FzY2FkZUxheWVyUHJpb3JpdHlGb3JVbmxheWVyZWQpOworCisg ICAgLy8gU3R5bGUgYXR0cmlidXRlIHJldmVydHMgdG8gdGhlIHJlZ3VsYXIgYXV0aG9yIHN0eWxl LgorICAgIGlmIChwcm9wZXJ0eS5mcm9tU3R5bGVBdHRyaWJ1dGUgPT0gRnJvbVN0eWxlQXR0cmli dXRlOjpObykKKyAgICAgICAgLS1yb2xsYmFja0xheWVyUHJpb3JpdHk7CiAKLSAgICBhdXRvIGtl eSA9IG1ha2VSb2xsYmFja0Nhc2NhZGVLZXkoY2FzY2FkZUxldmVsLCByb2xsYmFja0xheWVyUHJp b3JpdHkpOworICAgIGF1dG8ga2V5ID0gbWFrZVJvbGxiYWNrQ2FzY2FkZUtleShwcm9wZXJ0eS5j YXNjYWRlTGV2ZWwsIHJvbGxiYWNrTGF5ZXJQcmlvcml0eSk7CiAgICAgcmV0dXJuIG1fcm9sbGJh Y2tDYXNjYWRlcy5lbnN1cmUoa2V5LCBbJl0gewotICAgICAgICByZXR1cm4gbWFrZVVuaXF1ZTxj b25zdCBQcm9wZXJ0eUNhc2NhZGU+KG1fY2FzY2FkZSwgY2FzY2FkZUxldmVsLCByb2xsYmFja0xh eWVyUHJpb3JpdHkpOworICAgICAgICByZXR1cm4gbWFrZVVuaXF1ZTxjb25zdCBQcm9wZXJ0eUNh c2NhZGU+KG1fY2FzY2FkZSwgcHJvcGVydHkuY2FzY2FkZUxldmVsLCByb2xsYmFja0xheWVyUHJp b3JpdHkpOwogICAgIH0pLml0ZXJhdG9yLT52YWx1ZS5nZXQoKTsKIH0KIApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVCdWlsZGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9zdHls ZS9TdHlsZUJ1aWxkZXIuaAppbmRleCA3OTUyYWFlNDMzYmY0NjhlOTEzNjcyMTUyYmE4Mjg4YThk ZmYwOWNjLi42MzI1ZjNiZjdmODFjMjYyMjIwN2VlMDIxODc5NDgzYmE2NzNkNmJlIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZUJ1aWxkZXIuaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9zdHlsZS9TdHlsZUJ1aWxkZXIuaApAQCAtNjIsOCArNjIsOCBAQCBwcml2YXRlOgogICAg IFJlZjxDU1NWYWx1ZT4gcmVzb2x2ZVZhbHVlKENTU1Byb3BlcnR5SUQsIENTU1ZhbHVlJik7CiAg ICAgUmVmUHRyPENTU1ZhbHVlPiByZXNvbHZlZFZhcmlhYmxlVmFsdWUoQ1NTUHJvcGVydHlJRCwg Y29uc3QgQ1NTVmFsdWUmKTsKIAotICAgIGNvbnN0IFByb3BlcnR5Q2FzY2FkZSogZW5zdXJlUm9s bGJhY2tDYXNjYWRlRm9yUmV2ZXJ0KENhc2NhZGVMZXZlbCk7Ci0gICAgY29uc3QgUHJvcGVydHlD YXNjYWRlKiBlbnN1cmVSb2xsYmFja0Nhc2NhZGVGb3JSZXZlcnRMYXllcihDYXNjYWRlTGV2ZWws IENhc2NhZGVMYXllclByaW9yaXR5KTsKKyAgICBjb25zdCBQcm9wZXJ0eUNhc2NhZGUqIGVuc3Vy ZVJvbGxiYWNrQ2FzY2FkZUZvclJldmVydCgpOworICAgIGNvbnN0IFByb3BlcnR5Q2FzY2FkZSog ZW5zdXJlUm9sbGJhY2tDYXNjYWRlRm9yUmV2ZXJ0TGF5ZXIoKTsKIAogICAgIHVzaW5nIFJvbGxi YWNrQ2FzY2FkZUtleSA9IHN0ZDo6cGFpcjx1bnNpZ25lZCwgdW5zaWduZWQ+OwogICAgIFJvbGxi YWNrQ2FzY2FkZUtleSBtYWtlUm9sbGJhY2tDYXNjYWRlS2V5KENhc2NhZGVMZXZlbCwgQ2FzY2Fk ZUxheWVyUHJpb3JpdHkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVC dWlsZGVyU3RhdGUuaCBiL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlQnVpbGRlclN0YXRlLmgK aW5kZXggYzUxZjJhZWFkNDdhYTRiNmRjYzk5ZTEwNzYwMzVjNDY3OWIyYTM3MC4uY2MxNDYzMWEx MzU1NTkzMzc5MmJjOGYwMWU4NTNjZDMxNDhhYjllNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvc3R5bGUvU3R5bGVCdWlsZGVyU3RhdGUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9T dHlsZUJ1aWxkZXJTdGF0ZS5oCkBAIC0yOCw2ICsyOCw3IEBACiAjaW5jbHVkZSAiQ1NTVG9MZW5n dGhDb252ZXJzaW9uRGF0YS5oIgogI2luY2x1ZGUgIkNTU1RvU3R5bGVNYXAuaCIKICNpbmNsdWRl ICJDYXNjYWRlTGV2ZWwuaCIKKyNpbmNsdWRlICJQcm9wZXJ0eUNhc2NhZGUuaCIKICNpbmNsdWRl ICJSZW5kZXJTdHlsZS5oIgogI2luY2x1ZGUgIlJ1bGVTZXQuaCIKICNpbmNsdWRlICJTZWxlY3Rv ckNoZWNrZXIuaCIKQEAgLTg5LDcgKzkwLDcgQEAgcHVibGljOgogCiAgICAgYm9vbCB1c2VTVkda b29tUnVsZXMoKSBjb25zdDsKICAgICBib29sIHVzZVNWR1pvb21SdWxlc0Zvckxlbmd0aCgpIGNv bnN0OwotICAgIFNjb3BlT3JkaW5hbCBzdHlsZVNjb3BlT3JkaW5hbCgpIGNvbnN0IHsgcmV0dXJu IG1fc3R5bGVTY29wZU9yZGluYWw7IH0KKyAgICBTY29wZU9yZGluYWwgc3R5bGVTY29wZU9yZGlu YWwoKSBjb25zdCB7IHJldHVybiBtX2N1cnJlbnRQcm9wZXJ0eS0+c3R5bGVTY29wZU9yZGluYWw7 IH0KIAogICAgIFJlZjxDU1NWYWx1ZT4gcmVzb2x2ZUltYWdlU3R5bGVzKENTU1ZhbHVlJik7CiAg ICAgUmVmUHRyPFN0eWxlSW1hZ2U+IGNyZWF0ZVN0eWxlSW1hZ2UoQ1NTVmFsdWUmKTsKQEAgLTEz NSw5ICsxMzYsNyBAQCBwcml2YXRlOgogICAgIEJpdG1hcDxudW1DU1NQcm9wZXJ0aWVzPiBtX2lu UHJvZ3Jlc3NQcm9wZXJ0aWVzOwogICAgIEhhc2hTZXQ8U3RyaW5nPiBtX2luUHJvZ3Jlc3NQcm9w ZXJ0aWVzQ3VzdG9tOwogCi0gICAgQ2FzY2FkZUxldmVsIG1fY2FzY2FkZUxldmVsIHsgQ2FzY2Fk ZUxldmVsOjpBdXRob3IgfTsKLSAgICBTY29wZU9yZGluYWwgbV9zdHlsZVNjb3BlT3JkaW5hbCB7 IH07Ci0gICAgQ2FzY2FkZUxheWVyUHJpb3JpdHkgbV9jYXNjYWRlTGF5ZXJQcmlvcml0eSB7IH07 CisgICAgY29uc3QgUHJvcGVydHlDYXNjYWRlOjpQcm9wZXJ0eSogbV9jdXJyZW50UHJvcGVydHkg eyBudWxscHRyIH07CiAgICAgU2VsZWN0b3JDaGVja2VyOjpMaW5rTWF0Y2hNYXNrIG1fbGlua01h dGNoIHsgfTsKIAogICAgIGJvb2wgbV9mb250RGlydHkgeyBmYWxzZSB9OwpkaWZmIC0tZ2l0IGEv TGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IGQ5ZjI5 ZDRiZTAyNThmMWJiOTNiMWU0NThkYjI4ZDM3ZTZhMzdiZmMuLjAwMmZjMjJhYTVhODI1MTJhMzYy ZGI0NmUwOGQwODZkMTk0MzBkNzcgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZwor KysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMiBAQAorMjAyMS0xMi0wOSAg QW50dGkgS29pdmlzdG8gIDxhbnR0aUBhcHBsZS5jb20+CisKKyAgICAgICAgW0NTUyBDYXNjYWRl IExheWVyc10gcmV2ZXJ0LWxheWVyIHNob3VsZCByZXZlcnQgc3R5bGUgYXR0cmlidXRlIHRvIHJl Z3VsYXIgYXV0aG9yIHN0eWxlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0yMzQwODIKKworICAgICAgICBSZXZpZXdlZCBieSBTaW1vbiBGcmFzZXIuCisK KyAgICAgICAgKiBUZXN0RXhwZWN0YXRpb25zOgorCiAyMDIxLTEyLTEzICBKb2huIFdpbGFuZGVy ICA8d2lsYW5kZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFBDTTogUmVtb3ZlIG9sZCBEQiB1cGRh dGUgYW5kIG1pZ3JhdGlvbiBjb2RlLCBhbmQgYWRkIGEgdW5pdCB0ZXN0IGZvciBkZXN0aW5hdGlv biB0b2tlbiBEQiBjb2x1bW5zCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRp b25zIGIvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwppbmRleCBmZDY4OGM4YmMyZjA0YTJl ZWNkZGQzMjk3MGNhN2RhODE1YThkOWQ3Li4zMzM0ZDIxYWMxNDJmMzJkYjdjZGY1OWYyMmYyYzJm NWUzMzBiMTg1IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCisrKyBi L0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKQEAgLTIxODEsMTAgKzIxODEsOCBAQCB3ZWJr aXQub3JnL2IvMTQ4NjUwIGZhc3QvcmVwYWludC9hZGQtdGFibGUtb3ZlcnBhaW50Lmh0bWwgWyBQ YXNzIEZhaWx1cmUgXQogCiBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mt Y2FzY2FkZS9pbXBvcnRhbnQtcHJvcC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQu b3JnL2IvMTg3MDkzIFsgRGVidWcgXSBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nz cy9jc3MtY2FzY2FkZS9hbGwtcHJvcC1pbml0aWFsLXhtbC5odG1sIFsgU2tpcCBdCi13ZWJraXQu b3JnL2IvMjMzOTM3IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1jYXNj YWRlL3JldmVydC1sYXllci0wMDkuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9y Zy9iLzIzMzkzNyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtY2FzY2Fk ZS9yZXZlcnQtbGF5ZXItMDEwLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcv Yi8yMzM5MzcgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWNhc2NhZGUv cmV2ZXJ0LWxheWVyLTAxMS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2Iv MjMzOTM3IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1jYXNjYWRlL3Jl dmVydC1sYXllci0wMTIuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogCiB3ZWJraXQub3JnL2Iv MTQ4ODAxIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1jb2xvci90NDIy LXJnYmEtb25zY3JlZW4tYi54aHQgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8x NDg4MDEgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWNvbG9yL3Q0MjIt cmdiYS1vbnNjcmVlbi1tdWx0aXBsZS1ib3hlcy1jLnhodCBbIEltYWdlT25seUZhaWx1cmUgXQo=