238603 2022-03-31 05:44:13 -0700 Remove Notification::m_relatedNotificationIdentifier 2022-04-06 00:06:35 -0700 1 1 1 Unclassified WebKit Service Workers WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 youennf youennf beidson webkit-bug-importer oldest_to_newest 1856778 0 youennf 2022-03-31 05:44:13 -0700 Remove Notification::m_relatedNotificationIdentifier 1856786 1 456231 youennf 2022-03-31 06:24:33 -0700 Created attachment 456231 Patch 1857214 2 456341 youennf 2022-04-01 02:49:37 -0700 Created attachment 456341 Patch 1857259 3 456359 youennf 2022-04-01 07:38:17 -0700 Created attachment 456359 Patch 1857266 4 webkit-bug-importer 2022-04-01 08:03:42 -0700 <rdar://problem/91162413> 1858701 5 ews-feeder 2022-04-06 00:06:33 -0700 Committed r292451 (249302@main): <https://commits.webkit.org/249302@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 456359. 456231 2022-03-31 06:24:33 -0700 2022-04-01 02:49:32 -0700 Patch bug-238603-20220331152432.patch text/plain 9669 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjkyMTQzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWYzZGIyNzczNTQ0ZjQ0 N2I2OGIzNjM2YjEwMDg1N2U5ZTE0MDA1My4uZDg2MDM0NTQyMjI5OTE2NjAxNDVhMDYxMzljMDBj NDNmMGE4ZjcxMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDIyLTAzLTMxICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBSZW1vdmUgTm90aWZpY2F0 aW9uOjptX3JlbGF0ZWROb3RpZmljYXRpb25JZGVudGlmaWVyCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzg2MDMKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBtX3JlbGF0ZWROb3RpZmljYXRpb25JZGVudGlm aWVyIHdhcyBhZGRlZCBhcyBhIHRlbXBvcmFyeSB3b3JrYXJvdW5kIGZvciBwZXJzaXN0ZW50IG5v dGlmaWNhdGlvbnMgdGhhdCBhcmUgcmVjcmVhdGVkIGluIG90aGVyIGNvbnRleHRzLgorICAgICAg ICBUbyBkaXJlY3RseSBzdXBwb3J0IHRoaXMgY2FzZSwgTm90aWZpY2F0aW9uIGlzIG5vIGxvbmdl ciBhIElkZW50aWZpZWQ8VVVJRD4gYW5kIGluc3RlYWQgaGFzIGEgbV9pZGVudGlmaWVyLgorICAg ICAgICBXaGVuIGNyZWF0ZWQgZnJvbSBKUywgTm90aWZpY2F0aW9uOjptX2lkZW50aWZpZXIgaXMg Z2VuZXJhdGVkLgorICAgICAgICBXaGVuIGNyZWF0ZWQgZnJvbSBOb3RpZmljYXRpb25EYXRhLCBO b3RpZmljYXRpb246Om1faWRlbnRpZmllciBpcyBjb3BpZWQgZnJvbSBOb3RpZmljYXRpb25EYXRh LgorICAgICAgICBXZSBzdGlsbCBoYXZlIHRvIGludHJvZHVjZSBOb3RpZmljYXRpb246Om1faXND cmVhdGVkQnlDb250ZXh0IHRvIGRpZmZlcmVudGlhdGUgYmV0d2VlbiBOb3RpZmljYXRpb25zIHdo b3NlIFVVSUQgaXMgY3JlYXRlZCBpbiB0aGlzIGNvbnRleHQKKyAgICAgICAgZnJvbSBvdGhlciBO b3RpZmljYXRpb25zIHNvIHRoYXQgd2UgY2FuIHNhZmVseSByZW1vdmUgdGhlbSBmcm9tIFdlYk5v dGlmaWNhdGlvbk1hbmFnZXIgbV9ub3RpZmljYXRpb25JRE1hcC4KKworICAgICAgICBBIGZvbGxv dy11cCBwYXRjaCB3aWxsIGFsbG93IHRvIGRpZmZlcmVudGlhdGUgcGVyc2lzdGVudCBmcm9uIG5v bi1wZXJzaXN0ZW50IE5vdGlmaWNhdGlvbi4KKyAgICAgICAgQXQgdGhpcyBwb2ludCwgd2Ugd2ls bCBiZSBhYmxlIHRvIG5vIGxvbmdlciBzdG9yZSBwZXJzaXN0ZW50IE5vdGlmaWNhdGlvbnMgaW4g bV9ub3RpZmljYXRpb25JRE1hcCwgd2hpY2ggd2lsbCBhbGxvdyByZW1vdmluZyBtX2lzQ3JlYXRl ZEJ5Q29udGV4dC4KKworICAgICAgICBDb3ZlcmVkIGJ5IGV4aXN0aW5nIHRlc3RzLgorCisgICAg ICAgICogTW9kdWxlcy9ub3RpZmljYXRpb25zL05vdGlmaWNhdGlvbi5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpOb3RpZmljYXRpb246OmNyZWF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpOb3RpZmlj YXRpb246Ok5vdGlmaWNhdGlvbik6CisgICAgICAgICogTW9kdWxlcy9ub3RpZmljYXRpb25zL05v dGlmaWNhdGlvbi5oOgorCiAyMDIyLTAzLTMxICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxl LmNvbT4KIAogICAgICAgICBTZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9uLmdldE5vdGlmaWNhdGlv bnMgc2hvdWxkIGxpc3QgYWxsIHBlcnNpc3RlbnQgbm90aWZpY2F0aW9ucwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCAw NTc0NTgxZjVmOGQ3N2JhZjZmMDBlZWM1YmI4MWZhMGFkOGE5M2JlLi4zNTI4N2JhNmQ2ODBmOGUw OTg0NmM5ODkxN2VkMTA3M2VmN2U0M2UzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5n ZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIy LTAzLTMxICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBSZW1v dmUgTm90aWZpY2F0aW9uOjptX3JlbGF0ZWROb3RpZmljYXRpb25JZGVudGlmaWVyCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzg2MDMKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBEaXJlY3RseSB1c2UgaWRl bnRpZmllciBub3cgdGhhdCB3ZSBjb3JyZWN0bHkgcmV1c2UgdGhlbSB3aGVuIG5lZWRlZC4KKwor ICAgICAgICAqIFdlYlByb2Nlc3MvTm90aWZpY2F0aW9ucy9XZWJOb3RpZmljYXRpb25NYW5hZ2Vy LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViTm90aWZpY2F0aW9uTWFuYWdlcjo6Y2FuY2VsKToK KyAgICAgICAgKFdlYktpdDo6V2ViTm90aWZpY2F0aW9uTWFuYWdlcjo6ZGlkRGVzdHJveU5vdGlm aWNhdGlvbik6CisKIDIwMjItMDMtMzEgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29t PgogCiAgICAgICAgIFNlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb24uZ2V0Tm90aWZpY2F0aW9ucyBz aG91bGQgbGlzdCBhbGwgcGVyc2lzdGVudCBub3RpZmljYXRpb25zCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9Nb2R1bGVzL25vdGlmaWNhdGlvbnMvTm90aWZpY2F0aW9uLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL01vZHVsZXMvbm90aWZpY2F0aW9ucy9Ob3RpZmljYXRpb24uY3BwCmluZGV4IDBk OWU0NzE2Y2JhMjhlOTE3MDFlYTM5YTI5Zjc1MDVkZGZiZWUzNjkuLjlmYjBlMjdkNjI0NTU5Nzc0 MjZhOGExYzI0NjEzYmY5MTEzNGZlNjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVs ZXMvbm90aWZpY2F0aW9ucy9Ob3RpZmljYXRpb24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01v ZHVsZXMvbm90aWZpY2F0aW9ucy9Ob3RpZmljYXRpb24uY3BwCkBAIC01NSw3ICs1NSw3IEBAIFdU Rl9NQUtFX0lTT19BTExPQ0FURURfSU1QTChOb3RpZmljYXRpb24pOwogCiBSZWY8Tm90aWZpY2F0 aW9uPiBOb3RpZmljYXRpb246OmNyZWF0ZShTY3JpcHRFeGVjdXRpb25Db250ZXh0JiBjb250ZXh0 LCBTdHJpbmcmJiB0aXRsZSwgT3B0aW9ucyYmIG9wdGlvbnMpCiB7Ci0gICAgYXV0byBub3RpZmlj YXRpb24gPSBhZG9wdFJlZigqbmV3IE5vdGlmaWNhdGlvbihjb250ZXh0LCBXVEZNb3ZlKHRpdGxl KSwgV1RGTW92ZShvcHRpb25zKSkpOworICAgIGF1dG8gbm90aWZpY2F0aW9uID0gYWRvcHRSZWYo Km5ldyBOb3RpZmljYXRpb24oY29udGV4dCwgVVVJRDo6Y3JlYXRlVmVyc2lvbjQoKSwgV1RGTW92 ZSh0aXRsZSksIFdURk1vdmUob3B0aW9ucykpKTsKICAgICBub3RpZmljYXRpb24tPnN1c3BlbmRJ Zk5lZWRlZCgpOwogICAgIG5vdGlmaWNhdGlvbi0+c2hvd1Nvb24oKTsKICAgICByZXR1cm4gbm90 aWZpY2F0aW9uOwpAQCAtNjQsMTQgKzY0LDE1IEBAIFJlZjxOb3RpZmljYXRpb24+IE5vdGlmaWNh dGlvbjo6Y3JlYXRlKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQmIGNvbnRleHQsIFN0cmluZyYmCiBS ZWY8Tm90aWZpY2F0aW9uPiBOb3RpZmljYXRpb246OmNyZWF0ZShTY3JpcHRFeGVjdXRpb25Db250 ZXh0JiBjb250ZXh0LCBOb3RpZmljYXRpb25EYXRhJiYgZGF0YSkKIHsKICAgICBPcHRpb25zIG9w dGlvbnMgeyBkYXRhLmRpcmVjdGlvbiwgV1RGTW92ZShkYXRhLmxhbmd1YWdlKSwgV1RGTW92ZShk YXRhLmJvZHkpLCBXVEZNb3ZlKGRhdGEudGFnKSwgV1RGTW92ZShkYXRhLmljb25VUkwpIH07Ci0g ICAgYXV0byBub3RpZmljYXRpb24gPSBhZG9wdFJlZigqbmV3IE5vdGlmaWNhdGlvbihjb250ZXh0 LCBXVEZNb3ZlKGRhdGEudGl0bGUpLCBXVEZNb3ZlKG9wdGlvbnMpKSk7CisgICAgYXV0byBub3Rp ZmljYXRpb24gPSBhZG9wdFJlZigqbmV3IE5vdGlmaWNhdGlvbihjb250ZXh0LCBkYXRhLm5vdGlm aWNhdGlvbklELCBXVEZNb3ZlKGRhdGEudGl0bGUpLCBXVEZNb3ZlKG9wdGlvbnMpKSk7CisgICAg bm90aWZpY2F0aW9uLT5tX2lzQ3JlYXRlZEJ5Q29udGV4dCA9IGZhbHNlOwogICAgIG5vdGlmaWNh dGlvbi0+c3VzcGVuZElmTmVlZGVkKCk7Ci0gICAgbm90aWZpY2F0aW9uLT5tX3JlbGF0ZWROb3Rp ZmljYXRpb25JZGVudGlmaWVyID0gZGF0YS5ub3RpZmljYXRpb25JRDsKICAgICByZXR1cm4gbm90 aWZpY2F0aW9uOwogfQogCi1Ob3RpZmljYXRpb246Ok5vdGlmaWNhdGlvbihTY3JpcHRFeGVjdXRp b25Db250ZXh0JiBjb250ZXh0LCBTdHJpbmcmJiB0aXRsZSwgT3B0aW9ucyYmIG9wdGlvbnMpCitO b3RpZmljYXRpb246Ok5vdGlmaWNhdGlvbihTY3JpcHRFeGVjdXRpb25Db250ZXh0JiBjb250ZXh0 LCBVVUlEIGlkZW50aWZpZXIsIFN0cmluZyYmIHRpdGxlLCBPcHRpb25zJiYgb3B0aW9ucykKICAg ICA6IEFjdGl2ZURPTU9iamVjdCgmY29udGV4dCkKKyAgICAsIG1faWRlbnRpZmllcihpZGVudGlm aWVyKQogICAgICwgbV90aXRsZShXVEZNb3ZlKHRpdGxlKS5pc29sYXRlZENvcHkoKSkKICAgICAs IG1fZGlyZWN0aW9uKG9wdGlvbnMuZGlyKQogICAgICwgbV9sYW5nKFdURk1vdmUob3B0aW9ucy5s YW5nKS5pc29sYXRlZENvcHkoKSkKQEAgLTk2LDYgKzk3LDcgQEAgTm90aWZpY2F0aW9uOjpOb3Rp ZmljYXRpb24oU2NyaXB0RXhlY3V0aW9uQ29udGV4dCYgY29udGV4dCwgU3RyaW5nJiYgdGl0bGUs IE9wdGkKIAogTm90aWZpY2F0aW9uOjpOb3RpZmljYXRpb24oY29uc3QgTm90aWZpY2F0aW9uJiBv dGhlcikKICAgICA6IEFjdGl2ZURPTU9iamVjdChvdGhlci5zY3JpcHRFeGVjdXRpb25Db250ZXh0 KCkpCisgICAgLCBtX2lkZW50aWZpZXIob3RoZXIubV9pZGVudGlmaWVyKQogICAgICwgbV90aXRs ZShvdGhlci5tX3RpdGxlLmlzb2xhdGVkQ29weSgpKQogICAgICwgbV9kaXJlY3Rpb24ob3RoZXIu bV9kaXJlY3Rpb24pCiAgICAgLCBtX2xhbmcob3RoZXIubV9sYW5nLmlzb2xhdGVkQ29weSgpKQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9ub3RpZmljYXRpb25zL05vdGlmaWNh dGlvbi5oIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9ub3RpZmljYXRpb25zL05vdGlmaWNhdGlv bi5oCmluZGV4IGNmNjM0NDcxMmQ0YjU5OTNmY2MwNjgyZGY0NjE0ODc2M2VjMjc0MzguLjg2N2Y1 OTQ3ZjRmMjBhOGMzMGQwZWFhNTkxYTI5ZGIxNzYzMWZkMWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL01vZHVsZXMvbm90aWZpY2F0aW9ucy9Ob3RpZmljYXRpb24uaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9Nb2R1bGVzL25vdGlmaWNhdGlvbnMvTm90aWZpY2F0aW9uLmgKQEAgLTM4LDggKzM4 LDggQEAKICNpbmNsdWRlICJOb3RpZmljYXRpb25EaXJlY3Rpb24uaCIKICNpbmNsdWRlICJOb3Rp ZmljYXRpb25QZXJtaXNzaW9uLmgiCiAjaW5jbHVkZSAiU2NyaXB0RXhlY3V0aW9uQ29udGV4dElk ZW50aWZpZXIuaCIKLSNpbmNsdWRlIDx3dGYvSWRlbnRpZmllZC5oPgogI2luY2x1ZGUgPHd0Zi9V UkwuaD4KKyNpbmNsdWRlIDx3dGYvVVVJRC5oPgogI2luY2x1ZGUgIldyaXRpbmdNb2RlLmgiCiAK IG5hbWVzcGFjZSBXZWJDb3JlIHsKQEAgLTUxLDcgKzUxLDcgQEAgY2xhc3MgTm90aWZpY2F0aW9u UGVybWlzc2lvbkNhbGxiYWNrOwogCiBzdHJ1Y3QgTm90aWZpY2F0aW9uRGF0YTsKIAotY2xhc3Mg Tm90aWZpY2F0aW9uIGZpbmFsIDogcHVibGljIFRocmVhZFNhZmVSZWZDb3VudGVkPE5vdGlmaWNh dGlvbj4sIHB1YmxpYyBBY3RpdmVET01PYmplY3QsIHB1YmxpYyBFdmVudFRhcmdldFdpdGhJbmxp bmVEYXRhLCBwdWJsaWMgVVVJRElkZW50aWZpZWQ8Tm90aWZpY2F0aW9uPiB7CitjbGFzcyBOb3Rp ZmljYXRpb24gZmluYWwgOiBwdWJsaWMgVGhyZWFkU2FmZVJlZkNvdW50ZWQ8Tm90aWZpY2F0aW9u PiwgcHVibGljIEFjdGl2ZURPTU9iamVjdCwgcHVibGljIEV2ZW50VGFyZ2V0V2l0aElubGluZURh dGEgewogICAgIFdURl9NQUtFX0lTT19BTExPQ0FURURfRVhQT1JUKE5vdGlmaWNhdGlvbiwgV0VC Q09SRV9FWFBPUlQpOwogcHVibGljOgogICAgIHVzaW5nIFBlcm1pc3Npb24gPSBOb3RpZmljYXRp b25QZXJtaXNzaW9uOwpAQCAtMTAzLDEwICsxMDMsMTIgQEAgcHVibGljOgogICAgIHZvaWQgbWFy a0FzU2hvd24oKTsKICAgICB2b2lkIHNob3dTb29uKCk7CiAKLSAgICBzdGQ6Om9wdGlvbmFsPFVV SUQ+IHJlbGF0ZWROb3RpZmljYXRpb25JZGVudGlmaWVyKCkgY29uc3QgeyByZXR1cm4gbV9yZWxh dGVkTm90aWZpY2F0aW9uSWRlbnRpZmllcjsgfQorICAgIFVVSUQgaWRlbnRpZmllcigpIGNvbnN0 IHsgcmV0dXJuIG1faWRlbnRpZmllcjsgfQorCisgICAgYm9vbCBpc0NyZWF0ZWRCeUNvbnRleHQo KSBjb25zdCB7IHJldHVybiBtX2lzQ3JlYXRlZEJ5Q29udGV4dDsgfQogCiBwcml2YXRlOgotICAg IE5vdGlmaWNhdGlvbihTY3JpcHRFeGVjdXRpb25Db250ZXh0JiwgU3RyaW5nJiYgdGl0bGUsIE9w dGlvbnMmJik7CisgICAgTm90aWZpY2F0aW9uKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQmLCBVVUlE LCBTdHJpbmcmJiB0aXRsZSwgT3B0aW9ucyYmKTsKICAgICBOb3RpZmljYXRpb24oY29uc3QgTm90 aWZpY2F0aW9uJik7CiAKICAgICBOb3RpZmljYXRpb25DbGllbnQqIGNsaWVudEZyb21Db250ZXh0 KCk7CkBAIC0xMjMsNiArMTI1LDggQEAgcHJpdmF0ZToKICAgICB2b2lkIGRlcmVmRXZlbnRUYXJn ZXQoKSBmaW5hbCB7IGRlcmVmKCk7IH0KICAgICB2b2lkIGV2ZW50TGlzdGVuZXJzRGlkQ2hhbmdl KCkgZmluYWw7CiAKKyAgICBVVUlEIG1faWRlbnRpZmllcjsKKwogICAgIFN0cmluZyBtX3RpdGxl OwogICAgIERpcmVjdGlvbiBtX2RpcmVjdGlvbjsKICAgICBTdHJpbmcgbV9sYW5nOwpAQCAtMTQw LDcgKzE0NCw3IEBAIHByaXZhdGU6CiAgICAgfTsKICAgICBOb3RpZmljYXRpb25Tb3VyY2UgbV9u b3RpZmljYXRpb25Tb3VyY2U7CiAgICAgU2NyaXB0RXhlY3V0aW9uQ29udGV4dElkZW50aWZpZXIg bV9jb250ZXh0SWRlbnRpZmllcjsKLSAgICBzdGQ6Om9wdGlvbmFsPFVVSUQ+IG1fcmVsYXRlZE5v dGlmaWNhdGlvbklkZW50aWZpZXI7CisgICAgYm9vbCBtX2lzQ3JlYXRlZEJ5Q29udGV4dCB7IHRy dWUgfTsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvV2ViUHJvY2Vzcy9Ob3RpZmljYXRpb25zL1dlYk5vdGlmaWNhdGlvbk1hbmFnZXIuY3Bw IGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL05vdGlmaWNhdGlvbnMvV2ViTm90aWZpY2F0aW9u TWFuYWdlci5jcHAKaW5kZXggN2JiYjUwZTE0MjcyNzBlZDAyNGNkOTA2NTI2YWMyYzRiNjQwNjkw Ni4uODdhNjNmMTQ3N2VmM2MxMjcwZDAwMTA4NTk1YmM0ZDEyMTE0YTRiMCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9XZWJQcm9jZXNzL05vdGlmaWNhdGlvbnMvV2ViTm90aWZpY2F0aW9uTWFu YWdlci5jcHAKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL05vdGlmaWNhdGlvbnMvV2Vi Tm90aWZpY2F0aW9uTWFuYWdlci5jcHAKQEAgLTE2MCw2ICsxNjAsNyBAQCBib29sIFdlYk5vdGlm aWNhdGlvbk1hbmFnZXI6OnNob3coTm90aWZpY2F0aW9uJiBub3RpZmljYXRpb24sIFdlYlBhZ2Uq IHBhZ2UpCiAgICAgaWYgKCFzZW5kTm90aWZpY2F0aW9uTWVzc2FnZShNZXNzYWdlczo6Tm90aWZp Y2F0aW9uTWFuYWdlck1lc3NhZ2VIYW5kbGVyOjpTaG93Tm90aWZpY2F0aW9uKG5vdGlmaWNhdGlv bi5kYXRhKCkpLCBub3RpZmljYXRpb24sIHBhZ2UpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAK KyAgICBBU1NFUlQoIW1fbm90aWZpY2F0aW9uSURNYXAuY29udGFpbnMobm90aWZpY2F0aW9uLmlk ZW50aWZpZXIoKSkpOwogICAgIG1fbm90aWZpY2F0aW9uSURNYXAuYWRkKG5vdGlmaWNhdGlvbi5p ZGVudGlmaWVyKCksICZub3RpZmljYXRpb24pOwogICAgIHJldHVybiB0cnVlOwogI2Vsc2UKQEAg LTE3NSwxNCArMTc2LDcgQEAgdm9pZCBXZWJOb3RpZmljYXRpb25NYW5hZ2VyOjpjYW5jZWwoTm90 aWZpY2F0aW9uJiBub3RpZmljYXRpb24sIFdlYlBhZ2UqIHBhZ2UpCiAKICNpZiBFTkFCTEUoTk9U SUZJQ0FUSU9OUykKICAgICBhdXRvIGlkZW50aWZpZXIgPSBub3RpZmljYXRpb24uaWRlbnRpZmll cigpOwotICAgIGF1dG8gbWFwcGVkTm90aWZpY2F0aW9uID0gbV9ub3RpZmljYXRpb25JRE1hcC5n ZXQoaWRlbnRpZmllcik7Ci0gICAgaWYgKCFtYXBwZWROb3RpZmljYXRpb24pIHsKLSAgICAgICAg YXV0byByZWxhdGVkSWRlbnRpZmllciA9IG5vdGlmaWNhdGlvbi5yZWxhdGVkTm90aWZpY2F0aW9u SWRlbnRpZmllcigpOwotICAgICAgICBpZiAoIXJlbGF0ZWRJZGVudGlmaWVyKQotICAgICAgICAg ICAgcmV0dXJuOwotICAgICAgICBpZGVudGlmaWVyID0gKnJlbGF0ZWRJZGVudGlmaWVyOwotICAg IH0gZWxzZQotICAgICAgICBBU1NFUlQobWFwcGVkTm90aWZpY2F0aW9uID09ICZub3RpZmljYXRp b24pOworICAgIEFTU0VSVCghbV9ub3RpZmljYXRpb25JRE1hcC5jb250YWlucyhpZGVudGlmaWVy KSB8fCBtX25vdGlmaWNhdGlvbklETWFwLmdldChpZGVudGlmaWVyKSA9PSAmbm90aWZpY2F0aW9u IHx8ICFub3RpZmljYXRpb24uaXNDcmVhdGVkQnlDb250ZXh0KCkpOwogCiAgICAgaWYgKCFzZW5k Tm90aWZpY2F0aW9uTWVzc2FnZShNZXNzYWdlczo6Tm90aWZpY2F0aW9uTWFuYWdlck1lc3NhZ2VI YW5kbGVyOjpDYW5jZWxOb3RpZmljYXRpb24oaWRlbnRpZmllciksIG5vdGlmaWNhdGlvbiwgcGFn ZSkpCiAgICAgICAgIHJldHVybjsKQEAgLTIwMCwxNCArMTk0LDggQEAgdm9pZCBXZWJOb3RpZmlj YXRpb25NYW5hZ2VyOjpkaWREZXN0cm95Tm90aWZpY2F0aW9uKE5vdGlmaWNhdGlvbiYgbm90aWZp Y2F0aW9uLAogICAgIFJlZiBwcm90ZWN0ZWROb3RpZmljYXRpb24geyBub3RpZmljYXRpb24gfTsK IAogICAgIGF1dG8gaWRlbnRpZmllciA9IG5vdGlmaWNhdGlvbi5pZGVudGlmaWVyKCk7Ci0gICAg YXV0byB0YWtlbk5vdGlmaWNhdGlvbiA9IG1fbm90aWZpY2F0aW9uSURNYXAudGFrZShpZGVudGlm aWVyKTsKLSAgICBpZiAoIXRha2VuTm90aWZpY2F0aW9uKSB7Ci0gICAgICAgIGF1dG8gcmVsYXRl ZElkZW50aWZpZXIgPSBub3RpZmljYXRpb24ucmVsYXRlZE5vdGlmaWNhdGlvbklkZW50aWZpZXIo KTsKLSAgICAgICAgaWYgKCFyZWxhdGVkSWRlbnRpZmllcikKLSAgICAgICAgICAgIHJldHVybjsK LSAgICAgICAgaWRlbnRpZmllciA9ICpyZWxhdGVkSWRlbnRpZmllcjsKLSAgICB9IGVsc2UKLSAg ICAgICAgQVNTRVJUKHRha2VuTm90aWZpY2F0aW9uID09ICZub3RpZmljYXRpb24pOworICAgIFJl ZlB0ciB0YWtlbk5vdGlmaWNhdGlvbiA9IG5vdGlmaWNhdGlvbi5pc0NyZWF0ZWRCeUNvbnRleHQo KSA/IG1fbm90aWZpY2F0aW9uSURNYXAudGFrZShpZGVudGlmaWVyKSA6IG51bGxwdHI7CisgICAg QVNTRVJUKCF0YWtlbk5vdGlmaWNhdGlvbiAgfHwgdGFrZW5Ob3RpZmljYXRpb24gPT0gJm5vdGlm aWNhdGlvbik7CiAKICAgICBzZW5kTm90aWZpY2F0aW9uTWVzc2FnZShNZXNzYWdlczo6Tm90aWZp Y2F0aW9uTWFuYWdlck1lc3NhZ2VIYW5kbGVyOjpEaWREZXN0cm95Tm90aWZpY2F0aW9uKGlkZW50 aWZpZXIpLCBub3RpZmljYXRpb24sIHBhZ2UpOwogI2Vsc2UK 456341 2022-04-01 02:49:37 -0700 2022-04-01 07:38:13 -0700 Patch bug-238603-20220401114935.patch text/plain 14597 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjkyMTYwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjlmMTllM2Q1ZmE5NzBl ZGE1ZWRkMmQ0ZjZhYmJmMzNiNjYyZWU1NC4uZWFmZTA5OTdlZGEzNzkzMzliZmRiZWU4ZGVmZTNh M2QyZjk5MWRhZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIyLTA0LTAxICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBSZW1vdmUgTm90aWZpY2F0 aW9uOjptX3JlbGF0ZWROb3RpZmljYXRpb25JZGVudGlmaWVyCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzg2MDMKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBtX3JlbGF0ZWROb3RpZmljYXRpb25JZGVudGlm aWVyIHdhcyBhZGRlZCBhcyBhIHRlbXBvcmFyeSB3b3JrYXJvdW5kIGZvciBwZXJzaXN0ZW50IG5v dGlmaWNhdGlvbnMgdGhhdCBhcmUgcmVjcmVhdGVkIGluIG90aGVyIGNvbnRleHRzLgorICAgICAg ICBUbyBkaXJlY3RseSBzdXBwb3J0IHRoaXMgY2FzZSwgTm90aWZpY2F0aW9uIGlzIG5vIGxvbmdl ciBhIElkZW50aWZpZWQ8VVVJRD4gYW5kIGluc3RlYWQgaGFzIGEgbV9pZGVudGlmaWVyLgorICAg ICAgICBXaGVuIGNyZWF0ZWQgZnJvbSBKUywgTm90aWZpY2F0aW9uOjptX2lkZW50aWZpZXIgaXMg Z2VuZXJhdGVkLgorICAgICAgICBXaGVuIGNyZWF0ZWQgZnJvbSBOb3RpZmljYXRpb25EYXRhLCBO b3RpZmljYXRpb246Om1faWRlbnRpZmllciBpcyBjb3BpZWQgZnJvbSBOb3RpZmljYXRpb25EYXRh LgorCisgICAgICAgIENvdmVyZWQgYnkgZXhpc3RpbmcgdGVzdHMuCisKKyAgICAgICAgKiBNb2R1 bGVzL25vdGlmaWNhdGlvbnMvTm90aWZpY2F0aW9uLmNwcDoKKyAgICAgICAgKiBNb2R1bGVzL25v dGlmaWNhdGlvbnMvTm90aWZpY2F0aW9uLmg6CisKIDIwMjItMDQtMDEgIFlvdWVubiBGYWJsZXQg IDx5b3Vlbm5AYXBwbGUuY29tPgogCiAgICAgICAgIFNlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb24u Z2V0Tm90aWZpY2F0aW9ucyBzaG91bGQgbGlzdCBhbGwgcGVyc2lzdGVudCBub3RpZmljYXRpb25z CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hh bmdlTG9nCmluZGV4IDc1ZjhlOGMzNjk1YTFlZDFmZWY2YTBiM2VlMzdmNDMzNGQ3OTVmZmEuLmY3 ODA3Njg5ODc1MDA1Zjk4NjYwNzQ0ZGIzMGIwN2EwZTExYTQ0OTIgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMTYgQEAKKzIwMjItMDQtMDEgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgor CisgICAgICAgIFJlbW92ZSBOb3RpZmljYXRpb246Om1fcmVsYXRlZE5vdGlmaWNhdGlvbklkZW50 aWZpZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIz ODYwMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIERp cmVjdGx5IHVzZSBpZGVudGlmaWVyIG5vdyB0aGF0IHdlIGNvcnJlY3RseSByZXVzZSB0aGVtIHdo ZW4gbmVlZGVkLgorICAgICAgICBXZSBubyBsb25nZXIgc3RvcmUgcGVyc2lzdGVudCBub3RpZmlj YXRpb25zIGluIHRoZSBtYXAgc2luY2Ugd2UgZG8gbm90IHVzZSB0aGUgbWFwIGZvciBjbGljay9j bG9zZSBldmVudHMuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL05vdGlmaWNhdGlvbnMvV2ViTm90 aWZpY2F0aW9uTWFuYWdlci5jcHA6CisgICAgICAgICogV2ViUHJvY2Vzcy9Ob3RpZmljYXRpb25z L1dlYk5vdGlmaWNhdGlvbk1hbmFnZXIuaDoKKwogMjAyMi0wNC0wMSAgWW91ZW5uIEZhYmxldCAg PHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgU2VydmljZVdvcmtlclJlZ2lzdHJhdGlvbi5n ZXROb3RpZmljYXRpb25zIHNob3VsZCBsaXN0IGFsbCBwZXJzaXN0ZW50IG5vdGlmaWNhdGlvbnMK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbm90aWZpY2F0aW9ucy9Ob3RpZmlj YXRpb24uY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9ub3RpZmljYXRpb25zL05vdGlmaWNh dGlvbi5jcHAKaW5kZXggNTEzOGI1MjUxOWE1OWRkOWU2NWViNDIzMzY2ZDI3NjE4ZjM4MmI2ZS4u MDAzMjRmNDNkMjYyMjAxNmJlZmY4ZmE1OTAzMjU5YjdiODI1MTcyYSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvTW9kdWxlcy9ub3RpZmljYXRpb25zL05vdGlmaWNhdGlvbi5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvTW9kdWxlcy9ub3RpZmljYXRpb25zL05vdGlmaWNhdGlvbi5jcHAKQEAg LTU4LDcgKzU4LDcgQEAgRXhjZXB0aW9uT3I8UmVmPE5vdGlmaWNhdGlvbj4+IE5vdGlmaWNhdGlv bjo6Y3JlYXRlKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQmIGNvbnQKICAgICBpZiAoY29udGV4dC5p c1NlcnZpY2VXb3JrZXJHbG9iYWxTY29wZSgpKQogICAgICAgICByZXR1cm4gRXhjZXB0aW9uIHsg VHlwZUVycm9yLCAiTm90aWZpY2F0aW9uIGNhbm5vdCBiZSBkaXJlY3RseSBjcmVhdGVkIGluIGEg U2VydmljZVdvcmtlckdsb2JhbFNjb3BlIl9zIH07CiAKLSAgICBhdXRvIG5vdGlmaWNhdGlvbiA9 IGFkb3B0UmVmKCpuZXcgTm90aWZpY2F0aW9uKGNvbnRleHQsIFdURk1vdmUodGl0bGUpLCBXVEZN b3ZlKG9wdGlvbnMpKSk7CisgICAgYXV0byBub3RpZmljYXRpb24gPSBhZG9wdFJlZigqbmV3IE5v dGlmaWNhdGlvbihjb250ZXh0LCBVVUlEOjpjcmVhdGVWZXJzaW9uNCgpLCBXVEZNb3ZlKHRpdGxl KSwgV1RGTW92ZShvcHRpb25zKSkpOwogICAgIG5vdGlmaWNhdGlvbi0+c3VzcGVuZElmTmVlZGVk KCk7CiAgICAgbm90aWZpY2F0aW9uLT5zaG93U29vbigpOwogICAgIHJldHVybiBub3RpZmljYXRp b247CkBAIC02Niw3ICs2Niw3IEBAIEV4Y2VwdGlvbk9yPFJlZjxOb3RpZmljYXRpb24+PiBOb3Rp ZmljYXRpb246OmNyZWF0ZShTY3JpcHRFeGVjdXRpb25Db250ZXh0JiBjb250CiAKIFJlZjxOb3Rp ZmljYXRpb24+IE5vdGlmaWNhdGlvbjo6Y3JlYXRlRm9yU2VydmljZVdvcmtlcihTY3JpcHRFeGVj dXRpb25Db250ZXh0JiBjb250ZXh0LCBTdHJpbmcmJiB0aXRsZSwgT3B0aW9ucyYmIG9wdGlvbnMs IGNvbnN0IFVSTCYgc2VydmljZVdvcmtlclJlZ2lzdHJhdGlvblVSTCkKIHsKLSAgICBhdXRvIG5v dGlmaWNhdGlvbiA9IGFkb3B0UmVmKCpuZXcgTm90aWZpY2F0aW9uKGNvbnRleHQsIFdURk1vdmUo dGl0bGUpLCBXVEZNb3ZlKG9wdGlvbnMpKSk7CisgICAgYXV0byBub3RpZmljYXRpb24gPSBhZG9w dFJlZigqbmV3IE5vdGlmaWNhdGlvbihjb250ZXh0LCBVVUlEOjpjcmVhdGVWZXJzaW9uNCgpLCBX VEZNb3ZlKHRpdGxlKSwgV1RGTW92ZShvcHRpb25zKSkpOwogICAgIG5vdGlmaWNhdGlvbi0+bV9z ZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9uVVJMID0gc2VydmljZVdvcmtlclJlZ2lzdHJhdGlvblVS TDsKICAgICBub3RpZmljYXRpb24tPnN1c3BlbmRJZk5lZWRlZCgpOwogICAgIHJldHVybiBub3Rp ZmljYXRpb247CkBAIC03NSwxNSArNzUsMTUgQEAgUmVmPE5vdGlmaWNhdGlvbj4gTm90aWZpY2F0 aW9uOjpjcmVhdGVGb3JTZXJ2aWNlV29ya2VyKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQmIGMKIFJl ZjxOb3RpZmljYXRpb24+IE5vdGlmaWNhdGlvbjo6Y3JlYXRlKFNjcmlwdEV4ZWN1dGlvbkNvbnRl eHQmIGNvbnRleHQsIE5vdGlmaWNhdGlvbkRhdGEmJiBkYXRhKQogewogICAgIE9wdGlvbnMgb3B0 aW9ucyB7IGRhdGEuZGlyZWN0aW9uLCBXVEZNb3ZlKGRhdGEubGFuZ3VhZ2UpLCBXVEZNb3ZlKGRh dGEuYm9keSksIFdURk1vdmUoZGF0YS50YWcpLCBXVEZNb3ZlKGRhdGEuaWNvblVSTCkgfTsKLSAg ICBhdXRvIG5vdGlmaWNhdGlvbiA9IGFkb3B0UmVmKCpuZXcgTm90aWZpY2F0aW9uKGNvbnRleHQs IFdURk1vdmUoZGF0YS50aXRsZSksIFdURk1vdmUob3B0aW9ucykpKTsKKyAgICBhdXRvIG5vdGlm aWNhdGlvbiA9IGFkb3B0UmVmKCpuZXcgTm90aWZpY2F0aW9uKGNvbnRleHQsIGRhdGEubm90aWZp Y2F0aW9uSUQsIFdURk1vdmUoZGF0YS50aXRsZSksIFdURk1vdmUob3B0aW9ucykpKTsKICAgICBu b3RpZmljYXRpb24tPnN1c3BlbmRJZk5lZWRlZCgpOwotICAgIG5vdGlmaWNhdGlvbi0+bV9yZWxh dGVkTm90aWZpY2F0aW9uSWRlbnRpZmllciA9IGRhdGEubm90aWZpY2F0aW9uSUQ7CiAgICAgbm90 aWZpY2F0aW9uLT5tX3NlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb25VUkwgPSBXVEZNb3ZlKGRhdGEu c2VydmljZVdvcmtlclJlZ2lzdHJhdGlvblVSTCk7CiAgICAgcmV0dXJuIG5vdGlmaWNhdGlvbjsK IH0KIAotTm90aWZpY2F0aW9uOjpOb3RpZmljYXRpb24oU2NyaXB0RXhlY3V0aW9uQ29udGV4dCYg Y29udGV4dCwgU3RyaW5nJiYgdGl0bGUsIE9wdGlvbnMmJiBvcHRpb25zKQorTm90aWZpY2F0aW9u OjpOb3RpZmljYXRpb24oU2NyaXB0RXhlY3V0aW9uQ29udGV4dCYgY29udGV4dCwgVVVJRCBpZGVu dGlmaWVyLCBTdHJpbmcmJiB0aXRsZSwgT3B0aW9ucyYmIG9wdGlvbnMpCiAgICAgOiBBY3RpdmVE T01PYmplY3QoJmNvbnRleHQpCisgICAgLCBtX2lkZW50aWZpZXIoaWRlbnRpZmllcikKICAgICAs IG1fdGl0bGUoV1RGTW92ZSh0aXRsZSkuaXNvbGF0ZWRDb3B5KCkpCiAgICAgLCBtX2RpcmVjdGlv bihvcHRpb25zLmRpcikKICAgICAsIG1fbGFuZyhXVEZNb3ZlKG9wdGlvbnMubGFuZykuaXNvbGF0 ZWRDb3B5KCkpCkBAIC0xMDgsNiArMTA4LDcgQEAgTm90aWZpY2F0aW9uOjpOb3RpZmljYXRpb24o U2NyaXB0RXhlY3V0aW9uQ29udGV4dCYgY29udGV4dCwgU3RyaW5nJiYgdGl0bGUsIE9wdGkKIAog Tm90aWZpY2F0aW9uOjpOb3RpZmljYXRpb24oY29uc3QgTm90aWZpY2F0aW9uJiBvdGhlcikKICAg ICA6IEFjdGl2ZURPTU9iamVjdChvdGhlci5zY3JpcHRFeGVjdXRpb25Db250ZXh0KCkpCisgICAg LCBtX2lkZW50aWZpZXIob3RoZXIubV9pZGVudGlmaWVyKQogICAgICwgbV90aXRsZShvdGhlci5t X3RpdGxlLmlzb2xhdGVkQ29weSgpKQogICAgICwgbV9kaXJlY3Rpb24ob3RoZXIubV9kaXJlY3Rp b24pCiAgICAgLCBtX2xhbmcob3RoZXIubV9sYW5nLmlzb2xhdGVkQ29weSgpKQpAQCAtMTI1LDEx ICsxMjYsNiBAQCBOb3RpZmljYXRpb246On5Ob3RpZmljYXRpb24oKQogewogfQogCi1SZWY8Tm90 aWZpY2F0aW9uPiBOb3RpZmljYXRpb246OmNvcHlGb3JHZXROb3RpZmljYXRpb25zKCkgY29uc3QK LXsKLSAgICByZXR1cm4gYWRvcHRSZWYoKm5ldyBOb3RpZmljYXRpb24oKnRoaXMpKTsKLX0KLQog dm9pZCBOb3RpZmljYXRpb246OnNob3dTb29uKCkKIHsKICAgICBxdWV1ZVRhc2tLZWVwaW5nT2Jq ZWN0QWxpdmUoKnRoaXMsIFRhc2tTb3VyY2U6OlVzZXJJbnRlcmFjdGlvbiwgW3RoaXNdIHsKQEAg LTIxOSw2ICsyMTUsNyBAQCB2b2lkIE5vdGlmaWNhdGlvbjo6ZmluYWxpemUoKQogdm9pZCBOb3Rp ZmljYXRpb246OmRpc3BhdGNoU2hvd0V2ZW50KCkKIHsKICAgICBBU1NFUlQoaXNNYWluVGhyZWFk KCkpOworICAgIEFTU0VSVCghaXNQZXJzaXN0ZW50KCkpOwogCiAgICAgaWYgKG1fbm90aWZpY2F0 aW9uU291cmNlICE9IE5vdGlmaWNhdGlvblNvdXJjZTo6RG9jdW1lbnQpCiAgICAgICAgIHJldHVy bjsKQEAgLTIzMCw2ICsyMjcsOCBAQCB2b2lkIE5vdGlmaWNhdGlvbjo6ZGlzcGF0Y2hDbGlja0V2 ZW50KCkKIHsKICAgICBBU1NFUlQoaXNNYWluVGhyZWFkKCkpOwogICAgIEFTU0VSVChtX25vdGlm aWNhdGlvblNvdXJjZSA9PSBOb3RpZmljYXRpb25Tb3VyY2U6OkRvY3VtZW50KTsKKyAgICBBU1NF UlQoIWlzUGVyc2lzdGVudCgpKTsKKwogICAgIHF1ZXVlVGFza0tlZXBpbmdPYmplY3RBbGl2ZSgq dGhpcywgVGFza1NvdXJjZTo6VXNlckludGVyYWN0aW9uLCBbdGhpc10gewogICAgICAgICBXaW5k b3dGb2N1c0FsbG93ZWRJbmRpY2F0b3Igd2luZG93Rm9jdXNBbGxvd2VkOwogICAgICAgICBkaXNw YXRjaEV2ZW50KEV2ZW50OjpjcmVhdGUoZXZlbnROYW1lcygpLmNsaWNrRXZlbnQsIEV2ZW50OjpD YW5CdWJibGU6Ok5vLCBFdmVudDo6SXNDYW5jZWxhYmxlOjpObykpOwpAQCAtMjQwLDYgKzIzOSw4 IEBAIHZvaWQgTm90aWZpY2F0aW9uOjpkaXNwYXRjaENsb3NlRXZlbnQoKQogewogICAgIEFTU0VS VChpc01haW5UaHJlYWQoKSk7CiAgICAgQVNTRVJUKG1fbm90aWZpY2F0aW9uU291cmNlID09IE5v dGlmaWNhdGlvblNvdXJjZTo6RG9jdW1lbnQpOworICAgIEFTU0VSVCghaXNQZXJzaXN0ZW50KCkp OworCiAgICAgcXVldWVUYXNrVG9EaXNwYXRjaEV2ZW50KCp0aGlzLCBUYXNrU291cmNlOjpVc2Vy SW50ZXJhY3Rpb24sIEV2ZW50OjpjcmVhdGUoZXZlbnROYW1lcygpLmNsb3NlRXZlbnQsIEV2ZW50 OjpDYW5CdWJibGU6Ok5vLCBFdmVudDo6SXNDYW5jZWxhYmxlOjpObykpOwogICAgIGZpbmFsaXpl KCk7CiB9CkBAIC0yNDgsNiArMjQ5LDcgQEAgdm9pZCBOb3RpZmljYXRpb246OmRpc3BhdGNoRXJy b3JFdmVudCgpCiB7CiAgICAgQVNTRVJUKGlzTWFpblRocmVhZCgpKTsKICAgICBBU1NFUlQobV9u b3RpZmljYXRpb25Tb3VyY2UgPT0gTm90aWZpY2F0aW9uU291cmNlOjpEb2N1bWVudCk7CisgICAg QVNTRVJUKCFpc1BlcnNpc3RlbnQoKSk7CiAKICAgICBxdWV1ZVRhc2tUb0Rpc3BhdGNoRXZlbnQo KnRoaXMsIFRhc2tTb3VyY2U6OlVzZXJJbnRlcmFjdGlvbiwgRXZlbnQ6OmNyZWF0ZShldmVudE5h bWVzKCkuZXJyb3JFdmVudCwgRXZlbnQ6OkNhbkJ1YmJsZTo6Tm8sIEV2ZW50OjpJc0NhbmNlbGFi bGU6Ok5vKSk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL25vdGlmaWNh dGlvbnMvTm90aWZpY2F0aW9uLmggYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL25vdGlmaWNhdGlv bnMvTm90aWZpY2F0aW9uLmgKaW5kZXggOTQ2MTIzNzY3YzdkODFjNjZiOWMxODI0ZTgzNGI0ZDc5 YWFiOTYyNi4uNDUyMTZhZDg2NmE0YTViMjczMTUxN2QwOGRmY2Y5ZjM5NTU0NTRhYiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9ub3RpZmljYXRpb25zL05vdGlmaWNhdGlvbi5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbm90aWZpY2F0aW9ucy9Ob3RpZmljYXRpb24u aApAQCAtMzgsOCArMzgsOCBAQAogI2luY2x1ZGUgIk5vdGlmaWNhdGlvbkRpcmVjdGlvbi5oIgog I2luY2x1ZGUgIk5vdGlmaWNhdGlvblBlcm1pc3Npb24uaCIKICNpbmNsdWRlICJTY3JpcHRFeGVj dXRpb25Db250ZXh0SWRlbnRpZmllci5oIgotI2luY2x1ZGUgPHd0Zi9JZGVudGlmaWVkLmg+CiAj aW5jbHVkZSA8d3RmL1VSTC5oPgorI2luY2x1ZGUgPHd0Zi9VVUlELmg+CiAjaW5jbHVkZSAiV3Jp dGluZ01vZGUuaCIKIAogbmFtZXNwYWNlIFdlYkNvcmUgewpAQCAtNTEsNyArNTEsNyBAQCBjbGFz cyBOb3RpZmljYXRpb25QZXJtaXNzaW9uQ2FsbGJhY2s7CiAKIHN0cnVjdCBOb3RpZmljYXRpb25E YXRhOwogCi1jbGFzcyBOb3RpZmljYXRpb24gZmluYWwgOiBwdWJsaWMgVGhyZWFkU2FmZVJlZkNv dW50ZWQ8Tm90aWZpY2F0aW9uPiwgcHVibGljIEFjdGl2ZURPTU9iamVjdCwgcHVibGljIEV2ZW50 VGFyZ2V0V2l0aElubGluZURhdGEsIHB1YmxpYyBVVUlESWRlbnRpZmllZDxOb3RpZmljYXRpb24+ IHsKK2NsYXNzIE5vdGlmaWNhdGlvbiBmaW5hbCA6IHB1YmxpYyBUaHJlYWRTYWZlUmVmQ291bnRl ZDxOb3RpZmljYXRpb24+LCBwdWJsaWMgQWN0aXZlRE9NT2JqZWN0LCBwdWJsaWMgRXZlbnRUYXJn ZXRXaXRoSW5saW5lRGF0YSB7CiAgICAgV1RGX01BS0VfSVNPX0FMTE9DQVRFRF9FWFBPUlQoTm90 aWZpY2F0aW9uLCBXRUJDT1JFX0VYUE9SVCk7CiBwdWJsaWM6CiAgICAgdXNpbmcgUGVybWlzc2lv biA9IE5vdGlmaWNhdGlvblBlcm1pc3Npb247CkBAIC05OCwxOCArOTgsMTggQEAgcHVibGljOgog CiAgICAgV0VCQ09SRV9FWFBPUlQgTm90aWZpY2F0aW9uRGF0YSBkYXRhKCkgY29uc3Q7CiAKLSAg ICBSZWY8Tm90aWZpY2F0aW9uPiBjb3B5Rm9yR2V0Tm90aWZpY2F0aW9ucygpIGNvbnN0OwotCiAg ICAgdXNpbmcgVGhyZWFkU2FmZVJlZkNvdW50ZWQ6OnJlZjsKICAgICB1c2luZyBUaHJlYWRTYWZl UmVmQ291bnRlZDo6ZGVyZWY7CiAKICAgICB2b2lkIG1hcmtBc1Nob3duKCk7CiAgICAgdm9pZCBz aG93U29vbigpOwogCi0gICAgc3RkOjpvcHRpb25hbDxVVUlEPiByZWxhdGVkTm90aWZpY2F0aW9u SWRlbnRpZmllcigpIGNvbnN0IHsgcmV0dXJuIG1fcmVsYXRlZE5vdGlmaWNhdGlvbklkZW50aWZp ZXI7IH0KKyAgICBVVUlEIGlkZW50aWZpZXIoKSBjb25zdCB7IHJldHVybiBtX2lkZW50aWZpZXI7 IH0KKworICAgIGJvb2wgaXNQZXJzaXN0ZW50KCkgY29uc3QgeyByZXR1cm4gIW1fc2VydmljZVdv cmtlclJlZ2lzdHJhdGlvblVSTC5pc051bGwoKTsgfQogCiBwcml2YXRlOgotICAgIE5vdGlmaWNh dGlvbihTY3JpcHRFeGVjdXRpb25Db250ZXh0JiwgU3RyaW5nJiYgdGl0bGUsIE9wdGlvbnMmJik7 CisgICAgTm90aWZpY2F0aW9uKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQmLCBVVUlELCBTdHJpbmcm JiB0aXRsZSwgT3B0aW9ucyYmKTsKICAgICBOb3RpZmljYXRpb24oY29uc3QgTm90aWZpY2F0aW9u Jik7CiAKICAgICBOb3RpZmljYXRpb25DbGllbnQqIGNsaWVudEZyb21Db250ZXh0KCk7CkBAIC0x MjYsNiArMTI2LDggQEAgcHJpdmF0ZToKICAgICB2b2lkIGRlcmVmRXZlbnRUYXJnZXQoKSBmaW5h bCB7IGRlcmVmKCk7IH0KICAgICB2b2lkIGV2ZW50TGlzdGVuZXJzRGlkQ2hhbmdlKCkgZmluYWw7 CiAKKyAgICBVVUlEIG1faWRlbnRpZmllcjsKKwogICAgIFN0cmluZyBtX3RpdGxlOwogICAgIERp cmVjdGlvbiBtX2RpcmVjdGlvbjsKICAgICBTdHJpbmcgbV9sYW5nOwpAQCAtMTQzLDcgKzE0NSw2 IEBAIHByaXZhdGU6CiAgICAgfTsKICAgICBOb3RpZmljYXRpb25Tb3VyY2UgbV9ub3RpZmljYXRp b25Tb3VyY2U7CiAgICAgU2NyaXB0RXhlY3V0aW9uQ29udGV4dElkZW50aWZpZXIgbV9jb250ZXh0 SWRlbnRpZmllcjsKLSAgICBzdGQ6Om9wdGlvbmFsPFVVSUQ+IG1fcmVsYXRlZE5vdGlmaWNhdGlv bklkZW50aWZpZXI7CiAgICAgVVJMIG1fc2VydmljZVdvcmtlclJlZ2lzdHJhdGlvblVSTDsKIH07 CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9Ob3RpZmljYXRpb25zL1dl Yk5vdGlmaWNhdGlvbk1hbmFnZXIuY3BwIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL05vdGlm aWNhdGlvbnMvV2ViTm90aWZpY2F0aW9uTWFuYWdlci5jcHAKaW5kZXggN2JiYjUwZTE0MjcyNzBl ZDAyNGNkOTA2NTI2YWMyYzRiNjQwNjkwNi4uMGU1M2EzZjIzMDM2NDk1MTBmNzgxZDMyOGE3ODc4 NWFlNzY1ZjFkNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL05vdGlmaWNh dGlvbnMvV2ViTm90aWZpY2F0aW9uTWFuYWdlci5jcHAKKysrIGIvU291cmNlL1dlYktpdC9XZWJQ cm9jZXNzL05vdGlmaWNhdGlvbnMvV2ViTm90aWZpY2F0aW9uTWFuYWdlci5jcHAKQEAgLTEzMCw3 ICsxMzAsNyBAQCB0ZW1wbGF0ZTx0eXBlbmFtZSBVPiBib29sIFdlYk5vdGlmaWNhdGlvbk1hbmFn ZXI6OnNlbmROb3RpZmljYXRpb25NZXNzYWdlKFUmJiBtZQogCiAjaWYgRU5BQkxFKEJVSUxUX0lO X05PVElGSUNBVElPTlMpCiAgICAgaWYgKFJ1bnRpbWVFbmFibGVkRmVhdHVyZXM6OnNoYXJlZEZl YXR1cmVzKCkuYnVpbHRJbk5vdGlmaWNhdGlvbnNFbmFibGVkKCkpCi0gICAgICAgIHJldHVybiBt X3Byb2Nlc3MuZW5zdXJlTmV0d29ya1Byb2Nlc3NDb25uZWN0aW9uKCkuY29ubmVjdGlvbigpLnNl bmQoV1RGTW92ZShtZXNzYWdlKSwgbm90aWZpY2F0aW9uLmRhdGEoKS5zb3VyY2VTZXNzaW9uLnRv VUludDY0KCkpOworICAgICAgICByZXR1cm4gbV9wcm9jZXNzLmVuc3VyZU5ldHdvcmtQcm9jZXNz Q29ubmVjdGlvbigpLmNvbm5lY3Rpb24oKS5zZW5kKFdURk1vdmUobWVzc2FnZSksIFdlYlByb2Nl c3M6OnNpbmdsZXRvbigpLnNlc3Npb25JRCgpLnRvVUludDY0KCkpOwogI2VuZGlmCiAKICAgICBz dGQ6Om9wdGlvbmFsPFdlYkNvcmU6OlBhZ2VJZGVudGlmaWVyPiBwYWdlSWRlbnRpZmllcjsKQEAg LTE2MCw3ICsxNjAsMTAgQEAgYm9vbCBXZWJOb3RpZmljYXRpb25NYW5hZ2VyOjpzaG93KE5vdGlm aWNhdGlvbiYgbm90aWZpY2F0aW9uLCBXZWJQYWdlKiBwYWdlKQogICAgIGlmICghc2VuZE5vdGlm aWNhdGlvbk1lc3NhZ2UoTWVzc2FnZXM6Ok5vdGlmaWNhdGlvbk1hbmFnZXJNZXNzYWdlSGFuZGxl cjo6U2hvd05vdGlmaWNhdGlvbihub3RpZmljYXRpb24uZGF0YSgpKSwgbm90aWZpY2F0aW9uLCBw YWdlKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAgbV9ub3RpZmljYXRpb25JRE1hcC5h ZGQobm90aWZpY2F0aW9uLmlkZW50aWZpZXIoKSwgJm5vdGlmaWNhdGlvbik7CisgICAgaWYgKCFu b3RpZmljYXRpb24uaXNQZXJzaXN0ZW50KCkpIHsKKyAgICAgICAgQVNTRVJUKCFtX25vblBlcnNp c3RlbnROb3RpZmljYXRpb25zLmNvbnRhaW5zKG5vdGlmaWNhdGlvbi5pZGVudGlmaWVyKCkpKTsK KyAgICAgICAgbV9ub25QZXJzaXN0ZW50Tm90aWZpY2F0aW9ucy5hZGQobm90aWZpY2F0aW9uLmlk ZW50aWZpZXIoKSwgbm90aWZpY2F0aW9uKTsKKyAgICB9CiAgICAgcmV0dXJuIHRydWU7CiAjZWxz ZQogICAgIFVOVVNFRF9QQVJBTShub3RpZmljYXRpb24pOwpAQCAtMTc1LDE0ICsxNzgsNyBAQCB2 b2lkIFdlYk5vdGlmaWNhdGlvbk1hbmFnZXI6OmNhbmNlbChOb3RpZmljYXRpb24mIG5vdGlmaWNh dGlvbiwgV2ViUGFnZSogcGFnZSkKIAogI2lmIEVOQUJMRShOT1RJRklDQVRJT05TKQogICAgIGF1 dG8gaWRlbnRpZmllciA9IG5vdGlmaWNhdGlvbi5pZGVudGlmaWVyKCk7Ci0gICAgYXV0byBtYXBw ZWROb3RpZmljYXRpb24gPSBtX25vdGlmaWNhdGlvbklETWFwLmdldChpZGVudGlmaWVyKTsKLSAg ICBpZiAoIW1hcHBlZE5vdGlmaWNhdGlvbikgewotICAgICAgICBhdXRvIHJlbGF0ZWRJZGVudGlm aWVyID0gbm90aWZpY2F0aW9uLnJlbGF0ZWROb3RpZmljYXRpb25JZGVudGlmaWVyKCk7Ci0gICAg ICAgIGlmICghcmVsYXRlZElkZW50aWZpZXIpCi0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAg IGlkZW50aWZpZXIgPSAqcmVsYXRlZElkZW50aWZpZXI7Ci0gICAgfSBlbHNlCi0gICAgICAgIEFT U0VSVChtYXBwZWROb3RpZmljYXRpb24gPT0gJm5vdGlmaWNhdGlvbik7CisgICAgQVNTRVJUKG5v dGlmaWNhdGlvbi5pc1BlcnNpc3RlbnQoKSB8fCAhbV9ub25QZXJzaXN0ZW50Tm90aWZpY2F0aW9u cy5jb250YWlucyhpZGVudGlmaWVyKSB8fCBtX25vblBlcnNpc3RlbnROb3RpZmljYXRpb25zLmdl dChpZGVudGlmaWVyKSA9PSAmbm90aWZpY2F0aW9uKTsKIAogICAgIGlmICghc2VuZE5vdGlmaWNh dGlvbk1lc3NhZ2UoTWVzc2FnZXM6Ok5vdGlmaWNhdGlvbk1hbmFnZXJNZXNzYWdlSGFuZGxlcjo6 Q2FuY2VsTm90aWZpY2F0aW9uKGlkZW50aWZpZXIpLCBub3RpZmljYXRpb24sIHBhZ2UpKQogICAg ICAgICByZXR1cm47CkBAIC0yMDAsMTQgKzE5Niw4IEBAIHZvaWQgV2ViTm90aWZpY2F0aW9uTWFu YWdlcjo6ZGlkRGVzdHJveU5vdGlmaWNhdGlvbihOb3RpZmljYXRpb24mIG5vdGlmaWNhdGlvbiwK ICAgICBSZWYgcHJvdGVjdGVkTm90aWZpY2F0aW9uIHsgbm90aWZpY2F0aW9uIH07CiAKICAgICBh dXRvIGlkZW50aWZpZXIgPSBub3RpZmljYXRpb24uaWRlbnRpZmllcigpOwotICAgIGF1dG8gdGFr ZW5Ob3RpZmljYXRpb24gPSBtX25vdGlmaWNhdGlvbklETWFwLnRha2UoaWRlbnRpZmllcik7Ci0g ICAgaWYgKCF0YWtlbk5vdGlmaWNhdGlvbikgewotICAgICAgICBhdXRvIHJlbGF0ZWRJZGVudGlm aWVyID0gbm90aWZpY2F0aW9uLnJlbGF0ZWROb3RpZmljYXRpb25JZGVudGlmaWVyKCk7Ci0gICAg ICAgIGlmICghcmVsYXRlZElkZW50aWZpZXIpCi0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAg IGlkZW50aWZpZXIgPSAqcmVsYXRlZElkZW50aWZpZXI7Ci0gICAgfSBlbHNlCi0gICAgICAgIEFT U0VSVCh0YWtlbk5vdGlmaWNhdGlvbiA9PSAmbm90aWZpY2F0aW9uKTsKKyAgICBSZWZQdHIgdGFr ZW5Ob3RpZmljYXRpb24gPSAhbm90aWZpY2F0aW9uLmlzUGVyc2lzdGVudCgpID8gbV9ub25QZXJz aXN0ZW50Tm90aWZpY2F0aW9ucy50YWtlKGlkZW50aWZpZXIpIDogbnVsbHB0cjsKKyAgICBBU1NF UlQoIXRha2VuTm90aWZpY2F0aW9uICB8fCB0YWtlbk5vdGlmaWNhdGlvbiA9PSAmbm90aWZpY2F0 aW9uKTsKIAogICAgIHNlbmROb3RpZmljYXRpb25NZXNzYWdlKE1lc3NhZ2VzOjpOb3RpZmljYXRp b25NYW5hZ2VyTWVzc2FnZUhhbmRsZXI6OkRpZERlc3Ryb3lOb3RpZmljYXRpb24oaWRlbnRpZmll ciksIG5vdGlmaWNhdGlvbiwgcGFnZSk7CiAjZWxzZQpAQCAtMjIzLDcgKzIxMyw3IEBAIHZvaWQg V2ViTm90aWZpY2F0aW9uTWFuYWdlcjo6ZGlkU2hvd05vdGlmaWNhdGlvbihjb25zdCBVVUlEJiBu b3RpZmljYXRpb25JRCkKICAgICBMT0coTm90aWZpY2F0aW9ucywgIldlYlByb2Nlc3MgJWkgRElE IFNIT1cgbm90aWZpY2F0aW9uICVzIiwgZ2V0cGlkKCksIG5vdGlmaWNhdGlvbklELnRvU3RyaW5n KCkudXRmOCgpLmRhdGEoKSk7CiAKICNpZiBFTkFCTEUoTk9USUZJQ0FUSU9OUykKLSAgICBSZWZQ dHI8Tm90aWZpY2F0aW9uPiBub3RpZmljYXRpb24gPSBtX25vdGlmaWNhdGlvbklETWFwLmdldChu b3RpZmljYXRpb25JRCk7CisgICAgUmVmUHRyPE5vdGlmaWNhdGlvbj4gbm90aWZpY2F0aW9uID0g bV9ub25QZXJzaXN0ZW50Tm90aWZpY2F0aW9ucy5nZXQobm90aWZpY2F0aW9uSUQpOwogICAgIGlm ICghbm90aWZpY2F0aW9uKQogICAgICAgICByZXR1cm47CiAKQEAgLTI0MCw3ICsyMzAsNyBAQCB2 b2lkIFdlYk5vdGlmaWNhdGlvbk1hbmFnZXI6OmRpZENsaWNrTm90aWZpY2F0aW9uKGNvbnN0IFVV SUQmIG5vdGlmaWNhdGlvbklEKQogICAgIExPRyhOb3RpZmljYXRpb25zLCAiV2ViUHJvY2VzcyAl aSBESUQgQ0xJQ0sgbm90aWZpY2F0aW9uICVzIiwgZ2V0cGlkKCksIG5vdGlmaWNhdGlvbklELnRv U3RyaW5nKCkudXRmOCgpLmRhdGEoKSk7CiAKICNpZiBFTkFCTEUoTk9USUZJQ0FUSU9OUykKLSAg ICBSZWZQdHI8Tm90aWZpY2F0aW9uPiBub3RpZmljYXRpb24gPSBtX25vdGlmaWNhdGlvbklETWFw LmdldChub3RpZmljYXRpb25JRCk7CisgICAgUmVmUHRyPE5vdGlmaWNhdGlvbj4gbm90aWZpY2F0 aW9uID0gbV9ub25QZXJzaXN0ZW50Tm90aWZpY2F0aW9ucy5nZXQobm90aWZpY2F0aW9uSUQpOwog ICAgIGlmICghbm90aWZpY2F0aW9uKQogICAgICAgICByZXR1cm47CiAKQEAgLTI2Myw3ICsyNTMs NyBAQCB2b2lkIFdlYk5vdGlmaWNhdGlvbk1hbmFnZXI6OmRpZENsb3NlTm90aWZpY2F0aW9ucyhj b25zdCBWZWN0b3I8VVVJRD4mIG5vdGlmaWNhdAogICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwg Y291bnQ7ICsraSkgewogICAgICAgICBhdXRvIG5vdGlmaWNhdGlvbklEID0gbm90aWZpY2F0aW9u SURzW2ldOwogCi0gICAgICAgIFJlZlB0cjxOb3RpZmljYXRpb24+IG5vdGlmaWNhdGlvbiA9IG1f bm90aWZpY2F0aW9uSURNYXAudGFrZShub3RpZmljYXRpb25JRCk7CisgICAgICAgIFJlZlB0cjxO b3RpZmljYXRpb24+IG5vdGlmaWNhdGlvbiA9IG1fbm9uUGVyc2lzdGVudE5vdGlmaWNhdGlvbnMu dGFrZShub3RpZmljYXRpb25JRCk7CiAgICAgICAgIGlmICghbm90aWZpY2F0aW9uKQogICAgICAg ICAgICAgY29udGludWU7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9O b3RpZmljYXRpb25zL1dlYk5vdGlmaWNhdGlvbk1hbmFnZXIuaCBiL1NvdXJjZS9XZWJLaXQvV2Vi UHJvY2Vzcy9Ob3RpZmljYXRpb25zL1dlYk5vdGlmaWNhdGlvbk1hbmFnZXIuaAppbmRleCA0OWVh NzE4NDU1YjMzODJmNmMzZjEwMWJhMTRlOGJhYzdiNWY1MDQ2Li5iMjM1MjZiOTc1MmJmYzE1NTZk ZWVjYjI1NjE2YWEzYjdiNzhkZDU0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nl c3MvTm90aWZpY2F0aW9ucy9XZWJOb3RpZmljYXRpb25NYW5hZ2VyLmgKKysrIGIvU291cmNlL1dl YktpdC9XZWJQcm9jZXNzL05vdGlmaWNhdGlvbnMvV2ViTm90aWZpY2F0aW9uTWFuYWdlci5oCkBA IC04Niw5ICs4Niw3IEBAIHByaXZhdGU6CiAgICAgV2ViUHJvY2VzcyYgbV9wcm9jZXNzOwogCiAj aWYgRU5BQkxFKE5PVElGSUNBVElPTlMpCi0gICAgdHlwZWRlZiBIYXNoTWFwPFVVSUQsIFJlZlB0 cjxXZWJDb3JlOjpOb3RpZmljYXRpb24+PiBOb3RpZmljYXRpb25JRE1hcDsKLSAgICBOb3RpZmlj YXRpb25JRE1hcCBtX25vdGlmaWNhdGlvbklETWFwOwotICAgIAorICAgIEhhc2hNYXA8VVVJRCwg UmVmPFdlYkNvcmU6Ok5vdGlmaWNhdGlvbj4+IG1fbm9uUGVyc2lzdGVudE5vdGlmaWNhdGlvbnM7 ICAgIAogICAgIEhhc2hNYXA8U3RyaW5nLCBib29sPiBtX3Blcm1pc3Npb25zTWFwOwogI2VuZGlm CiB9Owo= 456359 2022-04-01 07:38:17 -0700 2022-04-06 00:06:34 -0700 Patch bug-238603-20220401163815.patch text/plain 14958 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjkyMTYwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjlmMTllM2Q1ZmE5NzBl ZGE1ZWRkMmQ0ZjZhYmJmMzNiNjYyZWU1NC4uZWFmZTA5OTdlZGEzNzkzMzliZmRiZWU4ZGVmZTNh M2QyZjk5MWRhZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIyLTA0LTAxICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBSZW1vdmUgTm90aWZpY2F0 aW9uOjptX3JlbGF0ZWROb3RpZmljYXRpb25JZGVudGlmaWVyCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzg2MDMKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBtX3JlbGF0ZWROb3RpZmljYXRpb25JZGVudGlm aWVyIHdhcyBhZGRlZCBhcyBhIHRlbXBvcmFyeSB3b3JrYXJvdW5kIGZvciBwZXJzaXN0ZW50IG5v dGlmaWNhdGlvbnMgdGhhdCBhcmUgcmVjcmVhdGVkIGluIG90aGVyIGNvbnRleHRzLgorICAgICAg ICBUbyBkaXJlY3RseSBzdXBwb3J0IHRoaXMgY2FzZSwgTm90aWZpY2F0aW9uIGlzIG5vIGxvbmdl ciBhIElkZW50aWZpZWQ8VVVJRD4gYW5kIGluc3RlYWQgaGFzIGEgbV9pZGVudGlmaWVyLgorICAg ICAgICBXaGVuIGNyZWF0ZWQgZnJvbSBKUywgTm90aWZpY2F0aW9uOjptX2lkZW50aWZpZXIgaXMg Z2VuZXJhdGVkLgorICAgICAgICBXaGVuIGNyZWF0ZWQgZnJvbSBOb3RpZmljYXRpb25EYXRhLCBO b3RpZmljYXRpb246Om1faWRlbnRpZmllciBpcyBjb3BpZWQgZnJvbSBOb3RpZmljYXRpb25EYXRh LgorCisgICAgICAgIENvdmVyZWQgYnkgZXhpc3RpbmcgdGVzdHMuCisKKyAgICAgICAgKiBNb2R1 bGVzL25vdGlmaWNhdGlvbnMvTm90aWZpY2F0aW9uLmNwcDoKKyAgICAgICAgKiBNb2R1bGVzL25v dGlmaWNhdGlvbnMvTm90aWZpY2F0aW9uLmg6CisKIDIwMjItMDQtMDEgIFlvdWVubiBGYWJsZXQg IDx5b3Vlbm5AYXBwbGUuY29tPgogCiAgICAgICAgIFNlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb24u Z2V0Tm90aWZpY2F0aW9ucyBzaG91bGQgbGlzdCBhbGwgcGVyc2lzdGVudCBub3RpZmljYXRpb25z CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hh bmdlTG9nCmluZGV4IDc1ZjhlOGMzNjk1YTFlZDFmZWY2YTBiM2VlMzdmNDMzNGQ3OTVmZmEuLmY3 ODA3Njg5ODc1MDA1Zjk4NjYwNzQ0ZGIzMGIwN2EwZTExYTQ0OTIgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMTYgQEAKKzIwMjItMDQtMDEgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgor CisgICAgICAgIFJlbW92ZSBOb3RpZmljYXRpb246Om1fcmVsYXRlZE5vdGlmaWNhdGlvbklkZW50 aWZpZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIz ODYwMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIERp cmVjdGx5IHVzZSBpZGVudGlmaWVyIG5vdyB0aGF0IHdlIGNvcnJlY3RseSByZXVzZSB0aGVtIHdo ZW4gbmVlZGVkLgorICAgICAgICBXZSBubyBsb25nZXIgc3RvcmUgcGVyc2lzdGVudCBub3RpZmlj YXRpb25zIGluIHRoZSBtYXAgc2luY2Ugd2UgZG8gbm90IHVzZSB0aGUgbWFwIGZvciBjbGljay9j bG9zZSBldmVudHMuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL05vdGlmaWNhdGlvbnMvV2ViTm90 aWZpY2F0aW9uTWFuYWdlci5jcHA6CisgICAgICAgICogV2ViUHJvY2Vzcy9Ob3RpZmljYXRpb25z L1dlYk5vdGlmaWNhdGlvbk1hbmFnZXIuaDoKKwogMjAyMi0wNC0wMSAgWW91ZW5uIEZhYmxldCAg PHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgU2VydmljZVdvcmtlclJlZ2lzdHJhdGlvbi5n ZXROb3RpZmljYXRpb25zIHNob3VsZCBsaXN0IGFsbCBwZXJzaXN0ZW50IG5vdGlmaWNhdGlvbnMK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbm90aWZpY2F0aW9ucy9Ob3RpZmlj YXRpb24uY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9ub3RpZmljYXRpb25zL05vdGlmaWNh dGlvbi5jcHAKaW5kZXggNTEzOGI1MjUxOWE1OWRkOWU2NWViNDIzMzY2ZDI3NjE4ZjM4MmI2ZS4u NGYzODE1NWMwODc1ZmNkNTI3MTI2MWM1NDkwNDE3M2FjMmUwYjQwZSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvTW9kdWxlcy9ub3RpZmljYXRpb25zL05vdGlmaWNhdGlvbi5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvTW9kdWxlcy9ub3RpZmljYXRpb25zL05vdGlmaWNhdGlvbi5jcHAKQEAg LTU4LDcgKzU4LDcgQEAgRXhjZXB0aW9uT3I8UmVmPE5vdGlmaWNhdGlvbj4+IE5vdGlmaWNhdGlv bjo6Y3JlYXRlKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQmIGNvbnQKICAgICBpZiAoY29udGV4dC5p c1NlcnZpY2VXb3JrZXJHbG9iYWxTY29wZSgpKQogICAgICAgICByZXR1cm4gRXhjZXB0aW9uIHsg VHlwZUVycm9yLCAiTm90aWZpY2F0aW9uIGNhbm5vdCBiZSBkaXJlY3RseSBjcmVhdGVkIGluIGEg U2VydmljZVdvcmtlckdsb2JhbFNjb3BlIl9zIH07CiAKLSAgICBhdXRvIG5vdGlmaWNhdGlvbiA9 IGFkb3B0UmVmKCpuZXcgTm90aWZpY2F0aW9uKGNvbnRleHQsIFdURk1vdmUodGl0bGUpLCBXVEZN b3ZlKG9wdGlvbnMpKSk7CisgICAgYXV0byBub3RpZmljYXRpb24gPSBhZG9wdFJlZigqbmV3IE5v dGlmaWNhdGlvbihjb250ZXh0LCBVVUlEOjpjcmVhdGVWZXJzaW9uNCgpLCBXVEZNb3ZlKHRpdGxl KSwgV1RGTW92ZShvcHRpb25zKSkpOwogICAgIG5vdGlmaWNhdGlvbi0+c3VzcGVuZElmTmVlZGVk KCk7CiAgICAgbm90aWZpY2F0aW9uLT5zaG93U29vbigpOwogICAgIHJldHVybiBub3RpZmljYXRp b247CkBAIC02Niw3ICs2Niw3IEBAIEV4Y2VwdGlvbk9yPFJlZjxOb3RpZmljYXRpb24+PiBOb3Rp ZmljYXRpb246OmNyZWF0ZShTY3JpcHRFeGVjdXRpb25Db250ZXh0JiBjb250CiAKIFJlZjxOb3Rp ZmljYXRpb24+IE5vdGlmaWNhdGlvbjo6Y3JlYXRlRm9yU2VydmljZVdvcmtlcihTY3JpcHRFeGVj dXRpb25Db250ZXh0JiBjb250ZXh0LCBTdHJpbmcmJiB0aXRsZSwgT3B0aW9ucyYmIG9wdGlvbnMs IGNvbnN0IFVSTCYgc2VydmljZVdvcmtlclJlZ2lzdHJhdGlvblVSTCkKIHsKLSAgICBhdXRvIG5v dGlmaWNhdGlvbiA9IGFkb3B0UmVmKCpuZXcgTm90aWZpY2F0aW9uKGNvbnRleHQsIFdURk1vdmUo dGl0bGUpLCBXVEZNb3ZlKG9wdGlvbnMpKSk7CisgICAgYXV0byBub3RpZmljYXRpb24gPSBhZG9w dFJlZigqbmV3IE5vdGlmaWNhdGlvbihjb250ZXh0LCBVVUlEOjpjcmVhdGVWZXJzaW9uNCgpLCBX VEZNb3ZlKHRpdGxlKSwgV1RGTW92ZShvcHRpb25zKSkpOwogICAgIG5vdGlmaWNhdGlvbi0+bV9z ZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9uVVJMID0gc2VydmljZVdvcmtlclJlZ2lzdHJhdGlvblVS TDsKICAgICBub3RpZmljYXRpb24tPnN1c3BlbmRJZk5lZWRlZCgpOwogICAgIHJldHVybiBub3Rp ZmljYXRpb247CkBAIC03NSwxNSArNzUsMTUgQEAgUmVmPE5vdGlmaWNhdGlvbj4gTm90aWZpY2F0 aW9uOjpjcmVhdGVGb3JTZXJ2aWNlV29ya2VyKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQmIGMKIFJl ZjxOb3RpZmljYXRpb24+IE5vdGlmaWNhdGlvbjo6Y3JlYXRlKFNjcmlwdEV4ZWN1dGlvbkNvbnRl eHQmIGNvbnRleHQsIE5vdGlmaWNhdGlvbkRhdGEmJiBkYXRhKQogewogICAgIE9wdGlvbnMgb3B0 aW9ucyB7IGRhdGEuZGlyZWN0aW9uLCBXVEZNb3ZlKGRhdGEubGFuZ3VhZ2UpLCBXVEZNb3ZlKGRh dGEuYm9keSksIFdURk1vdmUoZGF0YS50YWcpLCBXVEZNb3ZlKGRhdGEuaWNvblVSTCkgfTsKLSAg ICBhdXRvIG5vdGlmaWNhdGlvbiA9IGFkb3B0UmVmKCpuZXcgTm90aWZpY2F0aW9uKGNvbnRleHQs IFdURk1vdmUoZGF0YS50aXRsZSksIFdURk1vdmUob3B0aW9ucykpKTsKKyAgICBhdXRvIG5vdGlm aWNhdGlvbiA9IGFkb3B0UmVmKCpuZXcgTm90aWZpY2F0aW9uKGNvbnRleHQsIGRhdGEubm90aWZp Y2F0aW9uSUQsIFdURk1vdmUoZGF0YS50aXRsZSksIFdURk1vdmUob3B0aW9ucykpKTsKICAgICBu b3RpZmljYXRpb24tPnN1c3BlbmRJZk5lZWRlZCgpOwotICAgIG5vdGlmaWNhdGlvbi0+bV9yZWxh dGVkTm90aWZpY2F0aW9uSWRlbnRpZmllciA9IGRhdGEubm90aWZpY2F0aW9uSUQ7CiAgICAgbm90 aWZpY2F0aW9uLT5tX3NlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb25VUkwgPSBXVEZNb3ZlKGRhdGEu c2VydmljZVdvcmtlclJlZ2lzdHJhdGlvblVSTCk7CiAgICAgcmV0dXJuIG5vdGlmaWNhdGlvbjsK IH0KIAotTm90aWZpY2F0aW9uOjpOb3RpZmljYXRpb24oU2NyaXB0RXhlY3V0aW9uQ29udGV4dCYg Y29udGV4dCwgU3RyaW5nJiYgdGl0bGUsIE9wdGlvbnMmJiBvcHRpb25zKQorTm90aWZpY2F0aW9u OjpOb3RpZmljYXRpb24oU2NyaXB0RXhlY3V0aW9uQ29udGV4dCYgY29udGV4dCwgVVVJRCBpZGVu dGlmaWVyLCBTdHJpbmcmJiB0aXRsZSwgT3B0aW9ucyYmIG9wdGlvbnMpCiAgICAgOiBBY3RpdmVE T01PYmplY3QoJmNvbnRleHQpCisgICAgLCBtX2lkZW50aWZpZXIoaWRlbnRpZmllcikKICAgICAs IG1fdGl0bGUoV1RGTW92ZSh0aXRsZSkuaXNvbGF0ZWRDb3B5KCkpCiAgICAgLCBtX2RpcmVjdGlv bihvcHRpb25zLmRpcikKICAgICAsIG1fbGFuZyhXVEZNb3ZlKG9wdGlvbnMubGFuZykuaXNvbGF0 ZWRDb3B5KCkpCkBAIC0xMDYsMzAgKzEwNiwxMCBAQCBOb3RpZmljYXRpb246Ok5vdGlmaWNhdGlv bihTY3JpcHRFeGVjdXRpb25Db250ZXh0JiBjb250ZXh0LCBTdHJpbmcmJiB0aXRsZSwgT3B0aQog ICAgIH0KIH0KIAotTm90aWZpY2F0aW9uOjpOb3RpZmljYXRpb24oY29uc3QgTm90aWZpY2F0aW9u JiBvdGhlcikKLSAgICA6IEFjdGl2ZURPTU9iamVjdChvdGhlci5zY3JpcHRFeGVjdXRpb25Db250 ZXh0KCkpCi0gICAgLCBtX3RpdGxlKG90aGVyLm1fdGl0bGUuaXNvbGF0ZWRDb3B5KCkpCi0gICAg LCBtX2RpcmVjdGlvbihvdGhlci5tX2RpcmVjdGlvbikKLSAgICAsIG1fbGFuZyhvdGhlci5tX2xh bmcuaXNvbGF0ZWRDb3B5KCkpCi0gICAgLCBtX2JvZHkob3RoZXIubV9ib2R5Lmlzb2xhdGVkQ29w eSgpKQotICAgICwgbV90YWcob3RoZXIubV90YWcuaXNvbGF0ZWRDb3B5KCkpCi0gICAgLCBtX2lj b24ob3RoZXIubV9pY29uLmlzb2xhdGVkQ29weSgpKQotICAgICwgbV9zdGF0ZShvdGhlci5tX3N0 YXRlKQotICAgICwgbV9ub3RpZmljYXRpb25Tb3VyY2Uob3RoZXIubV9ub3RpZmljYXRpb25Tb3Vy Y2UpCi0gICAgLCBtX2NvbnRleHRJZGVudGlmaWVyKG90aGVyLm1fY29udGV4dElkZW50aWZpZXIp Ci17Ci0gICAgc3VzcGVuZElmTmVlZGVkKCk7Ci19Ci0KIE5vdGlmaWNhdGlvbjo6fk5vdGlmaWNh dGlvbigpCiB7CiB9CiAKLVJlZjxOb3RpZmljYXRpb24+IE5vdGlmaWNhdGlvbjo6Y29weUZvckdl dE5vdGlmaWNhdGlvbnMoKSBjb25zdAotewotICAgIHJldHVybiBhZG9wdFJlZigqbmV3IE5vdGlm aWNhdGlvbigqdGhpcykpOwotfQotCiB2b2lkIE5vdGlmaWNhdGlvbjo6c2hvd1Nvb24oKQogewog ICAgIHF1ZXVlVGFza0tlZXBpbmdPYmplY3RBbGl2ZSgqdGhpcywgVGFza1NvdXJjZTo6VXNlcklu dGVyYWN0aW9uLCBbdGhpc10gewpAQCAtMjE5LDYgKzE5OSw3IEBAIHZvaWQgTm90aWZpY2F0aW9u OjpmaW5hbGl6ZSgpCiB2b2lkIE5vdGlmaWNhdGlvbjo6ZGlzcGF0Y2hTaG93RXZlbnQoKQogewog ICAgIEFTU0VSVChpc01haW5UaHJlYWQoKSk7CisgICAgQVNTRVJUKCFpc1BlcnNpc3RlbnQoKSk7 CiAKICAgICBpZiAobV9ub3RpZmljYXRpb25Tb3VyY2UgIT0gTm90aWZpY2F0aW9uU291cmNlOjpE b2N1bWVudCkKICAgICAgICAgcmV0dXJuOwpAQCAtMjMwLDYgKzIxMSw4IEBAIHZvaWQgTm90aWZp Y2F0aW9uOjpkaXNwYXRjaENsaWNrRXZlbnQoKQogewogICAgIEFTU0VSVChpc01haW5UaHJlYWQo KSk7CiAgICAgQVNTRVJUKG1fbm90aWZpY2F0aW9uU291cmNlID09IE5vdGlmaWNhdGlvblNvdXJj ZTo6RG9jdW1lbnQpOworICAgIEFTU0VSVCghaXNQZXJzaXN0ZW50KCkpOworCiAgICAgcXVldWVU YXNrS2VlcGluZ09iamVjdEFsaXZlKCp0aGlzLCBUYXNrU291cmNlOjpVc2VySW50ZXJhY3Rpb24s IFt0aGlzXSB7CiAgICAgICAgIFdpbmRvd0ZvY3VzQWxsb3dlZEluZGljYXRvciB3aW5kb3dGb2N1 c0FsbG93ZWQ7CiAgICAgICAgIGRpc3BhdGNoRXZlbnQoRXZlbnQ6OmNyZWF0ZShldmVudE5hbWVz KCkuY2xpY2tFdmVudCwgRXZlbnQ6OkNhbkJ1YmJsZTo6Tm8sIEV2ZW50OjpJc0NhbmNlbGFibGU6 Ok5vKSk7CkBAIC0yNDAsNiArMjIzLDggQEAgdm9pZCBOb3RpZmljYXRpb246OmRpc3BhdGNoQ2xv c2VFdmVudCgpCiB7CiAgICAgQVNTRVJUKGlzTWFpblRocmVhZCgpKTsKICAgICBBU1NFUlQobV9u b3RpZmljYXRpb25Tb3VyY2UgPT0gTm90aWZpY2F0aW9uU291cmNlOjpEb2N1bWVudCk7CisgICAg QVNTRVJUKCFpc1BlcnNpc3RlbnQoKSk7CisKICAgICBxdWV1ZVRhc2tUb0Rpc3BhdGNoRXZlbnQo KnRoaXMsIFRhc2tTb3VyY2U6OlVzZXJJbnRlcmFjdGlvbiwgRXZlbnQ6OmNyZWF0ZShldmVudE5h bWVzKCkuY2xvc2VFdmVudCwgRXZlbnQ6OkNhbkJ1YmJsZTo6Tm8sIEV2ZW50OjpJc0NhbmNlbGFi bGU6Ok5vKSk7CiAgICAgZmluYWxpemUoKTsKIH0KQEAgLTI0OCw2ICsyMzMsNyBAQCB2b2lkIE5v dGlmaWNhdGlvbjo6ZGlzcGF0Y2hFcnJvckV2ZW50KCkKIHsKICAgICBBU1NFUlQoaXNNYWluVGhy ZWFkKCkpOwogICAgIEFTU0VSVChtX25vdGlmaWNhdGlvblNvdXJjZSA9PSBOb3RpZmljYXRpb25T b3VyY2U6OkRvY3VtZW50KTsKKyAgICBBU1NFUlQoIWlzUGVyc2lzdGVudCgpKTsKIAogICAgIHF1 ZXVlVGFza1RvRGlzcGF0Y2hFdmVudCgqdGhpcywgVGFza1NvdXJjZTo6VXNlckludGVyYWN0aW9u LCBFdmVudDo6Y3JlYXRlKGV2ZW50TmFtZXMoKS5lcnJvckV2ZW50LCBFdmVudDo6Q2FuQnViYmxl OjpObywgRXZlbnQ6OklzQ2FuY2VsYWJsZTo6Tm8pKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL01vZHVsZXMvbm90aWZpY2F0aW9ucy9Ob3RpZmljYXRpb24uaCBiL1NvdXJjZS9XZWJD b3JlL01vZHVsZXMvbm90aWZpY2F0aW9ucy9Ob3RpZmljYXRpb24uaAppbmRleCA5NDYxMjM3Njdj N2Q4MWM2NmI5YzE4MjRlODM0YjRkNzlhYWI5NjI2Li5iMzg2ZGJmZmUyZDkxYjQ3ZDNiN2UxNzAx N2UwNmIxZWFmMmQ4N2I2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL25vdGlm aWNhdGlvbnMvTm90aWZpY2F0aW9uLmgKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9ub3Rp ZmljYXRpb25zL05vdGlmaWNhdGlvbi5oCkBAIC0zOCw4ICszOCw4IEBACiAjaW5jbHVkZSAiTm90 aWZpY2F0aW9uRGlyZWN0aW9uLmgiCiAjaW5jbHVkZSAiTm90aWZpY2F0aW9uUGVybWlzc2lvbi5o IgogI2luY2x1ZGUgIlNjcmlwdEV4ZWN1dGlvbkNvbnRleHRJZGVudGlmaWVyLmgiCi0jaW5jbHVk ZSA8d3RmL0lkZW50aWZpZWQuaD4KICNpbmNsdWRlIDx3dGYvVVJMLmg+CisjaW5jbHVkZSA8d3Rm L1VVSUQuaD4KICNpbmNsdWRlICJXcml0aW5nTW9kZS5oIgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7 CkBAIC01MSw3ICs1MSw3IEBAIGNsYXNzIE5vdGlmaWNhdGlvblBlcm1pc3Npb25DYWxsYmFjazsK IAogc3RydWN0IE5vdGlmaWNhdGlvbkRhdGE7CiAKLWNsYXNzIE5vdGlmaWNhdGlvbiBmaW5hbCA6 IHB1YmxpYyBUaHJlYWRTYWZlUmVmQ291bnRlZDxOb3RpZmljYXRpb24+LCBwdWJsaWMgQWN0aXZl RE9NT2JqZWN0LCBwdWJsaWMgRXZlbnRUYXJnZXRXaXRoSW5saW5lRGF0YSwgcHVibGljIFVVSURJ ZGVudGlmaWVkPE5vdGlmaWNhdGlvbj4geworY2xhc3MgTm90aWZpY2F0aW9uIGZpbmFsIDogcHVi bGljIFRocmVhZFNhZmVSZWZDb3VudGVkPE5vdGlmaWNhdGlvbj4sIHB1YmxpYyBBY3RpdmVET01P YmplY3QsIHB1YmxpYyBFdmVudFRhcmdldFdpdGhJbmxpbmVEYXRhIHsKICAgICBXVEZfTUFLRV9J U09fQUxMT0NBVEVEX0VYUE9SVChOb3RpZmljYXRpb24sIFdFQkNPUkVfRVhQT1JUKTsKIHB1Ymxp YzoKICAgICB1c2luZyBQZXJtaXNzaW9uID0gTm90aWZpY2F0aW9uUGVybWlzc2lvbjsKQEAgLTk4 LDE5ICs5OCwxOCBAQCBwdWJsaWM6CiAKICAgICBXRUJDT1JFX0VYUE9SVCBOb3RpZmljYXRpb25E YXRhIGRhdGEoKSBjb25zdDsKIAotICAgIFJlZjxOb3RpZmljYXRpb24+IGNvcHlGb3JHZXROb3Rp ZmljYXRpb25zKCkgY29uc3Q7Ci0KICAgICB1c2luZyBUaHJlYWRTYWZlUmVmQ291bnRlZDo6cmVm OwogICAgIHVzaW5nIFRocmVhZFNhZmVSZWZDb3VudGVkOjpkZXJlZjsKIAogICAgIHZvaWQgbWFy a0FzU2hvd24oKTsKICAgICB2b2lkIHNob3dTb29uKCk7CiAKLSAgICBzdGQ6Om9wdGlvbmFsPFVV SUQ+IHJlbGF0ZWROb3RpZmljYXRpb25JZGVudGlmaWVyKCkgY29uc3QgeyByZXR1cm4gbV9yZWxh dGVkTm90aWZpY2F0aW9uSWRlbnRpZmllcjsgfQorICAgIFVVSUQgaWRlbnRpZmllcigpIGNvbnN0 IHsgcmV0dXJuIG1faWRlbnRpZmllcjsgfQorCisgICAgYm9vbCBpc1BlcnNpc3RlbnQoKSBjb25z dCB7IHJldHVybiAhbV9zZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9uVVJMLmlzTnVsbCgpOyB9CiAK IHByaXZhdGU6Ci0gICAgTm90aWZpY2F0aW9uKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQmLCBTdHJp bmcmJiB0aXRsZSwgT3B0aW9ucyYmKTsKLSAgICBOb3RpZmljYXRpb24oY29uc3QgTm90aWZpY2F0 aW9uJik7CisgICAgTm90aWZpY2F0aW9uKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQmLCBVVUlELCBT dHJpbmcmJiB0aXRsZSwgT3B0aW9ucyYmKTsKIAogICAgIE5vdGlmaWNhdGlvbkNsaWVudCogY2xp ZW50RnJvbUNvbnRleHQoKTsKICAgICBFdmVudFRhcmdldEludGVyZmFjZSBldmVudFRhcmdldElu dGVyZmFjZSgpIGNvbnN0IGZpbmFsIHsgcmV0dXJuIE5vdGlmaWNhdGlvbkV2ZW50VGFyZ2V0SW50 ZXJmYWNlVHlwZTsgfQpAQCAtMTI2LDYgKzEyNSw4IEBAIHByaXZhdGU6CiAgICAgdm9pZCBkZXJl ZkV2ZW50VGFyZ2V0KCkgZmluYWwgeyBkZXJlZigpOyB9CiAgICAgdm9pZCBldmVudExpc3RlbmVy c0RpZENoYW5nZSgpIGZpbmFsOwogCisgICAgVVVJRCBtX2lkZW50aWZpZXI7CisKICAgICBTdHJp bmcgbV90aXRsZTsKICAgICBEaXJlY3Rpb24gbV9kaXJlY3Rpb247CiAgICAgU3RyaW5nIG1fbGFu ZzsKQEAgLTE0Myw3ICsxNDQsNiBAQCBwcml2YXRlOgogICAgIH07CiAgICAgTm90aWZpY2F0aW9u U291cmNlIG1fbm90aWZpY2F0aW9uU291cmNlOwogICAgIFNjcmlwdEV4ZWN1dGlvbkNvbnRleHRJ ZGVudGlmaWVyIG1fY29udGV4dElkZW50aWZpZXI7Ci0gICAgc3RkOjpvcHRpb25hbDxVVUlEPiBt X3JlbGF0ZWROb3RpZmljYXRpb25JZGVudGlmaWVyOwogICAgIFVSTCBtX3NlcnZpY2VXb3JrZXJS ZWdpc3RyYXRpb25VUkw7CiB9OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nl c3MvTm90aWZpY2F0aW9ucy9XZWJOb3RpZmljYXRpb25NYW5hZ2VyLmNwcCBiL1NvdXJjZS9XZWJL aXQvV2ViUHJvY2Vzcy9Ob3RpZmljYXRpb25zL1dlYk5vdGlmaWNhdGlvbk1hbmFnZXIuY3BwCmlu ZGV4IDdiYmI1MGUxNDI3MjcwZWQwMjRjZDkwNjUyNmFjMmM0YjY0MDY5MDYuLjBlNTNhM2YyMzAz NjQ5NTEwZjc4MWQzMjhhNzg3ODVhZTc2NWYxZDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv V2ViUHJvY2Vzcy9Ob3RpZmljYXRpb25zL1dlYk5vdGlmaWNhdGlvbk1hbmFnZXIuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9Ob3RpZmljYXRpb25zL1dlYk5vdGlmaWNhdGlvbk1h bmFnZXIuY3BwCkBAIC0xMzAsNyArMTMwLDcgQEAgdGVtcGxhdGU8dHlwZW5hbWUgVT4gYm9vbCBX ZWJOb3RpZmljYXRpb25NYW5hZ2VyOjpzZW5kTm90aWZpY2F0aW9uTWVzc2FnZShVJiYgbWUKIAog I2lmIEVOQUJMRShCVUlMVF9JTl9OT1RJRklDQVRJT05TKQogICAgIGlmIChSdW50aW1lRW5hYmxl ZEZlYXR1cmVzOjpzaGFyZWRGZWF0dXJlcygpLmJ1aWx0SW5Ob3RpZmljYXRpb25zRW5hYmxlZCgp KQotICAgICAgICByZXR1cm4gbV9wcm9jZXNzLmVuc3VyZU5ldHdvcmtQcm9jZXNzQ29ubmVjdGlv bigpLmNvbm5lY3Rpb24oKS5zZW5kKFdURk1vdmUobWVzc2FnZSksIG5vdGlmaWNhdGlvbi5kYXRh KCkuc291cmNlU2Vzc2lvbi50b1VJbnQ2NCgpKTsKKyAgICAgICAgcmV0dXJuIG1fcHJvY2Vzcy5l bnN1cmVOZXR3b3JrUHJvY2Vzc0Nvbm5lY3Rpb24oKS5jb25uZWN0aW9uKCkuc2VuZChXVEZNb3Zl KG1lc3NhZ2UpLCBXZWJQcm9jZXNzOjpzaW5nbGV0b24oKS5zZXNzaW9uSUQoKS50b1VJbnQ2NCgp KTsKICNlbmRpZgogCiAgICAgc3RkOjpvcHRpb25hbDxXZWJDb3JlOjpQYWdlSWRlbnRpZmllcj4g cGFnZUlkZW50aWZpZXI7CkBAIC0xNjAsNyArMTYwLDEwIEBAIGJvb2wgV2ViTm90aWZpY2F0aW9u TWFuYWdlcjo6c2hvdyhOb3RpZmljYXRpb24mIG5vdGlmaWNhdGlvbiwgV2ViUGFnZSogcGFnZSkK ICAgICBpZiAoIXNlbmROb3RpZmljYXRpb25NZXNzYWdlKE1lc3NhZ2VzOjpOb3RpZmljYXRpb25N YW5hZ2VyTWVzc2FnZUhhbmRsZXI6OlNob3dOb3RpZmljYXRpb24obm90aWZpY2F0aW9uLmRhdGEo KSksIG5vdGlmaWNhdGlvbiwgcGFnZSkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAgIG1f bm90aWZpY2F0aW9uSURNYXAuYWRkKG5vdGlmaWNhdGlvbi5pZGVudGlmaWVyKCksICZub3RpZmlj YXRpb24pOworICAgIGlmICghbm90aWZpY2F0aW9uLmlzUGVyc2lzdGVudCgpKSB7CisgICAgICAg IEFTU0VSVCghbV9ub25QZXJzaXN0ZW50Tm90aWZpY2F0aW9ucy5jb250YWlucyhub3RpZmljYXRp b24uaWRlbnRpZmllcigpKSk7CisgICAgICAgIG1fbm9uUGVyc2lzdGVudE5vdGlmaWNhdGlvbnMu YWRkKG5vdGlmaWNhdGlvbi5pZGVudGlmaWVyKCksIG5vdGlmaWNhdGlvbik7CisgICAgfQogICAg IHJldHVybiB0cnVlOwogI2Vsc2UKICAgICBVTlVTRURfUEFSQU0obm90aWZpY2F0aW9uKTsKQEAg LTE3NSwxNCArMTc4LDcgQEAgdm9pZCBXZWJOb3RpZmljYXRpb25NYW5hZ2VyOjpjYW5jZWwoTm90 aWZpY2F0aW9uJiBub3RpZmljYXRpb24sIFdlYlBhZ2UqIHBhZ2UpCiAKICNpZiBFTkFCTEUoTk9U SUZJQ0FUSU9OUykKICAgICBhdXRvIGlkZW50aWZpZXIgPSBub3RpZmljYXRpb24uaWRlbnRpZmll cigpOwotICAgIGF1dG8gbWFwcGVkTm90aWZpY2F0aW9uID0gbV9ub3RpZmljYXRpb25JRE1hcC5n ZXQoaWRlbnRpZmllcik7Ci0gICAgaWYgKCFtYXBwZWROb3RpZmljYXRpb24pIHsKLSAgICAgICAg YXV0byByZWxhdGVkSWRlbnRpZmllciA9IG5vdGlmaWNhdGlvbi5yZWxhdGVkTm90aWZpY2F0aW9u SWRlbnRpZmllcigpOwotICAgICAgICBpZiAoIXJlbGF0ZWRJZGVudGlmaWVyKQotICAgICAgICAg ICAgcmV0dXJuOwotICAgICAgICBpZGVudGlmaWVyID0gKnJlbGF0ZWRJZGVudGlmaWVyOwotICAg IH0gZWxzZQotICAgICAgICBBU1NFUlQobWFwcGVkTm90aWZpY2F0aW9uID09ICZub3RpZmljYXRp b24pOworICAgIEFTU0VSVChub3RpZmljYXRpb24uaXNQZXJzaXN0ZW50KCkgfHwgIW1fbm9uUGVy c2lzdGVudE5vdGlmaWNhdGlvbnMuY29udGFpbnMoaWRlbnRpZmllcikgfHwgbV9ub25QZXJzaXN0 ZW50Tm90aWZpY2F0aW9ucy5nZXQoaWRlbnRpZmllcikgPT0gJm5vdGlmaWNhdGlvbik7CiAKICAg ICBpZiAoIXNlbmROb3RpZmljYXRpb25NZXNzYWdlKE1lc3NhZ2VzOjpOb3RpZmljYXRpb25NYW5h Z2VyTWVzc2FnZUhhbmRsZXI6OkNhbmNlbE5vdGlmaWNhdGlvbihpZGVudGlmaWVyKSwgbm90aWZp Y2F0aW9uLCBwYWdlKSkKICAgICAgICAgcmV0dXJuOwpAQCAtMjAwLDE0ICsxOTYsOCBAQCB2b2lk IFdlYk5vdGlmaWNhdGlvbk1hbmFnZXI6OmRpZERlc3Ryb3lOb3RpZmljYXRpb24oTm90aWZpY2F0 aW9uJiBub3RpZmljYXRpb24sCiAgICAgUmVmIHByb3RlY3RlZE5vdGlmaWNhdGlvbiB7IG5vdGlm aWNhdGlvbiB9OwogCiAgICAgYXV0byBpZGVudGlmaWVyID0gbm90aWZpY2F0aW9uLmlkZW50aWZp ZXIoKTsKLSAgICBhdXRvIHRha2VuTm90aWZpY2F0aW9uID0gbV9ub3RpZmljYXRpb25JRE1hcC50 YWtlKGlkZW50aWZpZXIpOwotICAgIGlmICghdGFrZW5Ob3RpZmljYXRpb24pIHsKLSAgICAgICAg YXV0byByZWxhdGVkSWRlbnRpZmllciA9IG5vdGlmaWNhdGlvbi5yZWxhdGVkTm90aWZpY2F0aW9u SWRlbnRpZmllcigpOwotICAgICAgICBpZiAoIXJlbGF0ZWRJZGVudGlmaWVyKQotICAgICAgICAg ICAgcmV0dXJuOwotICAgICAgICBpZGVudGlmaWVyID0gKnJlbGF0ZWRJZGVudGlmaWVyOwotICAg IH0gZWxzZQotICAgICAgICBBU1NFUlQodGFrZW5Ob3RpZmljYXRpb24gPT0gJm5vdGlmaWNhdGlv bik7CisgICAgUmVmUHRyIHRha2VuTm90aWZpY2F0aW9uID0gIW5vdGlmaWNhdGlvbi5pc1BlcnNp c3RlbnQoKSA/IG1fbm9uUGVyc2lzdGVudE5vdGlmaWNhdGlvbnMudGFrZShpZGVudGlmaWVyKSA6 IG51bGxwdHI7CisgICAgQVNTRVJUKCF0YWtlbk5vdGlmaWNhdGlvbiAgfHwgdGFrZW5Ob3RpZmlj YXRpb24gPT0gJm5vdGlmaWNhdGlvbik7CiAKICAgICBzZW5kTm90aWZpY2F0aW9uTWVzc2FnZShN ZXNzYWdlczo6Tm90aWZpY2F0aW9uTWFuYWdlck1lc3NhZ2VIYW5kbGVyOjpEaWREZXN0cm95Tm90 aWZpY2F0aW9uKGlkZW50aWZpZXIpLCBub3RpZmljYXRpb24sIHBhZ2UpOwogI2Vsc2UKQEAgLTIy Myw3ICsyMTMsNyBAQCB2b2lkIFdlYk5vdGlmaWNhdGlvbk1hbmFnZXI6OmRpZFNob3dOb3RpZmlj YXRpb24oY29uc3QgVVVJRCYgbm90aWZpY2F0aW9uSUQpCiAgICAgTE9HKE5vdGlmaWNhdGlvbnMs ICJXZWJQcm9jZXNzICVpIERJRCBTSE9XIG5vdGlmaWNhdGlvbiAlcyIsIGdldHBpZCgpLCBub3Rp ZmljYXRpb25JRC50b1N0cmluZygpLnV0ZjgoKS5kYXRhKCkpOwogCiAjaWYgRU5BQkxFKE5PVElG SUNBVElPTlMpCi0gICAgUmVmUHRyPE5vdGlmaWNhdGlvbj4gbm90aWZpY2F0aW9uID0gbV9ub3Rp ZmljYXRpb25JRE1hcC5nZXQobm90aWZpY2F0aW9uSUQpOworICAgIFJlZlB0cjxOb3RpZmljYXRp b24+IG5vdGlmaWNhdGlvbiA9IG1fbm9uUGVyc2lzdGVudE5vdGlmaWNhdGlvbnMuZ2V0KG5vdGlm aWNhdGlvbklEKTsKICAgICBpZiAoIW5vdGlmaWNhdGlvbikKICAgICAgICAgcmV0dXJuOwogCkBA IC0yNDAsNyArMjMwLDcgQEAgdm9pZCBXZWJOb3RpZmljYXRpb25NYW5hZ2VyOjpkaWRDbGlja05v dGlmaWNhdGlvbihjb25zdCBVVUlEJiBub3RpZmljYXRpb25JRCkKICAgICBMT0coTm90aWZpY2F0 aW9ucywgIldlYlByb2Nlc3MgJWkgRElEIENMSUNLIG5vdGlmaWNhdGlvbiAlcyIsIGdldHBpZCgp LCBub3RpZmljYXRpb25JRC50b1N0cmluZygpLnV0ZjgoKS5kYXRhKCkpOwogCiAjaWYgRU5BQkxF KE5PVElGSUNBVElPTlMpCi0gICAgUmVmUHRyPE5vdGlmaWNhdGlvbj4gbm90aWZpY2F0aW9uID0g bV9ub3RpZmljYXRpb25JRE1hcC5nZXQobm90aWZpY2F0aW9uSUQpOworICAgIFJlZlB0cjxOb3Rp ZmljYXRpb24+IG5vdGlmaWNhdGlvbiA9IG1fbm9uUGVyc2lzdGVudE5vdGlmaWNhdGlvbnMuZ2V0 KG5vdGlmaWNhdGlvbklEKTsKICAgICBpZiAoIW5vdGlmaWNhdGlvbikKICAgICAgICAgcmV0dXJu OwogCkBAIC0yNjMsNyArMjUzLDcgQEAgdm9pZCBXZWJOb3RpZmljYXRpb25NYW5hZ2VyOjpkaWRD bG9zZU5vdGlmaWNhdGlvbnMoY29uc3QgVmVjdG9yPFVVSUQ+JiBub3RpZmljYXQKICAgICBmb3Ig KHNpemVfdCBpID0gMDsgaSA8IGNvdW50OyArK2kpIHsKICAgICAgICAgYXV0byBub3RpZmljYXRp b25JRCA9IG5vdGlmaWNhdGlvbklEc1tpXTsKIAotICAgICAgICBSZWZQdHI8Tm90aWZpY2F0aW9u PiBub3RpZmljYXRpb24gPSBtX25vdGlmaWNhdGlvbklETWFwLnRha2Uobm90aWZpY2F0aW9uSUQp OworICAgICAgICBSZWZQdHI8Tm90aWZpY2F0aW9uPiBub3RpZmljYXRpb24gPSBtX25vblBlcnNp c3RlbnROb3RpZmljYXRpb25zLnRha2Uobm90aWZpY2F0aW9uSUQpOwogICAgICAgICBpZiAoIW5v dGlmaWNhdGlvbikKICAgICAgICAgICAgIGNvbnRpbnVlOwogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L1dlYlByb2Nlc3MvTm90aWZpY2F0aW9ucy9XZWJOb3RpZmljYXRpb25NYW5hZ2VyLmgg Yi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvTm90aWZpY2F0aW9ucy9XZWJOb3RpZmljYXRpb25N YW5hZ2VyLmgKaW5kZXggNDllYTcxODQ1NWIzMzgyZjZjM2YxMDFiYTE0ZThiYWM3YjVmNTA0Ni4u YjIzNTI2Yjk3NTJiZmMxNTU2ZGVlY2IyNTYxNmFhM2I3Yjc4ZGQ1NCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9XZWJQcm9jZXNzL05vdGlmaWNhdGlvbnMvV2ViTm90aWZpY2F0aW9uTWFuYWdl ci5oCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9Ob3RpZmljYXRpb25zL1dlYk5vdGlm aWNhdGlvbk1hbmFnZXIuaApAQCAtODYsOSArODYsNyBAQCBwcml2YXRlOgogICAgIFdlYlByb2Nl c3MmIG1fcHJvY2VzczsKIAogI2lmIEVOQUJMRShOT1RJRklDQVRJT05TKQotICAgIHR5cGVkZWYg SGFzaE1hcDxVVUlELCBSZWZQdHI8V2ViQ29yZTo6Tm90aWZpY2F0aW9uPj4gTm90aWZpY2F0aW9u SURNYXA7Ci0gICAgTm90aWZpY2F0aW9uSURNYXAgbV9ub3RpZmljYXRpb25JRE1hcDsKLSAgICAK KyAgICBIYXNoTWFwPFVVSUQsIFJlZjxXZWJDb3JlOjpOb3RpZmljYXRpb24+PiBtX25vblBlcnNp c3RlbnROb3RpZmljYXRpb25zOyAgICAKICAgICBIYXNoTWFwPFN0cmluZywgYm9vbD4gbV9wZXJt aXNzaW9uc01hcDsKICNlbmRpZgogfTsK