234289 2021-12-13 20:22:21 -0800 Add _WKContentRuleListAction.redirected and .modifiedHeaders 2021-12-14 12:11:15 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 achristensen achristensen timothy oldest_to_newest 1823890 0 achristensen 2021-12-13 20:22:21 -0800 Add _WKContentRuleListAction.redirected and .modifiedHeaders 1823891 1 447102 achristensen 2021-12-13 20:23:27 -0800 Created attachment 447102 Patch 1824055 2 447143 achristensen 2021-12-14 11:23:42 -0800 Created attachment 447143 Patch 1824070 3 achristensen 2021-12-14 12:11:15 -0800 r287040 447102 2021-12-13 20:23:27 -0800 2021-12-14 11:23:40 -0800 Patch bug-234289-20211213202327.patch text/plain 18317 achristensen U3VidmVyc2lvbiBSZXZpc2lvbjogMjg2ODY4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzE1ZmUxZjhmNDNjODdk MWYwMDdlNzkyY2I0NjIxN2YzMDlmOTgxNy4uYmUxOGFiMmJiNTdmYTVkNDk0ZmMzZGJjYWRkNmU1 MmVkMDk5MmFlYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIxLTEyLTEzICBBbGV4 IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgQWRkIF9X S0NvbnRlbnRSdWxlTGlzdEFjdGlvbi5yZWRpcmVjdGVkIGFuZCAubW9kaWZpZWRIZWFkZXJzCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzQyODkKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGVzZSBpbmZv cm0gdGhlIFVJIHByb2Nlc3MgYWJvdXQgbmV3IGFjdGlvbnMgdGFrZW4gYnkgdGhlIGV4dGVuc2lv bi4KKworICAgICAgICAqIGNvbnRlbnRleHRlbnNpb25zL0NvbnRlbnRFeHRlbnNpb25zQmFja2Vu ZC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDb250ZW50RXh0ZW5zaW9uczo6Q29udGVudEV4dGVu c2lvbnNCYWNrZW5kOjpwcm9jZXNzQ29udGVudFJ1bGVMaXN0c0ZvckxvYWQpOgorICAgICAgICAo V2ViQ29yZTo6Q29udGVudEV4dGVuc2lvbnM6OmFwcGx5UmVzdWx0c1RvUmVxdWVzdCk6CisgICAg ICAgICogY29udGVudGV4dGVuc2lvbnMvQ29udGVudFJ1bGVMaXN0UmVzdWx0cy5oOgorICAgICAg ICAoV2ViQ29yZTo6Q29udGVudFJ1bGVMaXN0UmVzdWx0czo6c2hvdWxkTm90aWZ5QXBwbGljYXRp b24gY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6Q29udGVudFJ1bGVMaXN0UmVzdWx0czo6UmVz dWx0OjplbmNvZGUgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6Q29udGVudFJ1bGVMaXN0UmVz dWx0czo6UmVzdWx0OjpkZWNvZGUpOgorICAgICAgICAoV2ViQ29yZTo6Q29udGVudFJ1bGVMaXN0 UmVzdWx0czo6UmVzdWx0OjpzaG91bGROb3RpZnlBcHBsaWNhdGlvbiBjb25zdCk6IERlbGV0ZWQu CisKIDIwMjEtMTItMTAgIEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9y Zz4KIAogICAgICAgICBNb3ZlIGlmLWRvbWFpbiBhbmQgdW5sZXNzLWRvbWFpbiBjb252ZXJzaW9u IHRvIFdLQ29udGVudFJ1bGVMaXN0IHBhcnNpbmcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv Q2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggNTAzY2E1NzE4YWQ4YTE3 ZmIzOTU0NDJiNTFlZTQyYmY2YmNhYTQ5MC4uYTg1ZTdlNTdlZWE5MzI3MTA5MGM1NWZiYTBjMjA2 M2UzMDkwYWVkNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAyMS0xMi0xMyAgQWxleCBD aHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgorCisgICAgICAgIEFkZCBfV0tD b250ZW50UnVsZUxpc3RBY3Rpb24ucmVkaXJlY3RlZCBhbmQgLm1vZGlmaWVkSGVhZGVycworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM0Mjg5CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVSVByb2Nlc3Mv QVBJL0FQSUNvbnRlbnRSdWxlTGlzdEFjdGlvbi5jcHA6CisgICAgICAgIChBUEk6OkNvbnRlbnRS dWxlTGlzdEFjdGlvbjo6cmVkaXJlY3RlZCBjb25zdCk6CisgICAgICAgIChBUEk6OkNvbnRlbnRS dWxlTGlzdEFjdGlvbjo6bW9kaWZpZWRIZWFkZXJzIGNvbnN0KToKKyAgICAgICAgKiBVSVByb2Nl c3MvQVBJL0FQSUNvbnRlbnRSdWxlTGlzdEFjdGlvbi5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9B UEkvQ29jb2EvX1dLQ29udGVudFJ1bGVMaXN0QWN0aW9uLmg6CisgICAgICAgICogVUlQcm9jZXNz L0FQSS9Db2NvYS9fV0tDb250ZW50UnVsZUxpc3RBY3Rpb24ubW06CisgICAgICAgICgtW19XS0Nv bnRlbnRSdWxlTGlzdEFjdGlvbiByZWRpcmVjdGVkXSk6CisgICAgICAgICgtW19XS0NvbnRlbnRS dWxlTGlzdEFjdGlvbiBtb2RpZmllZEhlYWRlcnNdKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dl YkNvcmVTdXBwb3J0L1dlYkNocm9tZUNsaWVudC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkNo cm9tZUNsaWVudDo6Y29udGVudFJ1bGVMaXN0Tm90aWZpY2F0aW9uKToKKwogMjAyMS0xMi0xMCAg QWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgogCiAgICAgICAgIE1v dmUgaWYtZG9tYWluIGFuZCB1bmxlc3MtZG9tYWluIGNvbnZlcnNpb24gdG8gV0tDb250ZW50UnVs ZUxpc3QgcGFyc2luZwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY29udGVudGV4dGVuc2lv bnMvQ29udGVudEV4dGVuc2lvbnNCYWNrZW5kLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2NvbnRlbnRl eHRlbnNpb25zL0NvbnRlbnRFeHRlbnNpb25zQmFja2VuZC5jcHAKaW5kZXggZTc5YzlhMGEzNjc2 NGU1ODE0NDkwZDA4NTAwNTVmMjhlYTdhMmI0Yy4uNmYzY2Q3YTJjNGI4MmY3YTc0NGRjYzA2MGQz MjRkY2EwM2RjMmE1NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY29udGVudGV4dGVuc2lv bnMvQ29udGVudEV4dGVuc2lvbnNCYWNrZW5kLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jb250 ZW50ZXh0ZW5zaW9ucy9Db250ZW50RXh0ZW5zaW9uc0JhY2tlbmQuY3BwCkBAIC0yMjgsMTEgKzIy OCwxNSBAQCBDb250ZW50UnVsZUxpc3RSZXN1bHRzIENvbnRlbnRFeHRlbnNpb25zQmFja2VuZDo6 cHJvY2Vzc0NvbnRlbnRSdWxlTGlzdHNGb3JMb2FkKAogICAgICAgICAgICAgfSwgWyZdKGNvbnN0 IElnbm9yZVByZXZpb3VzUnVsZXNBY3Rpb24mKSB7CiAgICAgICAgICAgICAgICAgUkVMRUFTRV9B U1NFUlRfTk9UX1JFQUNIRUQoKTsKICAgICAgICAgICAgIH0sIFsmXSAoY29uc3QgTW9kaWZ5SGVh ZGVyc0FjdGlvbiYgYWN0aW9uKSB7Ci0gICAgICAgICAgICAgICAgaWYgKGluaXRpYXRpbmdEb2N1 bWVudExvYWRlci5hbGxvd3NBY3RpdmVDb250ZW50UnVsZUxpc3RBY3Rpb25zRm9yVVJMKGNvbnRl bnRSdWxlTGlzdElkZW50aWZpZXIsIHVybCkpCisgICAgICAgICAgICAgICAgaWYgKGluaXRpYXRp bmdEb2N1bWVudExvYWRlci5hbGxvd3NBY3RpdmVDb250ZW50UnVsZUxpc3RBY3Rpb25zRm9yVVJM KGNvbnRlbnRSdWxlTGlzdElkZW50aWZpZXIsIHVybCkpIHsKKyAgICAgICAgICAgICAgICAgICAg cmVzdWx0Lm1vZGlmaWVkSGVhZGVycyA9IHRydWU7CiAgICAgICAgICAgICAgICAgICAgIHJlc3Vs dHMuc3VtbWFyeS5tb2RpZnlIZWFkZXJzQWN0aW9ucy5hcHBlbmQoYWN0aW9uKTsKKyAgICAgICAg ICAgICAgICB9CiAgICAgICAgICAgICB9LCBbJl0gKGNvbnN0IFJlZGlyZWN0QWN0aW9uJiByZWRp cmVjdEFjdGlvbikgewotICAgICAgICAgICAgICAgIGlmIChpbml0aWF0aW5nRG9jdW1lbnRMb2Fk ZXIuYWxsb3dzQWN0aXZlQ29udGVudFJ1bGVMaXN0QWN0aW9uc0ZvclVSTChjb250ZW50UnVsZUxp c3RJZGVudGlmaWVyLCB1cmwpKQorICAgICAgICAgICAgICAgIGlmIChpbml0aWF0aW5nRG9jdW1l bnRMb2FkZXIuYWxsb3dzQWN0aXZlQ29udGVudFJ1bGVMaXN0QWN0aW9uc0ZvclVSTChjb250ZW50 UnVsZUxpc3RJZGVudGlmaWVyLCB1cmwpKSB7CisgICAgICAgICAgICAgICAgICAgIHJlc3VsdC5y ZWRpcmVjdGVkID0gdHJ1ZTsKICAgICAgICAgICAgICAgICAgICAgcmVzdWx0cy5zdW1tYXJ5LnJl ZGlyZWN0QWN0aW9ucy5hcHBlbmQoeyByZWRpcmVjdEFjdGlvbiwgbV9jb250ZW50RXh0ZW5zaW9u cy5nZXQoY29udGVudFJ1bGVMaXN0SWRlbnRpZmllciktPmV4dGVuc2lvbkJhc2VVUkwoKSB9KTsK KyAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICB9KSwgYWN0aW9uLmRhdGEoKSk7CiAgICAg ICAgIH0KIApAQCAtMzMyLDEyICszMzYsOCBAQCB2b2lkIGFwcGx5UmVzdWx0c1RvUmVxdWVzdChD b250ZW50UnVsZUxpc3RSZXN1bHRzJiYgcmVzdWx0cywgUGFnZSogcGFnZSwgUmVzb3VyYwogICAg IGZvciAoYXV0byYgcGFpciA6IHJlc3VsdHMuc3VtbWFyeS5yZWRpcmVjdEFjdGlvbnMpCiAgICAg ICAgIHBhaXIuZmlyc3QuYXBwbHlUb1JlcXVlc3QocmVxdWVzdCwgcGFpci5zZWNvbmQpOwogCi0g ICAgaWYgKHBhZ2UgJiYgcmVzdWx0cy5zaG91bGROb3RpZnlBcHBsaWNhdGlvbigpKSB7Ci0gICAg ICAgIHJlc3VsdHMucmVzdWx0cy5yZW1vdmVBbGxNYXRjaGluZyhbXShjb25zdCBhdXRvJiBwYWly KSB7Ci0gICAgICAgICAgICByZXR1cm4gIXBhaXIuc2Vjb25kLnNob3VsZE5vdGlmeUFwcGxpY2F0 aW9uKCk7Ci0gICAgICAgIH0pOworICAgIGlmIChwYWdlICYmIHJlc3VsdHMuc2hvdWxkTm90aWZ5 QXBwbGljYXRpb24oKSkKICAgICAgICAgcGFnZS0+Y2hyb21lKCkuY2xpZW50KCkuY29udGVudFJ1 bGVMaXN0Tm90aWZpY2F0aW9uKHJlcXVlc3QudXJsKCksIHJlc3VsdHMpOwotICAgIH0KIH0KICAg ICAKIH0gLy8gbmFtZXNwYWNlIENvbnRlbnRFeHRlbnNpb25zCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9jb250ZW50ZXh0ZW5zaW9ucy9Db250ZW50UnVsZUxpc3RSZXN1bHRzLmggYi9Tb3Vy Y2UvV2ViQ29yZS9jb250ZW50ZXh0ZW5zaW9ucy9Db250ZW50UnVsZUxpc3RSZXN1bHRzLmgKaW5k ZXggNGI5MjkyNTg1MDNmNmYwMTkzOGNiZDEyN2Y1OGE1ZDI5NmQ0Mjg0ZC4uNjJiMzllNTkyNzFl Y2Y2YjM0YzQ4MjMyNWEzMjFmMzhiN2E2NWU0ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv Y29udGVudGV4dGVuc2lvbnMvQ29udGVudFJ1bGVMaXN0UmVzdWx0cy5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2NvbnRlbnRleHRlbnNpb25zL0NvbnRlbnRSdWxlTGlzdFJlc3VsdHMuaApAQCAtMzks MTUgKzM5LDkgQEAgc3RydWN0IENvbnRlbnRSdWxlTGlzdFJlc3VsdHMgewogICAgICAgICBib29s IGJsb2NrZWRMb2FkIHsgZmFsc2UgfTsKICAgICAgICAgYm9vbCBtYWRlSFRUUFMgeyBmYWxzZSB9 OwogICAgICAgICBib29sIGJsb2NrZWRDb29raWVzIHsgZmFsc2UgfTsKKyAgICAgICAgYm9vbCBt b2RpZmllZEhlYWRlcnMgeyBmYWxzZSB9OworICAgICAgICBib29sIHJlZGlyZWN0ZWQgeyBmYWxz ZSB9OwogICAgICAgICBWZWN0b3I8U3RyaW5nPiBub3RpZmljYXRpb25zOwotICAgICAgICAKLSAg ICAgICAgYm9vbCBzaG91bGROb3RpZnlBcHBsaWNhdGlvbigpIGNvbnN0Ci0gICAgICAgIHsKLSAg ICAgICAgICAgIHJldHVybiBibG9ja2VkTG9hZAotICAgICAgICAgICAgICAgIHx8IG1hZGVIVFRQ UwotICAgICAgICAgICAgICAgIHx8IGJsb2NrZWRDb29raWVzCi0gICAgICAgICAgICAgICAgfHwg IW5vdGlmaWNhdGlvbnMuaXNFbXB0eSgpOwotICAgICAgICB9CiAKICAgICAgICAgdGVtcGxhdGU8 Y2xhc3MgRW5jb2Rlcj4gdm9pZCBlbmNvZGUoRW5jb2RlciYpIGNvbnN0OwogICAgICAgICB0ZW1w bGF0ZTxjbGFzcyBEZWNvZGVyPiBzdGF0aWMgc3RkOjpvcHRpb25hbDxSZXN1bHQ+IGRlY29kZShE ZWNvZGVyJik7CkBAIC03Myw2ICs2Nyw4IEBAIHN0cnVjdCBDb250ZW50UnVsZUxpc3RSZXN1bHRz IHsKICAgICAgICAgcmV0dXJuIHN1bW1hcnkuYmxvY2tlZExvYWQKICAgICAgICAgICAgIHx8IHN1 bW1hcnkubWFkZUhUVFBTCiAgICAgICAgICAgICB8fCBzdW1tYXJ5LmJsb2NrZWRDb29raWVzCisg ICAgICAgICAgICB8fCAhc3VtbWFyeS5tb2RpZnlIZWFkZXJzQWN0aW9ucy5pc0VtcHR5KCkKKyAg ICAgICAgICAgIHx8ICFzdW1tYXJ5LnJlZGlyZWN0QWN0aW9ucy5pc0VtcHR5KCkKICAgICAgICAg ICAgIHx8IHN1bW1hcnkuaGFzTm90aWZpY2F0aW9uczsKICAgICB9CiAgICAgCkBAIC0xMDUsNiAr MTAxLDggQEAgdGVtcGxhdGU8Y2xhc3MgRW5jb2Rlcj4gdm9pZCBDb250ZW50UnVsZUxpc3RSZXN1 bHRzOjpSZXN1bHQ6OmVuY29kZShFbmNvZGVyJiBlbmMKICAgICBlbmNvZGVyIDw8IGJsb2NrZWRM b2FkOwogICAgIGVuY29kZXIgPDwgbWFkZUhUVFBTOwogICAgIGVuY29kZXIgPDwgYmxvY2tlZENv b2tpZXM7CisgICAgZW5jb2RlciA8PCBtb2RpZmllZEhlYWRlcnM7CisgICAgZW5jb2RlciA8PCBy ZWRpcmVjdGVkOwogICAgIGVuY29kZXIgPDwgbm90aWZpY2F0aW9uczsKIH0KIApAQCAtMTI1LDYg KzEyMywxNiBAQCB0ZW1wbGF0ZTxjbGFzcyBEZWNvZGVyPiBhdXRvIENvbnRlbnRSdWxlTGlzdFJl c3VsdHM6OlJlc3VsdDo6ZGVjb2RlKERlY29kZXImIGRlYwogICAgIGlmICghYmxvY2tlZENvb2tp ZXMpCiAgICAgICAgIHJldHVybiBzdGQ6Om51bGxvcHQ7CiAgICAgCisgICAgc3RkOjpvcHRpb25h bDxib29sPiBtb2RpZmllZEhlYWRlcnM7CisgICAgZGVjb2RlciA+PiBtb2RpZmllZEhlYWRlcnM7 CisgICAgaWYgKCFtb2RpZmllZEhlYWRlcnMpCisgICAgICAgIHJldHVybiBzdGQ6Om51bGxvcHQ7 CisgICAgCisgICAgc3RkOjpvcHRpb25hbDxib29sPiByZWRpcmVjdGVkOworICAgIGRlY29kZXIg Pj4gcmVkaXJlY3RlZDsKKyAgICBpZiAoIXJlZGlyZWN0ZWQpCisgICAgICAgIHJldHVybiBzdGQ6 Om51bGxvcHQ7CisgICAgCiAgICAgc3RkOjpvcHRpb25hbDxWZWN0b3I8U3RyaW5nPj4gbm90aWZp Y2F0aW9uczsKICAgICBkZWNvZGVyID4+IG5vdGlmaWNhdGlvbnM7CiAgICAgaWYgKCFub3RpZmlj YXRpb25zKQpAQCAtMTM0LDYgKzE0Miw4IEBAIHRlbXBsYXRlPGNsYXNzIERlY29kZXI+IGF1dG8g Q29udGVudFJ1bGVMaXN0UmVzdWx0czo6UmVzdWx0OjpkZWNvZGUoRGVjb2RlciYgZGVjCiAgICAg ICAgIFdURk1vdmUoKmJsb2NrZWRMb2FkKSwKICAgICAgICAgV1RGTW92ZSgqbWFkZUhUVFBTKSwK ICAgICAgICAgV1RGTW92ZSgqYmxvY2tlZENvb2tpZXMpLAorICAgICAgICBXVEZNb3ZlKCptb2Rp ZmllZEhlYWRlcnMpLAorICAgICAgICBXVEZNb3ZlKCpyZWRpcmVjdGVkKSwKICAgICAgICAgV1RG TW92ZSgqbm90aWZpY2F0aW9ucykKICAgICB9fTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL0FQSS9BUElDb250ZW50UnVsZUxpc3RBY3Rpb24uY3BwIGIvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvQVBJL0FQSUNvbnRlbnRSdWxlTGlzdEFjdGlvbi5jcHAKaW5kZXggMTU1 OTc2NjMxNjg0YmE4MjM3MGZmN2E5MGZjZTBmMzM3MTJmNDE4MC4uZTEzYTBjN2M4OGRiZGE4MmNm MDEwMzBmOGRjNDM0MjRjMDZiOGJlNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvQVBJL0FQSUNvbnRlbnRSdWxlTGlzdEFjdGlvbi5jcHAKKysrIGIvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvQVBJL0FQSUNvbnRlbnRSdWxlTGlzdEFjdGlvbi5jcHAKQEAgLTU3LDYgKzU3LDE2 IEBAIGJvb2wgQ29udGVudFJ1bGVMaXN0QWN0aW9uOjpibG9ja2VkQ29va2llcygpIGNvbnN0CiAg ICAgcmV0dXJuIG1fcmVzdWx0LmJsb2NrZWRDb29raWVzOwogfQogCitib29sIENvbnRlbnRSdWxl TGlzdEFjdGlvbjo6cmVkaXJlY3RlZCgpIGNvbnN0Cit7CisgICAgcmV0dXJuIG1fcmVzdWx0LnJl ZGlyZWN0ZWQ7Cit9CisKK2Jvb2wgQ29udGVudFJ1bGVMaXN0QWN0aW9uOjptb2RpZmllZEhlYWRl cnMoKSBjb25zdAoreworICAgIHJldHVybiBtX3Jlc3VsdC5tb2RpZmllZEhlYWRlcnM7Cit9CisK IGNvbnN0IFZlY3RvcjxXVEY6OlN0cmluZz4mIENvbnRlbnRSdWxlTGlzdEFjdGlvbjo6bm90aWZp Y2F0aW9ucygpIGNvbnN0CiB7CiAgICAgcmV0dXJuIG1fcmVzdWx0Lm5vdGlmaWNhdGlvbnM7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQVBJQ29udGVudFJ1bGVMaXN0 QWN0aW9uLmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQVBJQ29udGVudFJ1bGVMaXN0 QWN0aW9uLmgKaW5kZXggOWUzOWUwNjlhNGQwNGI4NGE4NWZlNDE0MTMwOWY1MmFmN2M3YmRlYi4u NDc5NDE2ODkwY2U4MWU1MmVkYmQ3YTFiMTlhYWVjYTlhNWQ2OWY5NSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0FQSUNvbnRlbnRSdWxlTGlzdEFjdGlvbi5oCisrKyBi L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9BUElDb250ZW50UnVsZUxpc3RBY3Rpb24uaApA QCAtNDAsNiArNDAsOCBAQCBwdWJsaWM6CiAgICAgYm9vbCBibG9ja2VkTG9hZCgpIGNvbnN0Owog ICAgIGJvb2wgbWFkZUhUVFBTKCkgY29uc3Q7CiAgICAgYm9vbCBibG9ja2VkQ29va2llcygpIGNv bnN0OworICAgIGJvb2wgcmVkaXJlY3RlZCgpIGNvbnN0OworICAgIGJvb2wgbW9kaWZpZWRIZWFk ZXJzKCkgY29uc3Q7CiAgICAgY29uc3QgVmVjdG9yPFdURjo6U3RyaW5nPiYgbm90aWZpY2F0aW9u cygpIGNvbnN0OwogCiBwcml2YXRlOgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvQVBJL0NvY29hL19XS0NvbnRlbnRSdWxlTGlzdEFjdGlvbi5oIGIvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvQVBJL0NvY29hL19XS0NvbnRlbnRSdWxlTGlzdEFjdGlvbi5oCmluZGV4IDg5NDZj Y2FiYjRjMTdlNTI2ODllZmVhZDllNDBjODFmYThlOTlmODEuLmFiYTM1YzU0YzUzNzhlY2I3NDgw ZDRjNzhmYTFlYjQ0ZmQ2ZmU1M2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L0FQSS9Db2NvYS9fV0tDb250ZW50UnVsZUxpc3RBY3Rpb24uaAorKysgYi9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLQ29udGVudFJ1bGVMaXN0QWN0aW9uLmgKQEAgLTMyLDYg KzMyLDggQEAgV0tfQ0xBU1NfQVZBSUxBQkxFKG1hY29zKDEwLjE1KSwgaW9zKDEzLjApKQogQHBy b3BlcnR5IChub25hdG9taWMsIHJlYWRvbmx5KSBCT09MIGJsb2NrZWRMb2FkOwogQHByb3BlcnR5 IChub25hdG9taWMsIHJlYWRvbmx5KSBCT09MIGJsb2NrZWRDb29raWVzOwogQHByb3BlcnR5IChu b25hdG9taWMsIHJlYWRvbmx5KSBCT09MIG1hZGVIVFRQUzsKK0Bwcm9wZXJ0eSAobm9uYXRvbWlj LCByZWFkb25seSkgQk9PTCByZWRpcmVjdGVkIFdLX0FQSV9BVkFJTEFCTEUobWFjb3MoV0tfTUFD X1RCQSksIGlvcyhXS19JT1NfVEJBKSk7CitAcHJvcGVydHkgKG5vbmF0b21pYywgcmVhZG9ubHkp IEJPT0wgbW9kaWZpZWRIZWFkZXJzIFdLX0FQSV9BVkFJTEFCTEUobWFjb3MoV0tfTUFDX1RCQSks IGlvcyhXS19JT1NfVEJBKSk7CiBAcHJvcGVydHkgKG5vbmF0b21pYywgcmVhZG9ubHksIGNvcHkp IE5TQXJyYXk8TlNTdHJpbmcgKj4gKm5vdGlmaWNhdGlvbnM7CiAKIEBlbmQKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tDb250ZW50UnVsZUxpc3RBY3Rp b24ubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLQ29udGVudFJ1bGVM aXN0QWN0aW9uLm1tCmluZGV4IDNkYzM3YWUyNGU1MjVkYTgwNTE4ZjQ5YjU2YWMzYTcyNmY0YmE0 NjIuLmZlZThkMGQyODcxODhmYWVlZDRjMjMxNjg1Y2U0NDc0MzQ0YzcwZTUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tDb250ZW50UnVsZUxpc3RBY3Rp b24ubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL19XS0NvbnRlbnRS dWxlTGlzdEFjdGlvbi5tbQpAQCAtNjgsNiArNjgsMjQgQEAKICNlbmRpZgogfQogCistIChCT09M KXJlZGlyZWN0ZWQKK3sKKyNpZiBFTkFCTEUoQ09OVEVOVF9FWFRFTlNJT05TKQorICAgIHJldHVy biBfYWN0aW9uLT5yZWRpcmVjdGVkKCk7CisjZWxzZQorICAgIHJldHVybiBOTzsKKyNlbmRpZgor fQorCistIChCT09MKW1vZGlmaWVkSGVhZGVycworeworI2lmIEVOQUJMRShDT05URU5UX0VYVEVO U0lPTlMpCisgICAgcmV0dXJuIF9hY3Rpb24tPm1vZGlmaWVkSGVhZGVycygpOworI2Vsc2UKKyAg ICByZXR1cm4gTk87CisjZW5kaWYKK30KKwogLSAoTlNBcnJheTxOU1N0cmluZyAqPiAqKW5vdGlm aWNhdGlvbnMKIHsKICNpZiBFTkFCTEUoQ09OVEVOVF9FWFRFTlNJT05TKQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkNocm9tZUNsaWVudC5j cHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xp ZW50LmNwcAppbmRleCA3ZGEzNzJmMmY2NjhmNzExODY3MGVhZTcyYWFlMDIwOWVkZDk2N2ZkLi4z ZDNiMGRjNjJhY2Q5ZGY4ZTVkYTRiOGUzMGM3MzgyZjUwMjFhNTE2IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50LmNwcAor KysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xp ZW50LmNwcApAQCAtMTAwMiw3ICsxMDAyLDYgQEAgdW5zaWduZWQgV2ViQ2hyb21lQ2xpZW50Ojpy ZW1vdGVJbWFnZXNDb3VudEZvclRlc3RpbmcoKSBjb25zdAogdm9pZCBXZWJDaHJvbWVDbGllbnQ6 OmNvbnRlbnRSdWxlTGlzdE5vdGlmaWNhdGlvbihjb25zdCBVUkwmIHVybCwgY29uc3QgQ29udGVu dFJ1bGVMaXN0UmVzdWx0cyYgcmVzdWx0cykKIHsKICNpZiBFTkFCTEUoQ09OVEVOVF9FWFRFTlNJ T05TKQotICAgIEFTU0VSVChyZXN1bHRzLnNob3VsZE5vdGlmeUFwcGxpY2F0aW9uKCkpOwogICAg IG1fcGFnZS5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkNvbnRlbnRSdWxlTGlzdE5vdGlm aWNhdGlvbih1cmwsIHJlc3VsdHMpKTsKICNlbmRpZgogfQpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hh bmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDJmY2NmZGQzOTFlOGQwYzg0MjU5OThkMjQw ZDdiNGM4NzZhMDBmZmUuLmZjODJmYWM3YWE2ZDI5MjFlNTY1YWRkYTBlMGFkODI1OGU4MDY2Mjkg MTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNyBAQAorMjAyMS0xMi0xMyAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3 ZWJraXQub3JnPgorCisgICAgICAgIEFkZCBfV0tDb250ZW50UnVsZUxpc3RBY3Rpb24ucmVkaXJl Y3RlZCBhbmQgLm1vZGlmaWVkSGVhZGVycworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjM0Mjg5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1dLQ29u dGVudEV4dGVuc2lvblN0b3JlLm1tOgorICAgICAgICAoY2hlY2tVUkxzKToKKyAgICAgICAgKFRF U1RfRik6CisgICAgICAgICogVGVzdFdlYktpdEFQSS9jb2NvYS9UZXN0TmF2aWdhdGlvbkRlbGVn YXRlLmg6CisgICAgICAgICogVGVzdFdlYktpdEFQSS9jb2NvYS9UZXN0TmF2aWdhdGlvbkRlbGVn YXRlLm1tOgorICAgICAgICAoLVtUZXN0TmF2aWdhdGlvbkRlbGVnYXRlIF93ZWJWaWV3OmNvbnRl bnRSdWxlTGlzdFdpdGhJZGVudGlmaWVyOnBlcmZvcm1lZEFjdGlvbjpmb3JVUkw6XSk6CisKIDIw MjEtMTItMTAgIEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KIAog ICAgICAgICBNb3ZlIGlmLWRvbWFpbiBhbmQgdW5sZXNzLWRvbWFpbiBjb252ZXJzaW9uIHRvIFdL Q29udGVudFJ1bGVMaXN0IHBhcnNpbmcKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkv VGVzdHMvV2ViS2l0Q29jb2EvV0tDb250ZW50RXh0ZW5zaW9uU3RvcmUubW0gYi9Ub29scy9UZXN0 V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1dLQ29udGVudEV4dGVuc2lvblN0b3JlLm1tCmlu ZGV4IDVlMjVhYWVlNzUwZDQzNmE3MDE3MDEyYmIzY2RkMGNjZTYzZjA4M2IuLmY4MDY0MjQxMGIw NmQ1ZGQyNzU1MTg2YzI4NTBlYWVlYjU2YmFjN2YgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJL aXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV0tDb250ZW50RXh0ZW5zaW9uU3RvcmUubW0KKysrIGIv VG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9XS0NvbnRlbnRFeHRlbnNpb25T dG9yZS5tbQpAQCAtMzQsNiArMzQsNyBAQAogI2ltcG9ydCA8V2ViS2l0L1dLQ29udGVudFJ1bGVM aXN0U3RvcmVQcml2YXRlLmg+CiAjaW1wb3J0IDxXZWJLaXQvV0tVc2VyQ29udGVudENvbnRyb2xs ZXJQcml2YXRlLmg+CiAjaW1wb3J0IDxXZWJLaXQvV0tXZWJwYWdlUHJlZmVyZW5jZXNQcml2YXRl Lmg+CisjaW1wb3J0IDxXZWJLaXQvX1dLQ29udGVudFJ1bGVMaXN0QWN0aW9uLmg+CiAjaW1wb3J0 IDxXZWJLaXQvX1dLVXNlckNvbnRlbnRFeHRlbnNpb25TdG9yZS5oPgogI2ltcG9ydCA8V2ViS2l0 L19XS1VzZXJDb250ZW50RmlsdGVyLmg+CiAjaW1wb3J0IDx3dGYvUmV0YWluUHRyLmg+CkBAIC01 MDUsNiArNTA2LDEzIEBAIHN0YXRpYyBSZXRhaW5QdHI8VGVzdE5hdmlnYXRpb25EZWxlZ2F0ZT4g bmF2aWdhdGlvbkRlbGVnYXRlQWxsb3dpbmdBY3RpdmVBY3Rpb25zCiAgICAgcmV0dXJuIGRlbGVn YXRlOwogfQogCitzdGF0aWMgdm9pZCBjaGVja1VSTHMoY29uc3QgVmVjdG9yPFN0cmluZz4mIGFj dHVhbCwgY29uc3QgVmVjdG9yPFN0cmluZz4mIGV4cGVjdGVkKQoreworICAgIEVYUEVDVF9FUShh Y3R1YWwuc2l6ZSgpLCBleHBlY3RlZC5zaXplKCkpOworICAgIGZvciAoc2l6ZV90IGkgPSAwOyBp IDwgc3RkOjptaW4oYWN0dWFsLnNpemUoKSwgZXhwZWN0ZWQuc2l6ZSgpKTsgaSsrKQorICAgICAg ICBFWFBFQ1RfV0tfU1RSRVEoYWN0dWFsW2ldLCBleHBlY3RlZFtpXSk7Cit9CisKIFRFU1RfRihX S0NvbnRlbnRSdWxlTGlzdFN0b3JlVGVzdCwgTW9kaWZ5SGVhZGVycykKIHsKICAgICBhdXRvIGxp c3QgPSBjb21waWxlQ29udGVudFJ1bGVMaXN0KFIiSlNPTigKQEAgLTU2Miw5ICs1NzAsMjIgQEAg VEVTVF9GKFdLQ29udGVudFJ1bGVMaXN0U3RvcmVUZXN0LCBNb2RpZnlIZWFkZXJzKQogICAgIFtb Y29uZmlndXJhdGlvbiB1c2VyQ29udGVudENvbnRyb2xsZXJdIGFkZENvbnRlbnRSdWxlTGlzdDps aXN0LmdldCgpXTsKICAgICBbY29uZmlndXJhdGlvbiBzZXRVUkxTY2hlbWVIYW5kbGVyOmhhbmRs ZXIuZ2V0KCkgZm9yVVJMU2NoZW1lOkAidGVzdHNjaGVtZSJdOwogICAgIGF1dG8gd2ViVmlldyA9 IGFkb3B0TlMoW1tXS1dlYlZpZXcgYWxsb2NdIGluaXRXaXRoRnJhbWU6TlNaZXJvUmVjdCBjb25m aWd1cmF0aW9uOmNvbmZpZ3VyYXRpb24uZ2V0KCldKTsKLSAgICB3ZWJWaWV3LmdldCgpLm5hdmln YXRpb25EZWxlZ2F0ZSA9IG5hdmlnYXRpb25EZWxlZ2F0ZUFsbG93aW5nQWN0aXZlQWN0aW9uc09u VGVzdEhvc3QoKS5nZXQoKTsKKyAgICBhdXRvIGRlbGVnYXRlID0gbmF2aWdhdGlvbkRlbGVnYXRl QWxsb3dpbmdBY3RpdmVBY3Rpb25zT25UZXN0SG9zdCgpLmdldCgpOworICAgIHdlYlZpZXcuZ2V0 KCkubmF2aWdhdGlvbkRlbGVnYXRlID0gZGVsZWdhdGU7CisgICAgX19ibG9jayBib29sIHJlY2Vp dmVkQWN0aW9uTm90aWZpY2F0aW9uIHsgZmFsc2UgfTsKKyAgICBfX2Jsb2NrIFZlY3RvcjxTdHJp bmc+IHVybHM7CisgICAgZGVsZWdhdGUuY29udGVudFJ1bGVMaXN0UGVyZm9ybWVkQWN0aW9uID0g XihXS1dlYlZpZXcgKiwgTlNTdHJpbmcgKmlkZW50aWZpZXIsIF9XS0NvbnRlbnRSdWxlTGlzdEFj dGlvbiAqYWN0aW9uLCBOU1VSTCAqdXJsKSB7CisgICAgICAgIHVybHMuYXBwZW5kKHVybC5hYnNv bHV0ZVN0cmluZyk7CisgICAgICAgIEVYUEVDVF9UUlVFKGFjdGlvbi5tb2RpZmllZEhlYWRlcnMp OworICAgICAgICByZWNlaXZlZEFjdGlvbk5vdGlmaWNhdGlvbiA9IHRydWU7CisgICAgfTsKICAg ICBbd2ViVmlldyBsb2FkUmVxdWVzdDpbTlNVUkxSZXF1ZXN0IHJlcXVlc3RXaXRoVVJMOltOU1VS TCBVUkxXaXRoU3RyaW5nOkAidGVzdHNjaGVtZTovL3Rlc3Rob3N0L21haW4uaHRtbCJdXV07CiAg ICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6cnVuKCZyZWNlaXZlZEFsbFJlcXVlc3RzKTsKKyAgICBU ZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJnJlY2VpdmVkQWN0aW9uTm90aWZpY2F0aW9uKTsKKyAg ICBjaGVja1VSTHModXJscywgeworICAgICAgICAidGVzdHNjaGVtZTovL3Rlc3Rob3N0L21haW4u aHRtbCIsCisgICAgICAgICJ0ZXN0c2NoZW1lOi8vdGVzdGhvc3QvZmV0Y2gudHh0IgorICAgIH0p OwogICAgIAogICAgIC8vIEZJWE1FOiBBcHBlbmRpbmcgdG8gdGhlIFVzZXItQWdlbnQgcmVwbGFj ZXMgdGhlIHVzZXIgYWdlbnQgYmVjYXVzZSB3ZSBoYXZlbid0IGFkZGVkIHRoZSB1c2VyIGFnZW50 IHlldCB3aGVuIHByb2Nlc3NpbmcgdGhlIHJlcXVlc3QuCiB9CkBAIC02NjcsMTEgKzY4OCwyMSBA QCBURVNUX0YoV0tDb250ZW50UnVsZUxpc3RTdG9yZVRlc3QsIFJlZGlyZWN0KQogICAgIFtjb25m aWd1cmF0aW9uIHNldFVSTFNjaGVtZUhhbmRsZXI6aGFuZGxlci5nZXQoKSBmb3JVUkxTY2hlbWU6 QCJ0ZXN0c2NoZW1lIl07CiAgICAgW2NvbmZpZ3VyYXRpb24gc2V0VVJMU2NoZW1lSGFuZGxlcjpo YW5kbGVyLmdldCgpIGZvclVSTFNjaGVtZTpAIm90aGVydGVzdHNjaGVtZSJdOwogICAgIGF1dG8g d2ViVmlldyA9IGFkb3B0TlMoW1tXS1dlYlZpZXcgYWxsb2NdIGluaXRXaXRoRnJhbWU6TlNaZXJv UmVjdCBjb25maWd1cmF0aW9uOmNvbmZpZ3VyYXRpb24uZ2V0KCldKTsKLSAgICB3ZWJWaWV3Lmdl dCgpLm5hdmlnYXRpb25EZWxlZ2F0ZSA9IG5hdmlnYXRpb25EZWxlZ2F0ZUFsbG93aW5nQWN0aXZl QWN0aW9uc09uVGVzdEhvc3QoKS5nZXQoKTsKKyAgICBhdXRvIGRlbGVnYXRlID0gbmF2aWdhdGlv bkRlbGVnYXRlQWxsb3dpbmdBY3RpdmVBY3Rpb25zT25UZXN0SG9zdCgpLmdldCgpOworICAgIHdl YlZpZXcuZ2V0KCkubmF2aWdhdGlvbkRlbGVnYXRlID0gZGVsZWdhdGU7CisgICAgX19ibG9jayBi b29sIHJlY2VpdmVkQWN0aW9uTm90aWZpY2F0aW9uIHsgZmFsc2UgfTsKKyAgICBfX2Jsb2NrIFZl Y3RvcjxTdHJpbmc+IHVybHNGcm9tQ2FsbGJhY2s7CisgICAgZGVsZWdhdGUuY29udGVudFJ1bGVM aXN0UGVyZm9ybWVkQWN0aW9uID0gXihXS1dlYlZpZXcgKiwgTlNTdHJpbmcgKmlkZW50aWZpZXIs IF9XS0NvbnRlbnRSdWxlTGlzdEFjdGlvbiAqYWN0aW9uLCBOU1VSTCAqdXJsKSB7CisgICAgICAg IHVybHNGcm9tQ2FsbGJhY2suYXBwZW5kKHVybC5hYnNvbHV0ZVN0cmluZyk7CisgICAgICAgIEVY UEVDVF9UUlVFKGFjdGlvbi5yZWRpcmVjdGVkKTsKKyAgICAgICAgcmVjZWl2ZWRBY3Rpb25Ob3Rp ZmljYXRpb24gPSB0cnVlOworICAgIH07CisKICAgICBbd2ViVmlldyBsb2FkUmVxdWVzdDpbTlNV UkxSZXF1ZXN0IHJlcXVlc3RXaXRoVVJMOltOU1VSTCBVUkxXaXRoU3RyaW5nOkAidGVzdHNjaGVt ZTovL3Rlc3Rob3N0L21haW4uaHRtbCJdXV07CiAgICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6cnVu KCZyZWNlaXZlZEFsbFJlcXVlc3RzKTsKKyAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJnJl Y2VpdmVkQWN0aW9uTm90aWZpY2F0aW9uKTsKIAotICAgIFZlY3Rvcjxjb25zdCBjaGFyKj4gZXhw ZWN0ZWRSZXF1ZXN0ZWRVUkxzIHsKKyAgICBWZWN0b3I8U3RyaW5nPiBleHBlY3RlZFJlcXVlc3Rl ZFVSTHMgewogICAgICAgICAidGVzdHNjaGVtZTovL3Rlc3Rob3N0L21haW4uaHRtbCIsCiAgICAg ICAgICJvdGhlcnRlc3RzY2hlbWU6Ly9ub3QtdGVzdGhvc3QvMS1yZWRpcmVjdGVkLnR4dCIsCiAg ICAgICAgICJ0ZXN0c2NoZW1lOi8vbm90LXRlc3Rob3N0LXNob3VsZC1ub3QtdHJpZ2dlci1hY3Rp b24vMi50eHQiLApAQCAtNjg1LDYgKzcxNiwxMCBAQCBURVNUX0YoV0tDb250ZW50UnVsZUxpc3RT dG9yZVRlc3QsIFJlZGlyZWN0KQogICAgIEVYUEVDVF9FUShleHBlY3RlZFJlcXVlc3RlZFVSTHMu c2l6ZSgpLCBbdXJscyBjb3VudF0pOwogICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgZXhwZWN0 ZWRSZXF1ZXN0ZWRVUkxzLnNpemUoKTsgaSsrKQogICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoZXhw ZWN0ZWRSZXF1ZXN0ZWRVUkxzW2ldLCBbW3VybHMgb2JqZWN0QXRJbmRleDppXSBhYnNvbHV0ZVN0 cmluZ10pOworICAgIAorICAgIGV4cGVjdGVkUmVxdWVzdGVkVVJMcy5yZW1vdmUoMCk7CisgICAg ZXhwZWN0ZWRSZXF1ZXN0ZWRVUkxzWzFdID0gInRlc3RzY2hlbWU6Ly90ZXN0aG9zdDoxMjMvMi50 eHQiOworICAgIGNoZWNrVVJMcyh1cmxzRnJvbUNhbGxiYWNrLCBleHBlY3RlZFJlcXVlc3RlZFVS THMpOwogfQogCiBURVNUX0YoV0tDb250ZW50UnVsZUxpc3RTdG9yZVRlc3QsIE51bGxQYXR0ZXJu U2V0KQpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9jb2NvYS9UZXN0TmF2aWdhdGlv bkRlbGVnYXRlLmggYi9Ub29scy9UZXN0V2ViS2l0QVBJL2NvY29hL1Rlc3ROYXZpZ2F0aW9uRGVs ZWdhdGUuaAppbmRleCBmOGMwMmY5YmUxMWYwMGYzNmVjOWFmMzI3MjlmMjNlNjBkZTFlZDJlLi5i NzI3ZGJiNTc1NTYxZGFhYmQ2MGJiZTBiMzM0ZDFhZjBhN2ZjYWM3IDEwMDY0NAotLS0gYS9Ub29s cy9UZXN0V2ViS2l0QVBJL2NvY29hL1Rlc3ROYXZpZ2F0aW9uRGVsZWdhdGUuaAorKysgYi9Ub29s cy9UZXN0V2ViS2l0QVBJL2NvY29hL1Rlc3ROYXZpZ2F0aW9uRGVsZWdhdGUuaApAQCAtMjYsNiAr MjYsOCBAQAogI2ltcG9ydCA8V2ViS2l0L1dLTmF2aWdhdGlvbkRlbGVnYXRlUHJpdmF0ZS5oPgog I2ltcG9ydCA8V2ViS2l0L1dlYktpdC5oPgogCitAY2xhc3MgX1dLQ29udGVudFJ1bGVMaXN0QWN0 aW9uOworCiBAaW50ZXJmYWNlIFRlc3ROYXZpZ2F0aW9uRGVsZWdhdGUgOiBOU09iamVjdCA8V0tO YXZpZ2F0aW9uRGVsZWdhdGU+CiAKIEBwcm9wZXJ0eSAobm9uYXRvbWljLCBjb3B5KSB2b2lkIChe ZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbikoV0tOYXZpZ2F0aW9uQWN0aW9uICosIHZv aWQgKF4pKFdLTmF2aWdhdGlvbkFjdGlvblBvbGljeSkpOwpAQCAtMzgsNiArNDAsNyBAQAogQHBy b3BlcnR5IChub25hdG9taWMsIGNvcHkpIHZvaWQgKF5yZW5kZXJpbmdQcm9ncmVzc0RpZENoYW5n ZSkoV0tXZWJWaWV3ICosIF9XS1JlbmRlcmluZ1Byb2dyZXNzRXZlbnRzKTsKIEBwcm9wZXJ0eSAo bm9uYXRvbWljLCBjb3B5KSB2b2lkIChed2ViQ29udGVudFByb2Nlc3NEaWRUZXJtaW5hdGUpKFdL V2ViVmlldyAqKTsKIEBwcm9wZXJ0eSAobm9uYXRvbWljLCBjb3B5KSB2b2lkICheZGlkUmVjZWl2 ZUF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlKShXS1dlYlZpZXcgKiwgTlNVUkxBdXRoZW50aWNhdGlv bkNoYWxsZW5nZSAqLCB2b2lkICheKShOU1VSTFNlc3Npb25BdXRoQ2hhbGxlbmdlRGlzcG9zaXRp b24sIE5TVVJMQ3JlZGVudGlhbCAqKSk7CitAcHJvcGVydHkgKG5vbmF0b21pYywgY29weSkgdm9p ZCAoXmNvbnRlbnRSdWxlTGlzdFBlcmZvcm1lZEFjdGlvbikoV0tXZWJWaWV3ICosIE5TU3RyaW5n ICosIF9XS0NvbnRlbnRSdWxlTGlzdEFjdGlvbiAqLCBOU1VSTCAqKTsKIAogLSAodm9pZCl3YWl0 Rm9yRGlkU3RhcnRQcm92aXNpb25hbE5hdmlnYXRpb247CiAtICh2b2lkKXdhaXRGb3JEaWRGaW5p c2hOYXZpZ2F0aW9uOwpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9jb2NvYS9UZXN0 TmF2aWdhdGlvbkRlbGVnYXRlLm1tIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9jb2NvYS9UZXN0TmF2 aWdhdGlvbkRlbGVnYXRlLm1tCmluZGV4IGJhOTI2YzY2ZTZhMzgwNDZlZDRlZDU5NWIwZWQwZWQ3 ZTViZGNiMzQuLmZhNjc0NDMwYmVhODcxYmY4NTNhM2I3Y2YwMTQ2ZTgzN2QzZjllODggMTAwNjQ0 Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvY29jb2EvVGVzdE5hdmlnYXRpb25EZWxlZ2F0ZS5t bQorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL2NvY29hL1Rlc3ROYXZpZ2F0aW9uRGVsZWdhdGUu bW0KQEAgLTE2OSw2ICsxNjksMTIgQEAKICAgICByZXR1cm4gX25hdmlnYXRpb25FcnJvci5hdXRv cmVsZWFzZSgpOwogfQogCistICh2b2lkKV93ZWJWaWV3OihXS1dlYlZpZXcgKil3ZWJWaWV3IGNv bnRlbnRSdWxlTGlzdFdpdGhJZGVudGlmaWVyOihOU1N0cmluZyAqKWlkZW50aWZpZXIgcGVyZm9y bWVkQWN0aW9uOihfV0tDb250ZW50UnVsZUxpc3RBY3Rpb24gKilhY3Rpb24gZm9yVVJMOihOU1VS TCAqKXVybAoreworICAgIGlmIChfY29udGVudFJ1bGVMaXN0UGVyZm9ybWVkQWN0aW9uKQorICAg ICAgICBfY29udGVudFJ1bGVMaXN0UGVyZm9ybWVkQWN0aW9uKHdlYlZpZXcsIGlkZW50aWZpZXIs IGFjdGlvbiwgdXJsKTsKK30KKwogQGVuZAogCiBAaW1wbGVtZW50YXRpb24gV0tXZWJWaWV3IChU ZXN0V2ViS2l0QVBJRXh0cmFzKQo= 447143 2021-12-14 11:23:42 -0800 2021-12-14 12:09:42 -0800 Patch bug-234289-20211214112341.patch text/plain 17640 achristensen U3VidmVyc2lvbiBSZXZpc2lvbjogMjg3MDIyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmVkMjVkMmM1MTczMTQ4 ZGI0ZWExZThhMjc3YThjZDBiZGNkNzAyOC4uYzQ2ZDBiNGI1MDgyYWJkYTJhYTcxZDQwNDNiNGVl YzU2ZTdlOTY3MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIxLTEyLTE0ICBBbGV4 IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgQWRkIF9X S0NvbnRlbnRSdWxlTGlzdEFjdGlvbi5yZWRpcmVjdGVkIGFuZCAubW9kaWZpZWRIZWFkZXJzCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzQyODkKKwor ICAgICAgICBSZXZpZXdlZCBieSBUaW0gSGF0Y2hlci4KKworICAgICAgICBUaGVzZSBpbmZvcm0g dGhlIFVJIHByb2Nlc3MgYWJvdXQgbmV3IGFjdGlvbnMgdGFrZW4gYnkgdGhlIGV4dGVuc2lvbi4K KworICAgICAgICAqIGNvbnRlbnRleHRlbnNpb25zL0NvbnRlbnRFeHRlbnNpb25zQmFja2VuZC5j cHA6CisgICAgICAgIChXZWJDb3JlOjpDb250ZW50RXh0ZW5zaW9uczo6Q29udGVudEV4dGVuc2lv bnNCYWNrZW5kOjpwcm9jZXNzQ29udGVudFJ1bGVMaXN0c0ZvckxvYWQpOgorICAgICAgICAoV2Vi Q29yZTo6Q29udGVudEV4dGVuc2lvbnM6OmFwcGx5UmVzdWx0c1RvUmVxdWVzdCk6CisgICAgICAg ICogY29udGVudGV4dGVuc2lvbnMvQ29udGVudFJ1bGVMaXN0UmVzdWx0cy5oOgorICAgICAgICAo V2ViQ29yZTo6Q29udGVudFJ1bGVMaXN0UmVzdWx0czo6c2hvdWxkTm90aWZ5QXBwbGljYXRpb24g Y29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6Q29udGVudFJ1bGVMaXN0UmVzdWx0czo6UmVzdWx0 OjplbmNvZGUgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6Q29udGVudFJ1bGVMaXN0UmVzdWx0 czo6UmVzdWx0OjpkZWNvZGUpOgorICAgICAgICAoV2ViQ29yZTo6Q29udGVudFJ1bGVMaXN0UmVz dWx0czo6UmVzdWx0OjpzaG91bGROb3RpZnlBcHBsaWNhdGlvbiBjb25zdCk6IERlbGV0ZWQuCisK IDIwMjEtMTItMTQgIEplYW4tWXZlcyBBdmVuYXJkICA8anlhQGFwcGxlLmNvbT4KIAogICAgICAg ICBSZW5hbWUgU2hhcmVkQnVmZmVyIGNsYXNzZXMuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGFiZGI2MmE1ZmFkMzli ZTJkYmIyNDQ0ODVkZTkzNjA2NTdlNGVhZjQuLjY5MDUzYzk5M2RjMGZkNTAyYmQ2MjRjMjZjNGNm NmQ2ODRmNjMyOWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMjEtMTItMTQgIEFsZXgg Q2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBBZGQgX1dL Q29udGVudFJ1bGVMaXN0QWN0aW9uLnJlZGlyZWN0ZWQgYW5kIC5tb2RpZmllZEhlYWRlcnMKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNDI4OQorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVUlQcm9jZXNz L0FQSS9BUElDb250ZW50UnVsZUxpc3RBY3Rpb24uY3BwOgorICAgICAgICAoQVBJOjpDb250ZW50 UnVsZUxpc3RBY3Rpb246OnJlZGlyZWN0ZWQgY29uc3QpOgorICAgICAgICAoQVBJOjpDb250ZW50 UnVsZUxpc3RBY3Rpb246Om1vZGlmaWVkSGVhZGVycyBjb25zdCk6CisgICAgICAgICogVUlQcm9j ZXNzL0FQSS9BUElDb250ZW50UnVsZUxpc3RBY3Rpb24uaDoKKyAgICAgICAgKiBVSVByb2Nlc3Mv QVBJL0NvY29hL19XS0NvbnRlbnRSdWxlTGlzdEFjdGlvbi5oOgorICAgICAgICAqIFVJUHJvY2Vz cy9BUEkvQ29jb2EvX1dLQ29udGVudFJ1bGVMaXN0QWN0aW9uLm1tOgorICAgICAgICAoLVtfV0tD b250ZW50UnVsZUxpc3RBY3Rpb24gcmVkaXJlY3RlZF0pOgorICAgICAgICAoLVtfV0tDb250ZW50 UnVsZUxpc3RBY3Rpb24gbW9kaWZpZWRIZWFkZXJzXSk6CisgICAgICAgICogV2ViUHJvY2Vzcy9X ZWJDb3JlU3VwcG9ydC9XZWJDaHJvbWVDbGllbnQuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJD aHJvbWVDbGllbnQ6OmNvbnRlbnRSdWxlTGlzdE5vdGlmaWNhdGlvbik6CisKIDIwMjEtMTItMTQg IEplYW4tWXZlcyBBdmVuYXJkICA8anlhQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW5hbWUgU2hh cmVkQnVmZmVyIGNsYXNzZXMuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jb250ZW50ZXh0 ZW5zaW9ucy9Db250ZW50RXh0ZW5zaW9uc0JhY2tlbmQuY3BwIGIvU291cmNlL1dlYkNvcmUvY29u dGVudGV4dGVuc2lvbnMvQ29udGVudEV4dGVuc2lvbnNCYWNrZW5kLmNwcAppbmRleCAxYWI3ZDZl YmYzMTYwYjVjMTNjYTcxNjdmYTIzZmZlOGE3YzFkMDU3Li5lMzljZTExMzNjNDgyYWQzODFjYWRi NDUyYjhkNmMyOWYzODQ4MzhkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jb250ZW50ZXh0 ZW5zaW9ucy9Db250ZW50RXh0ZW5zaW9uc0JhY2tlbmQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2NvbnRlbnRleHRlbnNpb25zL0NvbnRlbnRFeHRlbnNpb25zQmFja2VuZC5jcHAKQEAgLTI0OCwx MSArMjQ4LDE1IEBAIENvbnRlbnRSdWxlTGlzdFJlc3VsdHMgQ29udGVudEV4dGVuc2lvbnNCYWNr ZW5kOjpwcm9jZXNzQ29udGVudFJ1bGVMaXN0c0ZvckxvYWQoCiAgICAgICAgICAgICB9LCBbJl0o Y29uc3QgSWdub3JlUHJldmlvdXNSdWxlc0FjdGlvbiYpIHsKICAgICAgICAgICAgICAgICBSRUxF QVNFX0FTU0VSVF9OT1RfUkVBQ0hFRCgpOwogICAgICAgICAgICAgfSwgWyZdIChjb25zdCBNb2Rp ZnlIZWFkZXJzQWN0aW9uJiBhY3Rpb24pIHsKLSAgICAgICAgICAgICAgICBpZiAoaW5pdGlhdGlu Z0RvY3VtZW50TG9hZGVyLmFsbG93c0FjdGl2ZUNvbnRlbnRSdWxlTGlzdEFjdGlvbnNGb3JVUkwo Y29udGVudFJ1bGVMaXN0SWRlbnRpZmllciwgdXJsKSkKKyAgICAgICAgICAgICAgICBpZiAoaW5p dGlhdGluZ0RvY3VtZW50TG9hZGVyLmFsbG93c0FjdGl2ZUNvbnRlbnRSdWxlTGlzdEFjdGlvbnNG b3JVUkwoY29udGVudFJ1bGVMaXN0SWRlbnRpZmllciwgdXJsKSkgeworICAgICAgICAgICAgICAg ICAgICByZXN1bHQubW9kaWZpZWRIZWFkZXJzID0gdHJ1ZTsKICAgICAgICAgICAgICAgICAgICAg cmVzdWx0cy5zdW1tYXJ5Lm1vZGlmeUhlYWRlcnNBY3Rpb25zLmFwcGVuZChhY3Rpb24pOworICAg ICAgICAgICAgICAgIH0KICAgICAgICAgICAgIH0sIFsmXSAoY29uc3QgUmVkaXJlY3RBY3Rpb24m IHJlZGlyZWN0QWN0aW9uKSB7Ci0gICAgICAgICAgICAgICAgaWYgKGluaXRpYXRpbmdEb2N1bWVu dExvYWRlci5hbGxvd3NBY3RpdmVDb250ZW50UnVsZUxpc3RBY3Rpb25zRm9yVVJMKGNvbnRlbnRS dWxlTGlzdElkZW50aWZpZXIsIHVybCkpCisgICAgICAgICAgICAgICAgaWYgKGluaXRpYXRpbmdE b2N1bWVudExvYWRlci5hbGxvd3NBY3RpdmVDb250ZW50UnVsZUxpc3RBY3Rpb25zRm9yVVJMKGNv bnRlbnRSdWxlTGlzdElkZW50aWZpZXIsIHVybCkpIHsKKyAgICAgICAgICAgICAgICAgICAgcmVz dWx0LnJlZGlyZWN0ZWQgPSB0cnVlOwogICAgICAgICAgICAgICAgICAgICByZXN1bHRzLnN1bW1h cnkucmVkaXJlY3RBY3Rpb25zLmFwcGVuZCh7IHJlZGlyZWN0QWN0aW9uLCBtX2NvbnRlbnRFeHRl bnNpb25zLmdldChjb250ZW50UnVsZUxpc3RJZGVudGlmaWVyKS0+ZXh0ZW5zaW9uQmFzZVVSTCgp IH0pOworICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgIH0pLCBhY3Rpb24uZGF0YSgpKTsK ICAgICAgICAgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jb250ZW50ZXh0ZW5zaW9u cy9Db250ZW50UnVsZUxpc3RSZXN1bHRzLmggYi9Tb3VyY2UvV2ViQ29yZS9jb250ZW50ZXh0ZW5z aW9ucy9Db250ZW50UnVsZUxpc3RSZXN1bHRzLmgKaW5kZXggNGI5MjkyNTg1MDNmNmYwMTkzOGNi ZDEyN2Y1OGE1ZDI5NmQ0Mjg0ZC4uNzgxZWRmZTgyMzZiZTJjZGUwZWMzMThkYTJlZGI0NjI0YzMy MTNmYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY29udGVudGV4dGVuc2lvbnMvQ29udGVu dFJ1bGVMaXN0UmVzdWx0cy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2NvbnRlbnRleHRlbnNpb25z L0NvbnRlbnRSdWxlTGlzdFJlc3VsdHMuaApAQCAtMzksNiArMzksOCBAQCBzdHJ1Y3QgQ29udGVu dFJ1bGVMaXN0UmVzdWx0cyB7CiAgICAgICAgIGJvb2wgYmxvY2tlZExvYWQgeyBmYWxzZSB9Owog ICAgICAgICBib29sIG1hZGVIVFRQUyB7IGZhbHNlIH07CiAgICAgICAgIGJvb2wgYmxvY2tlZENv b2tpZXMgeyBmYWxzZSB9OworICAgICAgICBib29sIG1vZGlmaWVkSGVhZGVycyB7IGZhbHNlIH07 CisgICAgICAgIGJvb2wgcmVkaXJlY3RlZCB7IGZhbHNlIH07CiAgICAgICAgIFZlY3RvcjxTdHJp bmc+IG5vdGlmaWNhdGlvbnM7CiAgICAgICAgIAogICAgICAgICBib29sIHNob3VsZE5vdGlmeUFw cGxpY2F0aW9uKCkgY29uc3QKQEAgLTQ2LDYgKzQ4LDggQEAgc3RydWN0IENvbnRlbnRSdWxlTGlz dFJlc3VsdHMgewogICAgICAgICAgICAgcmV0dXJuIGJsb2NrZWRMb2FkCiAgICAgICAgICAgICAg ICAgfHwgbWFkZUhUVFBTCiAgICAgICAgICAgICAgICAgfHwgYmxvY2tlZENvb2tpZXMKKyAgICAg ICAgICAgICAgICB8fCBtb2RpZmllZEhlYWRlcnMKKyAgICAgICAgICAgICAgICB8fCByZWRpcmVj dGVkCiAgICAgICAgICAgICAgICAgfHwgIW5vdGlmaWNhdGlvbnMuaXNFbXB0eSgpOwogICAgICAg ICB9CiAKQEAgLTczLDYgKzc3LDggQEAgc3RydWN0IENvbnRlbnRSdWxlTGlzdFJlc3VsdHMgewog ICAgICAgICByZXR1cm4gc3VtbWFyeS5ibG9ja2VkTG9hZAogICAgICAgICAgICAgfHwgc3VtbWFy eS5tYWRlSFRUUFMKICAgICAgICAgICAgIHx8IHN1bW1hcnkuYmxvY2tlZENvb2tpZXMKKyAgICAg ICAgICAgIHx8ICFzdW1tYXJ5Lm1vZGlmeUhlYWRlcnNBY3Rpb25zLmlzRW1wdHkoKQorICAgICAg ICAgICAgfHwgIXN1bW1hcnkucmVkaXJlY3RBY3Rpb25zLmlzRW1wdHkoKQogICAgICAgICAgICAg fHwgc3VtbWFyeS5oYXNOb3RpZmljYXRpb25zOwogICAgIH0KICAgICAKQEAgLTEwNSw2ICsxMTEs OCBAQCB0ZW1wbGF0ZTxjbGFzcyBFbmNvZGVyPiB2b2lkIENvbnRlbnRSdWxlTGlzdFJlc3VsdHM6 OlJlc3VsdDo6ZW5jb2RlKEVuY29kZXImIGVuYwogICAgIGVuY29kZXIgPDwgYmxvY2tlZExvYWQ7 CiAgICAgZW5jb2RlciA8PCBtYWRlSFRUUFM7CiAgICAgZW5jb2RlciA8PCBibG9ja2VkQ29va2ll czsKKyAgICBlbmNvZGVyIDw8IG1vZGlmaWVkSGVhZGVyczsKKyAgICBlbmNvZGVyIDw8IHJlZGly ZWN0ZWQ7CiAgICAgZW5jb2RlciA8PCBub3RpZmljYXRpb25zOwogfQogCkBAIC0xMjUsNiArMTMz LDE2IEBAIHRlbXBsYXRlPGNsYXNzIERlY29kZXI+IGF1dG8gQ29udGVudFJ1bGVMaXN0UmVzdWx0 czo6UmVzdWx0OjpkZWNvZGUoRGVjb2RlciYgZGVjCiAgICAgaWYgKCFibG9ja2VkQ29va2llcykK ICAgICAgICAgcmV0dXJuIHN0ZDo6bnVsbG9wdDsKICAgICAKKyAgICBzdGQ6Om9wdGlvbmFsPGJv b2w+IG1vZGlmaWVkSGVhZGVyczsKKyAgICBkZWNvZGVyID4+IG1vZGlmaWVkSGVhZGVyczsKKyAg ICBpZiAoIW1vZGlmaWVkSGVhZGVycykKKyAgICAgICAgcmV0dXJuIHN0ZDo6bnVsbG9wdDsKKyAg ICAKKyAgICBzdGQ6Om9wdGlvbmFsPGJvb2w+IHJlZGlyZWN0ZWQ7CisgICAgZGVjb2RlciA+PiBy ZWRpcmVjdGVkOworICAgIGlmICghcmVkaXJlY3RlZCkKKyAgICAgICAgcmV0dXJuIHN0ZDo6bnVs bG9wdDsKKyAgICAKICAgICBzdGQ6Om9wdGlvbmFsPFZlY3RvcjxTdHJpbmc+PiBub3RpZmljYXRp b25zOwogICAgIGRlY29kZXIgPj4gbm90aWZpY2F0aW9uczsKICAgICBpZiAoIW5vdGlmaWNhdGlv bnMpCkBAIC0xMzQsNiArMTUyLDggQEAgdGVtcGxhdGU8Y2xhc3MgRGVjb2Rlcj4gYXV0byBDb250 ZW50UnVsZUxpc3RSZXN1bHRzOjpSZXN1bHQ6OmRlY29kZShEZWNvZGVyJiBkZWMKICAgICAgICAg V1RGTW92ZSgqYmxvY2tlZExvYWQpLAogICAgICAgICBXVEZNb3ZlKCptYWRlSFRUUFMpLAogICAg ICAgICBXVEZNb3ZlKCpibG9ja2VkQ29va2llcyksCisgICAgICAgIFdURk1vdmUoKm1vZGlmaWVk SGVhZGVycyksCisgICAgICAgIFdURk1vdmUoKnJlZGlyZWN0ZWQpLAogICAgICAgICBXVEZNb3Zl KCpub3RpZmljYXRpb25zKQogICAgIH19OwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvQVBJL0FQSUNvbnRlbnRSdWxlTGlzdEFjdGlvbi5jcHAgYi9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9BUEkvQVBJQ29udGVudFJ1bGVMaXN0QWN0aW9uLmNwcAppbmRleCAxNTU5NzY2 MzE2ODRiYTgyMzcwZmY3YTkwZmNlMGYzMzcxMmY0MTgwLi5lMTNhMGM3Yzg4ZGJkYTgyY2YwMTAz MGY4ZGM0MzQyNGMwNmI4YmU3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9B UEkvQVBJQ29udGVudFJ1bGVMaXN0QWN0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9BUEkvQVBJQ29udGVudFJ1bGVMaXN0QWN0aW9uLmNwcApAQCAtNTcsNiArNTcsMTYgQEAg Ym9vbCBDb250ZW50UnVsZUxpc3RBY3Rpb246OmJsb2NrZWRDb29raWVzKCkgY29uc3QKICAgICBy ZXR1cm4gbV9yZXN1bHQuYmxvY2tlZENvb2tpZXM7CiB9CiAKK2Jvb2wgQ29udGVudFJ1bGVMaXN0 QWN0aW9uOjpyZWRpcmVjdGVkKCkgY29uc3QKK3sKKyAgICByZXR1cm4gbV9yZXN1bHQucmVkaXJl Y3RlZDsKK30KKworYm9vbCBDb250ZW50UnVsZUxpc3RBY3Rpb246Om1vZGlmaWVkSGVhZGVycygp IGNvbnN0Cit7CisgICAgcmV0dXJuIG1fcmVzdWx0Lm1vZGlmaWVkSGVhZGVyczsKK30KKwogY29u c3QgVmVjdG9yPFdURjo6U3RyaW5nPiYgQ29udGVudFJ1bGVMaXN0QWN0aW9uOjpub3RpZmljYXRp b25zKCkgY29uc3QKIHsKICAgICByZXR1cm4gbV9yZXN1bHQubm90aWZpY2F0aW9uczsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9BUElDb250ZW50UnVsZUxpc3RBY3Rp b24uaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9BUElDb250ZW50UnVsZUxpc3RBY3Rp b24uaAppbmRleCA5ZTM5ZTA2OWE0ZDA0Yjg0YTg1ZmU0MTQxMzA5ZjUyYWY3YzdiZGViLi40Nzk0 MTY4OTBjZTgxZTUyZWRiZDdhMWIxOWFhZWNhOWE1ZDY5Zjk1IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9BUEkvQVBJQ29udGVudFJ1bGVMaXN0QWN0aW9uLmgKKysrIGIvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0FQSUNvbnRlbnRSdWxlTGlzdEFjdGlvbi5oCkBAIC00 MCw2ICs0MCw4IEBAIHB1YmxpYzoKICAgICBib29sIGJsb2NrZWRMb2FkKCkgY29uc3Q7CiAgICAg Ym9vbCBtYWRlSFRUUFMoKSBjb25zdDsKICAgICBib29sIGJsb2NrZWRDb29raWVzKCkgY29uc3Q7 CisgICAgYm9vbCByZWRpcmVjdGVkKCkgY29uc3Q7CisgICAgYm9vbCBtb2RpZmllZEhlYWRlcnMo KSBjb25zdDsKICAgICBjb25zdCBWZWN0b3I8V1RGOjpTdHJpbmc+JiBub3RpZmljYXRpb25zKCkg Y29uc3Q7CiAKIHByaXZhdGU6CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9B UEkvQ29jb2EvX1dLQ29udGVudFJ1bGVMaXN0QWN0aW9uLmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9BUEkvQ29jb2EvX1dLQ29udGVudFJ1bGVMaXN0QWN0aW9uLmgKaW5kZXggODk0NmNjYWJi NGMxN2U1MjY4OWVmZWFkOWU0MGM4MWZhOGU5OWY4MS4uYWJhMzVjNTRjNTM3OGVjYjc0ODBkNGM3 OGZhMWViNDRmZDZmZTUzZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJ L0NvY29hL19XS0NvbnRlbnRSdWxlTGlzdEFjdGlvbi5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL0FQSS9Db2NvYS9fV0tDb250ZW50UnVsZUxpc3RBY3Rpb24uaApAQCAtMzIsNiArMzIs OCBAQCBXS19DTEFTU19BVkFJTEFCTEUobWFjb3MoMTAuMTUpLCBpb3MoMTMuMCkpCiBAcHJvcGVy dHkgKG5vbmF0b21pYywgcmVhZG9ubHkpIEJPT0wgYmxvY2tlZExvYWQ7CiBAcHJvcGVydHkgKG5v bmF0b21pYywgcmVhZG9ubHkpIEJPT0wgYmxvY2tlZENvb2tpZXM7CiBAcHJvcGVydHkgKG5vbmF0 b21pYywgcmVhZG9ubHkpIEJPT0wgbWFkZUhUVFBTOworQHByb3BlcnR5IChub25hdG9taWMsIHJl YWRvbmx5KSBCT09MIHJlZGlyZWN0ZWQgV0tfQVBJX0FWQUlMQUJMRShtYWNvcyhXS19NQUNfVEJB KSwgaW9zKFdLX0lPU19UQkEpKTsKK0Bwcm9wZXJ0eSAobm9uYXRvbWljLCByZWFkb25seSkgQk9P TCBtb2RpZmllZEhlYWRlcnMgV0tfQVBJX0FWQUlMQUJMRShtYWNvcyhXS19NQUNfVEJBKSwgaW9z KFdLX0lPU19UQkEpKTsKIEBwcm9wZXJ0eSAobm9uYXRvbWljLCByZWFkb25seSwgY29weSkgTlNB cnJheTxOU1N0cmluZyAqPiAqbm90aWZpY2F0aW9uczsKIAogQGVuZApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL19XS0NvbnRlbnRSdWxlTGlzdEFjdGlvbi5t bSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tDb250ZW50UnVsZUxpc3RB Y3Rpb24ubW0KaW5kZXggM2RjMzdhZTI0ZTUyNWRhODA1MThmNDliNTZhYzNhNzI2ZjRiYTQ2Mi4u ZmVlOGQwZDI4NzE4OGZhZWVkNGMyMzE2ODVjZTQ0NzQzNDRjNzBlNSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL19XS0NvbnRlbnRSdWxlTGlzdEFjdGlvbi5t bQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLQ29udGVudFJ1bGVM aXN0QWN0aW9uLm1tCkBAIC02OCw2ICs2OCwyNCBAQAogI2VuZGlmCiB9CiAKKy0gKEJPT0wpcmVk aXJlY3RlZAoreworI2lmIEVOQUJMRShDT05URU5UX0VYVEVOU0lPTlMpCisgICAgcmV0dXJuIF9h Y3Rpb24tPnJlZGlyZWN0ZWQoKTsKKyNlbHNlCisgICAgcmV0dXJuIE5POworI2VuZGlmCit9CisK Ky0gKEJPT0wpbW9kaWZpZWRIZWFkZXJzCit7CisjaWYgRU5BQkxFKENPTlRFTlRfRVhURU5TSU9O UykKKyAgICByZXR1cm4gX2FjdGlvbi0+bW9kaWZpZWRIZWFkZXJzKCk7CisjZWxzZQorICAgIHJl dHVybiBOTzsKKyNlbmRpZgorfQorCiAtIChOU0FycmF5PE5TU3RyaW5nICo+ICopbm90aWZpY2F0 aW9ucwogewogI2lmIEVOQUJMRShDT05URU5UX0VYVEVOU0lPTlMpCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50LmNwcCBi L1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJDaHJvbWVDbGllbnQu Y3BwCmluZGV4IDNlMmQ0NzVmOGMyMGY4OGVlZDVmMWU5YzE0ZjhlZTJmZWU1YmYwODIuLmZkZDQw NmRhYTkxY2E1MDVjZDE1ZjkxNjZkNmFjYjRmMTA0NWYxZjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJDaHJvbWVDbGllbnQuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJDaHJvbWVDbGllbnQu Y3BwCkBAIC0xMDAyLDcgKzEwMDIsNiBAQCB1bnNpZ25lZCBXZWJDaHJvbWVDbGllbnQ6OnJlbW90 ZUltYWdlc0NvdW50Rm9yVGVzdGluZygpIGNvbnN0CiB2b2lkIFdlYkNocm9tZUNsaWVudDo6Y29u dGVudFJ1bGVMaXN0Tm90aWZpY2F0aW9uKGNvbnN0IFVSTCYgdXJsLCBjb25zdCBDb250ZW50UnVs ZUxpc3RSZXN1bHRzJiByZXN1bHRzKQogewogI2lmIEVOQUJMRShDT05URU5UX0VYVEVOU0lPTlMp Ci0gICAgQVNTRVJUKHJlc3VsdHMuc2hvdWxkTm90aWZ5QXBwbGljYXRpb24oKSk7CiAgICAgbV9w YWdlLnNlbmQoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6Q29udGVudFJ1bGVMaXN0Tm90aWZpY2F0 aW9uKHVybCwgcmVzdWx0cykpOwogI2VuZGlmCiB9CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VM b2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZWU4ZjRhZGQzNmNhOTRjM2RlYmRiNzY2OGRlNDI2 M2ZjN2I0ODRiYS4uMzQ1NWIzMmFmZTdkMzVhN2MzMTI0NDBmMWRiY2JlMzBhMzQyOGZjOSAxMDA2 NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsx LDE3IEBACisyMDIxLTEyLTE0ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtp dC5vcmc+CisKKyAgICAgICAgQWRkIF9XS0NvbnRlbnRSdWxlTGlzdEFjdGlvbi5yZWRpcmVjdGVk IGFuZCAubW9kaWZpZWRIZWFkZXJzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0yMzQyODkKKworICAgICAgICBSZXZpZXdlZCBieSBUaW0gSGF0Y2hlci4K KworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV0tDb250ZW50RXh0 ZW5zaW9uU3RvcmUubW06CisgICAgICAgIChjaGVja1VSTHMpOgorICAgICAgICAoVEVTVF9GKToK KyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL2NvY29hL1Rlc3ROYXZpZ2F0aW9uRGVsZWdhdGUuaDoK KyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL2NvY29hL1Rlc3ROYXZpZ2F0aW9uRGVsZWdhdGUubW06 CisgICAgICAgICgtW1Rlc3ROYXZpZ2F0aW9uRGVsZWdhdGUgX3dlYlZpZXc6Y29udGVudFJ1bGVM aXN0V2l0aElkZW50aWZpZXI6cGVyZm9ybWVkQWN0aW9uOmZvclVSTDpdKToKKwogMjAyMS0xMi0x NCAgSmVhbi1ZdmVzIEF2ZW5hcmQgIDxqeWFAYXBwbGUuY29tPgogCiAgICAgICAgIFJlbmFtZSBT aGFyZWRCdWZmZXIgY2xhc3Nlcy4KZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVz dHMvV2ViS2l0Q29jb2EvV0tDb250ZW50RXh0ZW5zaW9uU3RvcmUubW0gYi9Ub29scy9UZXN0V2Vi S2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1dLQ29udGVudEV4dGVuc2lvblN0b3JlLm1tCmluZGV4 IDVlMjVhYWVlNzUwZDQzNmE3MDE3MDEyYmIzY2RkMGNjZTYzZjA4M2IuLmRkZDk1NTQ1OGIwYzBk YTQ1OTUwZmZhZGFlMDViMjU3NGJhMTUwMzcgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRB UEkvVGVzdHMvV2ViS2l0Q29jb2EvV0tDb250ZW50RXh0ZW5zaW9uU3RvcmUubW0KKysrIGIvVG9v bHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9XS0NvbnRlbnRFeHRlbnNpb25TdG9y ZS5tbQpAQCAtMzQsMTAgKzM0LDEyIEBACiAjaW1wb3J0IDxXZWJLaXQvV0tDb250ZW50UnVsZUxp c3RTdG9yZVByaXZhdGUuaD4KICNpbXBvcnQgPFdlYktpdC9XS1VzZXJDb250ZW50Q29udHJvbGxl clByaXZhdGUuaD4KICNpbXBvcnQgPFdlYktpdC9XS1dlYnBhZ2VQcmVmZXJlbmNlc1ByaXZhdGUu aD4KKyNpbXBvcnQgPFdlYktpdC9fV0tDb250ZW50UnVsZUxpc3RBY3Rpb24uaD4KICNpbXBvcnQg PFdlYktpdC9fV0tVc2VyQ29udGVudEV4dGVuc2lvblN0b3JlLmg+CiAjaW1wb3J0IDxXZWJLaXQv X1dLVXNlckNvbnRlbnRGaWx0ZXIuaD4KICNpbXBvcnQgPHd0Zi9SZXRhaW5QdHIuaD4KICNpbXBv cnQgPHd0Zi9WZWN0b3IuaD4KKyNpbXBvcnQgPHd0Zi90ZXh0L1dURlN0cmluZy5oPgogCiBjbGFz cyBXS0NvbnRlbnRSdWxlTGlzdFN0b3JlVGVzdCA6IHB1YmxpYyB0ZXN0aW5nOjpUZXN0IHsKIHB1 YmxpYzoKQEAgLTUwNSw2ICs1MDcsMTMgQEAgc3RhdGljIFJldGFpblB0cjxUZXN0TmF2aWdhdGlv bkRlbGVnYXRlPiBuYXZpZ2F0aW9uRGVsZWdhdGVBbGxvd2luZ0FjdGl2ZUFjdGlvbnMKICAgICBy ZXR1cm4gZGVsZWdhdGU7CiB9CiAKK3N0YXRpYyB2b2lkIGNoZWNrVVJMcyhjb25zdCBWZWN0b3I8 U3RyaW5nPiYgYWN0dWFsLCBjb25zdCBWZWN0b3I8U3RyaW5nPiYgZXhwZWN0ZWQpCit7CisgICAg RVhQRUNUX0VRKGFjdHVhbC5zaXplKCksIGV4cGVjdGVkLnNpemUoKSk7CisgICAgZm9yIChzaXpl X3QgaSA9IDA7IGkgPCBzdGQ6Om1pbihhY3R1YWwuc2l6ZSgpLCBleHBlY3RlZC5zaXplKCkpOyBp KyspCisgICAgICAgIEVYUEVDVF9XS19TVFJFUShhY3R1YWxbaV0sIGV4cGVjdGVkW2ldKTsKK30K KwogVEVTVF9GKFdLQ29udGVudFJ1bGVMaXN0U3RvcmVUZXN0LCBNb2RpZnlIZWFkZXJzKQogewog ICAgIGF1dG8gbGlzdCA9IGNvbXBpbGVDb250ZW50UnVsZUxpc3QoUiJKU09OKApAQCAtNTYyLDkg KzU3MSwyMiBAQCBURVNUX0YoV0tDb250ZW50UnVsZUxpc3RTdG9yZVRlc3QsIE1vZGlmeUhlYWRl cnMpCiAgICAgW1tjb25maWd1cmF0aW9uIHVzZXJDb250ZW50Q29udHJvbGxlcl0gYWRkQ29udGVu dFJ1bGVMaXN0Omxpc3QuZ2V0KCldOwogICAgIFtjb25maWd1cmF0aW9uIHNldFVSTFNjaGVtZUhh bmRsZXI6aGFuZGxlci5nZXQoKSBmb3JVUkxTY2hlbWU6QCJ0ZXN0c2NoZW1lIl07CiAgICAgYXV0 byB3ZWJWaWV3ID0gYWRvcHROUyhbW1dLV2ViVmlldyBhbGxvY10gaW5pdFdpdGhGcmFtZTpOU1pl cm9SZWN0IGNvbmZpZ3VyYXRpb246Y29uZmlndXJhdGlvbi5nZXQoKV0pOwotICAgIHdlYlZpZXcu Z2V0KCkubmF2aWdhdGlvbkRlbGVnYXRlID0gbmF2aWdhdGlvbkRlbGVnYXRlQWxsb3dpbmdBY3Rp dmVBY3Rpb25zT25UZXN0SG9zdCgpLmdldCgpOworICAgIGF1dG8gZGVsZWdhdGUgPSBuYXZpZ2F0 aW9uRGVsZWdhdGVBbGxvd2luZ0FjdGl2ZUFjdGlvbnNPblRlc3RIb3N0KCkuZ2V0KCk7CisgICAg d2ViVmlldy5nZXQoKS5uYXZpZ2F0aW9uRGVsZWdhdGUgPSBkZWxlZ2F0ZTsKKyAgICBfX2Jsb2Nr IGJvb2wgcmVjZWl2ZWRBY3Rpb25Ob3RpZmljYXRpb24geyBmYWxzZSB9OworICAgIF9fYmxvY2sg VmVjdG9yPFN0cmluZz4gdXJsczsKKyAgICBkZWxlZ2F0ZS5jb250ZW50UnVsZUxpc3RQZXJmb3Jt ZWRBY3Rpb24gPSBeKFdLV2ViVmlldyAqLCBOU1N0cmluZyAqaWRlbnRpZmllciwgX1dLQ29udGVu dFJ1bGVMaXN0QWN0aW9uICphY3Rpb24sIE5TVVJMICp1cmwpIHsKKyAgICAgICAgdXJscy5hcHBl bmQodXJsLmFic29sdXRlU3RyaW5nKTsKKyAgICAgICAgRVhQRUNUX1RSVUUoYWN0aW9uLm1vZGlm aWVkSGVhZGVycyk7CisgICAgICAgIHJlY2VpdmVkQWN0aW9uTm90aWZpY2F0aW9uID0gdHJ1ZTsK KyAgICB9OwogICAgIFt3ZWJWaWV3IGxvYWRSZXF1ZXN0OltOU1VSTFJlcXVlc3QgcmVxdWVzdFdp dGhVUkw6W05TVVJMIFVSTFdpdGhTdHJpbmc6QCJ0ZXN0c2NoZW1lOi8vdGVzdGhvc3QvbWFpbi5o dG1sIl1dXTsKICAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJnJlY2VpdmVkQWxsUmVxdWVz dHMpOworICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmcmVjZWl2ZWRBY3Rpb25Ob3RpZmlj YXRpb24pOworICAgIGNoZWNrVVJMcyh1cmxzLCB7CisgICAgICAgICJ0ZXN0c2NoZW1lOi8vdGVz dGhvc3QvbWFpbi5odG1sIiwKKyAgICAgICAgInRlc3RzY2hlbWU6Ly90ZXN0aG9zdC9mZXRjaC50 eHQiCisgICAgfSk7CiAgICAgCiAgICAgLy8gRklYTUU6IEFwcGVuZGluZyB0byB0aGUgVXNlci1B Z2VudCByZXBsYWNlcyB0aGUgdXNlciBhZ2VudCBiZWNhdXNlIHdlIGhhdmVuJ3QgYWRkZWQgdGhl IHVzZXIgYWdlbnQgeWV0IHdoZW4gcHJvY2Vzc2luZyB0aGUgcmVxdWVzdC4KIH0KQEAgLTY2Nywx MSArNjg5LDIxIEBAIFRFU1RfRihXS0NvbnRlbnRSdWxlTGlzdFN0b3JlVGVzdCwgUmVkaXJlY3Qp CiAgICAgW2NvbmZpZ3VyYXRpb24gc2V0VVJMU2NoZW1lSGFuZGxlcjpoYW5kbGVyLmdldCgpIGZv clVSTFNjaGVtZTpAInRlc3RzY2hlbWUiXTsKICAgICBbY29uZmlndXJhdGlvbiBzZXRVUkxTY2hl bWVIYW5kbGVyOmhhbmRsZXIuZ2V0KCkgZm9yVVJMU2NoZW1lOkAib3RoZXJ0ZXN0c2NoZW1lIl07 CiAgICAgYXV0byB3ZWJWaWV3ID0gYWRvcHROUyhbW1dLV2ViVmlldyBhbGxvY10gaW5pdFdpdGhG cmFtZTpOU1plcm9SZWN0IGNvbmZpZ3VyYXRpb246Y29uZmlndXJhdGlvbi5nZXQoKV0pOwotICAg IHdlYlZpZXcuZ2V0KCkubmF2aWdhdGlvbkRlbGVnYXRlID0gbmF2aWdhdGlvbkRlbGVnYXRlQWxs b3dpbmdBY3RpdmVBY3Rpb25zT25UZXN0SG9zdCgpLmdldCgpOworICAgIGF1dG8gZGVsZWdhdGUg PSBuYXZpZ2F0aW9uRGVsZWdhdGVBbGxvd2luZ0FjdGl2ZUFjdGlvbnNPblRlc3RIb3N0KCkuZ2V0 KCk7CisgICAgd2ViVmlldy5nZXQoKS5uYXZpZ2F0aW9uRGVsZWdhdGUgPSBkZWxlZ2F0ZTsKKyAg ICBfX2Jsb2NrIGJvb2wgcmVjZWl2ZWRBY3Rpb25Ob3RpZmljYXRpb24geyBmYWxzZSB9OworICAg IF9fYmxvY2sgVmVjdG9yPFN0cmluZz4gdXJsc0Zyb21DYWxsYmFjazsKKyAgICBkZWxlZ2F0ZS5j b250ZW50UnVsZUxpc3RQZXJmb3JtZWRBY3Rpb24gPSBeKFdLV2ViVmlldyAqLCBOU1N0cmluZyAq aWRlbnRpZmllciwgX1dLQ29udGVudFJ1bGVMaXN0QWN0aW9uICphY3Rpb24sIE5TVVJMICp1cmwp IHsKKyAgICAgICAgdXJsc0Zyb21DYWxsYmFjay5hcHBlbmQodXJsLmFic29sdXRlU3RyaW5nKTsK KyAgICAgICAgRVhQRUNUX1RSVUUoYWN0aW9uLnJlZGlyZWN0ZWQpOworICAgICAgICByZWNlaXZl ZEFjdGlvbk5vdGlmaWNhdGlvbiA9IHRydWU7CisgICAgfTsKKwogICAgIFt3ZWJWaWV3IGxvYWRS ZXF1ZXN0OltOU1VSTFJlcXVlc3QgcmVxdWVzdFdpdGhVUkw6W05TVVJMIFVSTFdpdGhTdHJpbmc6 QCJ0ZXN0c2NoZW1lOi8vdGVzdGhvc3QvbWFpbi5odG1sIl1dXTsKICAgICBUZXN0V2ViS2l0QVBJ OjpVdGlsOjpydW4oJnJlY2VpdmVkQWxsUmVxdWVzdHMpOworICAgIFRlc3RXZWJLaXRBUEk6OlV0 aWw6OnJ1bigmcmVjZWl2ZWRBY3Rpb25Ob3RpZmljYXRpb24pOwogCi0gICAgVmVjdG9yPGNvbnN0 IGNoYXIqPiBleHBlY3RlZFJlcXVlc3RlZFVSTHMgeworICAgIFZlY3RvcjxTdHJpbmc+IGV4cGVj dGVkUmVxdWVzdGVkVVJMcyB7CiAgICAgICAgICJ0ZXN0c2NoZW1lOi8vdGVzdGhvc3QvbWFpbi5o dG1sIiwKICAgICAgICAgIm90aGVydGVzdHNjaGVtZTovL25vdC10ZXN0aG9zdC8xLXJlZGlyZWN0 ZWQudHh0IiwKICAgICAgICAgInRlc3RzY2hlbWU6Ly9ub3QtdGVzdGhvc3Qtc2hvdWxkLW5vdC10 cmlnZ2VyLWFjdGlvbi8yLnR4dCIsCkBAIC02ODUsNiArNzE3LDEwIEBAIFRFU1RfRihXS0NvbnRl bnRSdWxlTGlzdFN0b3JlVGVzdCwgUmVkaXJlY3QpCiAgICAgRVhQRUNUX0VRKGV4cGVjdGVkUmVx dWVzdGVkVVJMcy5zaXplKCksIFt1cmxzIGNvdW50XSk7CiAgICAgZm9yIChzaXplX3QgaSA9IDA7 IGkgPCBleHBlY3RlZFJlcXVlc3RlZFVSTHMuc2l6ZSgpOyBpKyspCiAgICAgICAgIEVYUEVDVF9X S19TVFJFUShleHBlY3RlZFJlcXVlc3RlZFVSTHNbaV0sIFtbdXJscyBvYmplY3RBdEluZGV4Omld IGFic29sdXRlU3RyaW5nXSk7CisKKyAgICBleHBlY3RlZFJlcXVlc3RlZFVSTHMucmVtb3ZlKDAp OworICAgIGV4cGVjdGVkUmVxdWVzdGVkVVJMc1sxXSA9ICJ0ZXN0c2NoZW1lOi8vdGVzdGhvc3Q6 MTIzLzIudHh0IjsKKyAgICBjaGVja1VSTHModXJsc0Zyb21DYWxsYmFjaywgZXhwZWN0ZWRSZXF1 ZXN0ZWRVUkxzKTsKIH0KIAogVEVTVF9GKFdLQ29udGVudFJ1bGVMaXN0U3RvcmVUZXN0LCBOdWxs UGF0dGVyblNldCkKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvY29jb2EvVGVzdE5h dmlnYXRpb25EZWxlZ2F0ZS5oIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9jb2NvYS9UZXN0TmF2aWdh dGlvbkRlbGVnYXRlLmgKaW5kZXggZjhjMDJmOWJlMTFmMDBmMzZlYzlhZjMyNzI5ZjIzZTYwZGUx ZWQyZS4uYjcyN2RiYjU3NTU2MWRhYWJkNjBiYmUwYjMzNGQxYWYwYTdmY2FjNyAxMDA2NDQKLS0t IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9jb2NvYS9UZXN0TmF2aWdhdGlvbkRlbGVnYXRlLmgKKysr IGIvVG9vbHMvVGVzdFdlYktpdEFQSS9jb2NvYS9UZXN0TmF2aWdhdGlvbkRlbGVnYXRlLmgKQEAg LTI2LDYgKzI2LDggQEAKICNpbXBvcnQgPFdlYktpdC9XS05hdmlnYXRpb25EZWxlZ2F0ZVByaXZh dGUuaD4KICNpbXBvcnQgPFdlYktpdC9XZWJLaXQuaD4KIAorQGNsYXNzIF9XS0NvbnRlbnRSdWxl TGlzdEFjdGlvbjsKKwogQGludGVyZmFjZSBUZXN0TmF2aWdhdGlvbkRlbGVnYXRlIDogTlNPYmpl Y3QgPFdLTmF2aWdhdGlvbkRlbGVnYXRlPgogCiBAcHJvcGVydHkgKG5vbmF0b21pYywgY29weSkg dm9pZCAoXmRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb24pKFdLTmF2aWdhdGlvbkFjdGlv biAqLCB2b2lkICheKShXS05hdmlnYXRpb25BY3Rpb25Qb2xpY3kpKTsKQEAgLTM4LDYgKzQwLDcg QEAKIEBwcm9wZXJ0eSAobm9uYXRvbWljLCBjb3B5KSB2b2lkIChecmVuZGVyaW5nUHJvZ3Jlc3NE aWRDaGFuZ2UpKFdLV2ViVmlldyAqLCBfV0tSZW5kZXJpbmdQcm9ncmVzc0V2ZW50cyk7CiBAcHJv cGVydHkgKG5vbmF0b21pYywgY29weSkgdm9pZCAoXndlYkNvbnRlbnRQcm9jZXNzRGlkVGVybWlu YXRlKShXS1dlYlZpZXcgKik7CiBAcHJvcGVydHkgKG5vbmF0b21pYywgY29weSkgdm9pZCAoXmRp ZFJlY2VpdmVBdXRoZW50aWNhdGlvbkNoYWxsZW5nZSkoV0tXZWJWaWV3ICosIE5TVVJMQXV0aGVu dGljYXRpb25DaGFsbGVuZ2UgKiwgdm9pZCAoXikoTlNVUkxTZXNzaW9uQXV0aENoYWxsZW5nZURp c3Bvc2l0aW9uLCBOU1VSTENyZWRlbnRpYWwgKikpOworQHByb3BlcnR5IChub25hdG9taWMsIGNv cHkpIHZvaWQgKF5jb250ZW50UnVsZUxpc3RQZXJmb3JtZWRBY3Rpb24pKFdLV2ViVmlldyAqLCBO U1N0cmluZyAqLCBfV0tDb250ZW50UnVsZUxpc3RBY3Rpb24gKiwgTlNVUkwgKik7CiAKIC0gKHZv aWQpd2FpdEZvckRpZFN0YXJ0UHJvdmlzaW9uYWxOYXZpZ2F0aW9uOwogLSAodm9pZCl3YWl0Rm9y RGlkRmluaXNoTmF2aWdhdGlvbjsKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvY29j b2EvVGVzdE5hdmlnYXRpb25EZWxlZ2F0ZS5tbSBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvY29jb2Ev VGVzdE5hdmlnYXRpb25EZWxlZ2F0ZS5tbQppbmRleCBiYTkyNmM2NmU2YTM4MDQ2ZWQ0ZWQ1OTVi MGVkMGVkN2U1YmRjYjM0Li5mYTY3NDQzMGJlYTg3MWJmODUzYTNiN2NmMDE0NmU4MzdkM2Y5ZTg4 IDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL2NvY29hL1Rlc3ROYXZpZ2F0aW9uRGVs ZWdhdGUubW0KKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9jb2NvYS9UZXN0TmF2aWdhdGlvbkRl bGVnYXRlLm1tCkBAIC0xNjksNiArMTY5LDEyIEBACiAgICAgcmV0dXJuIF9uYXZpZ2F0aW9uRXJy b3IuYXV0b3JlbGVhc2UoKTsKIH0KIAorLSAodm9pZClfd2ViVmlldzooV0tXZWJWaWV3ICopd2Vi VmlldyBjb250ZW50UnVsZUxpc3RXaXRoSWRlbnRpZmllcjooTlNTdHJpbmcgKilpZGVudGlmaWVy IHBlcmZvcm1lZEFjdGlvbjooX1dLQ29udGVudFJ1bGVMaXN0QWN0aW9uICopYWN0aW9uIGZvclVS TDooTlNVUkwgKil1cmwKK3sKKyAgICBpZiAoX2NvbnRlbnRSdWxlTGlzdFBlcmZvcm1lZEFjdGlv bikKKyAgICAgICAgX2NvbnRlbnRSdWxlTGlzdFBlcmZvcm1lZEFjdGlvbih3ZWJWaWV3LCBpZGVu dGlmaWVyLCBhY3Rpb24sIHVybCk7Cit9CisKIEBlbmQKIAogQGltcGxlbWVudGF0aW9uIFdLV2Vi VmlldyAoVGVzdFdlYktpdEFQSUV4dHJhcykK