239409 2022-04-15 16:30:45 -0700 Add logging for WebsiteDataStore data fetch and removal 2022-04-19 14:49:13 -0700 1 1 1 Unclassified WebKit Website Storage WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 sihui_liu sihui_liu cdumez sihui_liu webkit-bug-importer oldest_to_newest 1861969 0 sihui_liu 2022-04-15 16:30:45 -0700 ... 1861971 1 457735 sihui_liu 2022-04-15 16:40:07 -0700 Created attachment 457735 Patch 1862424 2 457856 sihui_liu 2022-04-18 22:13:49 -0700 Created attachment 457856 Patch 1862729 3 ews-feeder 2022-04-19 14:48:53 -0700 Committed r293037 (249776@main): <https://commits.webkit.org/249776@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 457856. 1862730 4 webkit-bug-importer 2022-04-19 14:49:13 -0700 <rdar://problem/91987456> 457735 2022-04-15 16:40:07 -0700 2022-04-18 22:13:47 -0700 Patch bug-239409-20220415164006.patch text/plain 9065 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjkyOTEwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDY1ODg1ZmVlMWE2ODBkMjYy NGQwOWQzY2MwOTA1NWYzOTg3Y2I4ZWQuLjA5NmY0MzhlZmJkYTc0ZDE5MTcwYTQwNWJiMzA0NjAx NjQ2OWI2YTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMjItMDQtMTUgIFNpaHVpIExp dSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIGxvZ2dpbmcgZm9yIFdlYnNp dGVEYXRhU3RvcmUgZGF0YSBmZXRjaCBhbmQgcmVtb3ZhbAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM5NDA5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyB3b3VsZCBoZWxwIHVzIGRlYnVnIGlzc3Vl cyBsaWtlIHJkYXI6Ly85MTQyMjI0NS4KKworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL05ldHdv cmtQcm9jZXNzLmNwcDoKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya1Byb2Nlc3M6OmZldGNoV2Vi c2l0ZURhdGEpOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrUHJvY2Vzczo6ZGVsZXRlV2Vic2l0 ZURhdGEpOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrUHJvY2Vzczo6ZGVsZXRlV2Vic2l0ZURh dGFGb3JPcmlnaW5zKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURh dGFTdG9yZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYnNpdGVEYXRhU3RvcmU6OmZldGNoRGF0 YUFuZEFwcGx5KToKKyAgICAgICAgKFdlYktpdDo6V2Vic2l0ZURhdGFTdG9yZTo6cmVtb3ZlRGF0 YSk6CisKIDIwMjItMDQtMTUgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgogCiAg ICAgICAgIFNlcnZpY2VXb3JrZXIucG9zdE1lc3NhZ2UoKSBkb2Vzbid0IHdvcmsgZnJvbSBpbnNp ZGUgaWZyYW1lCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdv cmtQcm9jZXNzLmNwcCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nl c3MuY3BwCmluZGV4IDZhODc1ZjQwMjQyMTk0ZmE5MmM2ODlkNzRkMWQ0MmNhZjkzNjM3MWQuLjJh MTgxOTNmZTZkOTFiNThjZDZlYTdmM2FhNDk5NDZlYzE5MzIwMzAgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3MuY3BwCisrKyBiL1NvdXJjZS9X ZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3MuY3BwCkBAIC0xNDA3LDYgKzE0MDcs NyBAQCBzdGF0aWMgdm9pZCBmZXRjaERpc2tDYWNoZUVudHJpZXMoTmV0d29ya0NhY2hlOjpDYWNo ZSogY2FjaGUsIFBBTDo6U2Vzc2lvbklEIHNlcwogCiB2b2lkIE5ldHdvcmtQcm9jZXNzOjpmZXRj aFdlYnNpdGVEYXRhKFBBTDo6U2Vzc2lvbklEIHNlc3Npb25JRCwgT3B0aW9uU2V0PFdlYnNpdGVE YXRhVHlwZT4gd2Vic2l0ZURhdGFUeXBlcywgT3B0aW9uU2V0PFdlYnNpdGVEYXRhRmV0Y2hPcHRp b24+IGZldGNoT3B0aW9ucywgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChXZWJzaXRlRGF0YSYmKT4m JiBjb21wbGV0aW9uSGFuZGxlcikKIHsKKyAgICBSRUxFQVNFX0xPRyhTdG9yYWdlLCAiTmV0d29y a1Byb2Nlc3M6OmZldGNoV2Vic2l0ZURhdGEgc3RhcnRlZCB0byBmZXRjaCBkYXRhIGZvciBzZXNz aW9uICUiIFBSSXU2NCwgc2Vzc2lvbklELnRvVUludDY0KCkpOwogICAgIHN0cnVjdCBDYWxsYmFj a0FnZ3JlZ2F0b3IgZmluYWwgOiBwdWJsaWMgVGhyZWFkU2FmZVJlZkNvdW50ZWQ8Q2FsbGJhY2tB Z2dyZWdhdG9yPiB7CiAgICAgICAgIGV4cGxpY2l0IENhbGxiYWNrQWdncmVnYXRvcihDb21wbGV0 aW9uSGFuZGxlcjx2b2lkKFdlYnNpdGVEYXRhJiYpPiYmIGNvbXBsZXRpb25IYW5kbGVyKQogICAg ICAgICAgICAgOiBtX2NvbXBsZXRpb25IYW5kbGVyKFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIp KQpAQCAtMTQxNyw2ICsxNDE4LDcgQEAgdm9pZCBOZXR3b3JrUHJvY2Vzczo6ZmV0Y2hXZWJzaXRl RGF0YShQQUw6OlNlc3Npb25JRCBzZXNzaW9uSUQsIE9wdGlvblNldDxXZWJzaXQKICAgICAgICAg ewogICAgICAgICAgICAgUnVuTG9vcDo6bWFpbigpLmRpc3BhdGNoKFtjb21wbGV0aW9uSGFuZGxl ciA9IFdURk1vdmUobV9jb21wbGV0aW9uSGFuZGxlciksIHdlYnNpdGVEYXRhID0gV1RGTW92ZSht X3dlYnNpdGVEYXRhKV0gKCkgbXV0YWJsZSB7CiAgICAgICAgICAgICAgICAgY29tcGxldGlvbkhh bmRsZXIoV1RGTW92ZSh3ZWJzaXRlRGF0YSkpOworICAgICAgICAgICAgICAgIFJFTEVBU0VfTE9H KFN0b3JhZ2UsICJOZXR3b3JrUHJvY2Vzczo6ZmV0Y2hXZWJzaXRlRGF0YSBmaW5pc2hlZCBmZXRj aGluZyBkYXRhIik7CiAgICAgICAgICAgICB9KTsKICAgICAgICAgfQogCkBAIC0xNDk3LDYgKzE0 OTksNyBAQCB2b2lkIE5ldHdvcmtQcm9jZXNzOjpmZXRjaFdlYnNpdGVEYXRhKFBBTDo6U2Vzc2lv bklEIHNlc3Npb25JRCwgT3B0aW9uU2V0PFdlYnNpdAogCiB2b2lkIE5ldHdvcmtQcm9jZXNzOjpk ZWxldGVXZWJzaXRlRGF0YShQQUw6OlNlc3Npb25JRCBzZXNzaW9uSUQsIE9wdGlvblNldDxXZWJz aXRlRGF0YVR5cGU+IHdlYnNpdGVEYXRhVHlwZXMsIFdhbGxUaW1lIG1vZGlmaWVkU2luY2UsIENv bXBsZXRpb25IYW5kbGVyPHZvaWQoKT4mJiBjb21wbGV0aW9uSGFuZGxlcikKIHsKKyAgICBSRUxF QVNFX0xPRyhTdG9yYWdlLCAiTmV0d29ya1Byb2Nlc3M6OmRlbGV0ZVdlYnNpdGVEYXRhIHN0YXJ0 ZWQgdG8gZGVsZXRlIGRhdGEgbW9kaWZpZWQgc2luY2UgJWYgZm9yIHNlc3Npb24gJSIgUFJJdTY0 LCBtb2RpZmllZFNpbmNlLnNlY29uZHNTaW5jZUVwb2NoKCkudmFsdWUoKSwgc2Vzc2lvbklELnRv VUludDY0KCkpOwogICAgIGF1dG8qIHNlc3Npb24gPSBuZXR3b3JrU2Vzc2lvbihzZXNzaW9uSUQp OwogCiAjaWYgUExBVEZPUk0oQ09DT0EpIHx8IFVTRShTT1VQKQpAQCAtMTUxNSw3ICsxNTE4LDEw IEBAIHZvaWQgTmV0d29ya1Byb2Nlc3M6OmRlbGV0ZVdlYnNpdGVEYXRhKFBBTDo6U2Vzc2lvbklE IHNlc3Npb25JRCwgT3B0aW9uU2V0PFdlYnNpCiAgICAgICAgIFdlYkNvcmU6OkNyZWRlbnRpYWxT dG9yYWdlOjpjbGVhclNlc3Npb25DcmVkZW50aWFscygpOwogICAgIH0KIAotICAgIGF1dG8gY2xl YXJUYXNrc0hhbmRsZXIgPSBXVEY6OkNhbGxiYWNrQWdncmVnYXRvcjo6Y3JlYXRlKFdURk1vdmUo Y29tcGxldGlvbkhhbmRsZXIpKTsKKyAgICBhdXRvIGNsZWFyVGFza3NIYW5kbGVyID0gV1RGOjpD YWxsYmFja0FnZ3JlZ2F0b3I6OmNyZWF0ZShbY29tcGxldGlvbkhhbmRsZXIgPSBXVEZNb3ZlKGNv bXBsZXRpb25IYW5kbGVyKV0geworICAgICAgICBjb21wbGV0aW9uSGFuZGxlcigpOworICAgICAg ICBSRUxFQVNFX0xPRyhTdG9yYWdlLCAiTmV0d29ya1Byb2Nlc3M6OmRlbGV0ZVdlYnNpdGVEYXRh IGZpbmlzaGVkIGRlbGV0aW5nIG1vZGlmaWVkIGRhdGEiKTsKKyAgICB9KTsKIAogICAgIGlmICh3 ZWJzaXRlRGF0YVR5cGVzLmNvbnRhaW5zKFdlYnNpdGVEYXRhVHlwZTo6RE9NQ2FjaGUpICYmIHNl c3Npb24pCiAgICAgICAgIENhY2hlU3RvcmFnZTo6RW5naW5lOjpjbGVhckFsbENhY2hlcygqc2Vz c2lvbiwgW2NsZWFyVGFza3NIYW5kbGVyXSB7IH0pOwpAQCAtMTU4Niw2ICsxNTkyLDcgQEAgc3Rh dGljIHZvaWQgY2xlYXJEaXNrQ2FjaGVFbnRyaWVzKE5ldHdvcmtDYWNoZTo6Q2FjaGUqIGNhY2hl LCBjb25zdCBWZWN0b3I8U2VjdXIKIAogdm9pZCBOZXR3b3JrUHJvY2Vzczo6ZGVsZXRlV2Vic2l0 ZURhdGFGb3JPcmlnaW5zKFBBTDo6U2Vzc2lvbklEIHNlc3Npb25JRCwgT3B0aW9uU2V0PFdlYnNp dGVEYXRhVHlwZT4gd2Vic2l0ZURhdGFUeXBlcywgY29uc3QgVmVjdG9yPFNlY3VyaXR5T3JpZ2lu RGF0YT4mIG9yaWdpbkRhdGFzLCBjb25zdCBWZWN0b3I8U3RyaW5nPiYgY29va2llSG9zdE5hbWVz LCBjb25zdCBWZWN0b3I8U3RyaW5nPiYgSFNUU0NhY2hlSG9zdE5hbWVzLCBjb25zdCBWZWN0b3I8 UmVnaXN0cmFibGVEb21haW4+JiByZWdpc3RyYWJsZURvbWFpbnMsIENvbXBsZXRpb25IYW5kbGVy PHZvaWQoKT4mJiBjb21wbGV0aW9uSGFuZGxlcikKIHsKKyAgICBSRUxFQVNFX0xPRyhTdG9yYWdl LCAiTmV0d29ya1Byb2Nlc3M6OmRlbGV0ZVdlYnNpdGVEYXRhRm9yT3JpZ2lucyBzdGFydGVkIHRv IGRlbGV0ZSBkYXRhIGZvciBzZXNzaW9uICUiIFBSSXU2NCwgc2Vzc2lvbklELnRvVUludDY0KCkp OwogICAgIGF1dG8qIHNlc3Npb24gPSBuZXR3b3JrU2Vzc2lvbihzZXNzaW9uSUQpOwogCiAgICAg aWYgKHdlYnNpdGVEYXRhVHlwZXMuY29udGFpbnMoV2Vic2l0ZURhdGFUeXBlOjpDb29raWVzKSkg ewpAQCAtMTYwNSw3ICsxNjEyLDEwIEBAIHZvaWQgTmV0d29ya1Byb2Nlc3M6OmRlbGV0ZVdlYnNp dGVEYXRhRm9yT3JpZ2lucyhQQUw6OlNlc3Npb25JRCBzZXNzaW9uSUQsIE9wdGlvCiAgICAgfQog I2VuZGlmCiAKLSAgICBhdXRvIGNsZWFyVGFza3NIYW5kbGVyID0gV1RGOjpDYWxsYmFja0FnZ3Jl Z2F0b3I6OmNyZWF0ZShXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKSk7CisgICAgYXV0byBjbGVh clRhc2tzSGFuZGxlciA9IFdURjo6Q2FsbGJhY2tBZ2dyZWdhdG9yOjpjcmVhdGUoW2NvbXBsZXRp b25IYW5kbGVyID0gV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcildIHsKKyAgICAgICAgY29tcGxl dGlvbkhhbmRsZXIoKTsKKyAgICAgICAgUkVMRUFTRV9MT0coU3RvcmFnZSwgIk5ldHdvcmtQcm9j ZXNzOjpkZWxldGVXZWJzaXRlRGF0YUZvck9yaWdpbnMgZmluaXNoZWQgZGVsZXRpbmcgZGF0YSIp OworICAgIH0pOwogCiAgICAgaWYgKHdlYnNpdGVEYXRhVHlwZXMuY29udGFpbnMoV2Vic2l0ZURh dGFUeXBlOjpQcml2YXRlQ2xpY2tNZWFzdXJlbWVudHMpICYmIHNlc3Npb24pIHsKICAgICAgICAg Zm9yIChhdXRvJiBvcmlnaW5EYXRhIDogb3JpZ2luRGF0YXMpCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVN0b3JlLmNwcCBiL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUuY3BwCmluZGV4 IGE2OTQ1ZWNlMjdmY2JlYWYzOTFmYjIwMDlkNDFiZDNmMTdkMDViOWIuLmYxZGU2ZjU2MmRmOWU0 MTZjNGFiYzM5OWQ2MGQ0NWZmYjNmYTI4YzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUuY3BwCkBAIC0zMzksNiAr MzM5LDcgQEAgdm9pZCBXZWJzaXRlRGF0YVN0b3JlOjpmZXRjaERhdGEoT3B0aW9uU2V0PFdlYnNp dGVEYXRhVHlwZT4gZGF0YVR5cGVzLCBPcHRpb25TZXQKIAogdm9pZCBXZWJzaXRlRGF0YVN0b3Jl OjpmZXRjaERhdGFBbmRBcHBseShPcHRpb25TZXQ8V2Vic2l0ZURhdGFUeXBlPiBkYXRhVHlwZXMs IE9wdGlvblNldDxXZWJzaXRlRGF0YUZldGNoT3B0aW9uPiBmZXRjaE9wdGlvbnMsIFJlZjxXb3Jr UXVldWU+JiYgcXVldWUsIEZ1bmN0aW9uPHZvaWQoVmVjdG9yPFdlYnNpdGVEYXRhUmVjb3JkPik+ JiYgYXBwbHkpCiB7CisgICAgUkVMRUFTRV9MT0coU3RvcmFnZSwgIldlYnNpdGVEYXRhU3RvcmU6 OmZldGNoRGF0YUFuZEFwcGx5IHN0YXJ0ZWQgdG8gZmV0Y2ggZGF0YSBmb3Igc2Vzc2lvbiAlIiBQ Ukl1NjQsIHNlc3Npb25JRC50b1VJbnQ2NCgpKTsKICAgICBjbGFzcyBDYWxsYmFja0FnZ3JlZ2F0 b3IgZmluYWwgOiBwdWJsaWMgVGhyZWFkU2FmZVJlZkNvdW50ZWQ8Q2FsbGJhY2tBZ2dyZWdhdG9y LCBXVEY6OkRlc3RydWN0aW9uVGhyZWFkOjpNYWluUnVuTG9vcD4gewogICAgIHB1YmxpYzoKICAg ICAgICAgc3RhdGljIFJlZjxDYWxsYmFja0FnZ3JlZ2F0b3I+IGNyZWF0ZShPcHRpb25TZXQ8V2Vi c2l0ZURhdGFGZXRjaE9wdGlvbj4gZmV0Y2hPcHRpb25zLCBSZWY8V29ya1F1ZXVlPiYmIHF1ZXVl LCBGdW5jdGlvbjx2b2lkKFZlY3RvcjxXZWJzaXRlRGF0YVJlY29yZD4pPiYmIGFwcGx5LCBXZWJz aXRlRGF0YVN0b3JlJiBkYXRhU3RvcmUpCkBAIC0zNTMsOCArMzU0LDkgQEAgdm9pZCBXZWJzaXRl RGF0YVN0b3JlOjpmZXRjaERhdGFBbmRBcHBseShPcHRpb25TZXQ8V2Vic2l0ZURhdGFUeXBlPiBk YXRhVHlwZXMsIE8KICAgICAgICAgICAgIGF1dG8gcmVjb3JkcyA9IFdURjo6bWFwKFdURk1vdmUo bV93ZWJzaXRlRGF0YVJlY29yZHMpLCBbdGhpc10oYXV0byYmIGVudHJ5KSB7CiAgICAgICAgICAg ICAgICAgcmV0dXJuIG1fcXVldWUucHRyKCkgIT0gJldvcmtRdWV1ZTo6bWFpbigpID8gY3Jvc3NU aHJlYWRDb3B5KFdURk1vdmUoZW50cnkudmFsdWUpKSA6IFdURk1vdmUoZW50cnkudmFsdWUpOwog ICAgICAgICAgICAgfSk7Ci0gICAgICAgICAgICBtX3F1ZXVlLT5kaXNwYXRjaChbYXBwbHkgPSBX VEZNb3ZlKG1fYXBwbHkpLCByZWNvcmRzID0gV1RGTW92ZShyZWNvcmRzKV0gKCkgbXV0YWJsZSB7 CisgICAgICAgICAgICBtX3F1ZXVlLT5kaXNwYXRjaChbYXBwbHkgPSBXVEZNb3ZlKG1fYXBwbHkp LCByZWNvcmRzID0gV1RGTW92ZShyZWNvcmRzKSwgc2Vzc2lvbklEID0gbV9wcm90ZWN0ZWREYXRh U3RvcmUtPnNlc3Npb25JRCgpXSAoKSBtdXRhYmxlIHsKICAgICAgICAgICAgICAgICBhcHBseShX VEZNb3ZlKHJlY29yZHMpKTsKKyAgICAgICAgICAgICAgICBSRUxFQVNFX0xPRyhTdG9yYWdlLCAi V2Vic2l0ZURhdGFTdG9yZTo6ZmV0Y2hEYXRhQW5kQXBwbHkgZmluaXNoZWQgZmV0Y2hpbmcgZGF0 YSBmb3Igc2Vzc2lvbiAlIiBQUkl1NjQsIHNlc3Npb25JRC50b1VJbnQ2NCgpKTsKICAgICAgICAg ICAgIH0pOwogICAgICAgICB9CiAKQEAgLTYwOSw3ICs2MTEsMTEgQEAgcHJpdmF0ZToKIAogdm9p ZCBXZWJzaXRlRGF0YVN0b3JlOjpyZW1vdmVEYXRhKE9wdGlvblNldDxXZWJzaXRlRGF0YVR5cGU+ IGRhdGFUeXBlcywgV2FsbFRpbWUgbW9kaWZpZWRTaW5jZSwgRnVuY3Rpb248dm9pZCgpPiYmIGNv bXBsZXRpb25IYW5kbGVyKQogewotICAgIGF1dG8gY2FsbGJhY2tBZ2dyZWdhdG9yID0gUmVtb3Zh bENhbGxiYWNrQWdncmVnYXRvcjo6Y3JlYXRlKCp0aGlzLCBXVEZNb3ZlKGNvbXBsZXRpb25IYW5k bGVyKSk7CisgICAgUkVMRUFTRV9MT0coU3RvcmFnZSwgIldlYnNpdGVEYXRhU3RvcmU6OnJlbW92 ZURhdGEgc3RhcnRlZCB0byBkZWxldGUgZGF0YSBtb2RpZmllZCBzaW5jZSAlZiBmb3Igc2Vzc2lv biAlIiBQUkl1NjQsIG1vZGlmaWVkU2luY2Uuc2Vjb25kc1NpbmNlRXBvY2goKS52YWx1ZSgpLCBz ZXNzaW9uSUQudG9VSW50NjQoKSk7CisgICAgYXV0byBjYWxsYmFja0FnZ3JlZ2F0b3IgPSBSZW1v dmFsQ2FsbGJhY2tBZ2dyZWdhdG9yOjpjcmVhdGUoKnRoaXMsIFtzZXNzaW9uSUQgPSBtX3Nlc3Np b25JRCwgY29tcGxldGlvbkhhbmRsZXIgPSBXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKV0gewor ICAgICAgICBSRUxFQVNFX0xPRyhTdG9yYWdlLCAiV2Vic2l0ZURhdGFTdG9yZTo6cmVtb3ZlRGF0 YSBmaW5pc2hlZCBkZWxldGluZyBtb2RpZmllZCBkYXRhIGZvciBzZXNzaW9uICUiIFBSSXU2NCwg c2Vzc2lvbklELnRvVUludDY0KCkpOworICAgICAgICBjb21wbGV0aW9uSGFuZGxlcigpOworICAg IH0pOwogCiAjaWYgRU5BQkxFKFZJREVPKQogICAgIGlmIChkYXRhVHlwZXMuY29udGFpbnMoV2Vi c2l0ZURhdGFUeXBlOjpEaXNrQ2FjaGUpKSB7CkBAIC02OTYsMTUgKzcwMiwxOCBAQCB2b2lkIFdl YnNpdGVEYXRhU3RvcmU6OnJlbW92ZURhdGEoT3B0aW9uU2V0PFdlYnNpdGVEYXRhVHlwZT4gZGF0 YVR5cGVzLCBXYWxsVGltZQogCiB2b2lkIFdlYnNpdGVEYXRhU3RvcmU6OnJlbW92ZURhdGEoT3B0 aW9uU2V0PFdlYnNpdGVEYXRhVHlwZT4gZGF0YVR5cGVzLCBjb25zdCBWZWN0b3I8V2Vic2l0ZURh dGFSZWNvcmQ+JiBkYXRhUmVjb3JkcywgRnVuY3Rpb248dm9pZCgpPiYmIGNvbXBsZXRpb25IYW5k bGVyKQogewotICAgIFZlY3RvcjxXZWJDb3JlOjpTZWN1cml0eU9yaWdpbkRhdGE+IG9yaWdpbnM7 CisgICAgUkVMRUFTRV9MT0coU3RvcmFnZSwgIldlYnNpdGVEYXRhU3RvcmU6OnJlbW92ZURhdGEg c3RhcnRlZCB0byBkZWxldGUgZGF0YSBmb3Igc2Vzc2lvbiAlIiBQUkl1NjQsIHNlc3Npb25JRC50 b1VJbnQ2NCgpKTsKKyAgICBhdXRvIGNhbGxiYWNrQWdncmVnYXRvciA9IFJlbW92YWxDYWxsYmFj a0FnZ3JlZ2F0b3I6OmNyZWF0ZSgqdGhpcywgW3Nlc3Npb25JRCA9IG1fc2Vzc2lvbklELCBjb21w bGV0aW9uSGFuZGxlciA9IFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpXSB7CisgICAgICAgIFJF TEVBU0VfTE9HKFN0b3JhZ2UsICJXZWJzaXRlRGF0YVN0b3JlOjpyZW1vdmVEYXRhIGZpbmlzaGVk IGRlbGV0aW5nIGRhdGEgZm9yIHNlc3Npb24gJSIgUFJJdTY0LCBzZXNzaW9uSUQudG9VSW50NjQo KSk7CisgICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKCk7CisgICAgfSk7CiAKKyAgICBWZWN0b3I8 V2ViQ29yZTo6U2VjdXJpdHlPcmlnaW5EYXRhPiBvcmlnaW5zOwogICAgIGZvciAoY29uc3QgYXV0 byYgZGF0YVJlY29yZCA6IGRhdGFSZWNvcmRzKSB7CiAgICAgICAgIGZvciAoYXV0byYgb3JpZ2lu IDogZGF0YVJlY29yZC5vcmlnaW5zKQogICAgICAgICAgICAgb3JpZ2lucy5hcHBlbmQob3JpZ2lu KTsKICAgICB9CiAKLSAgICBhdXRvIGNhbGxiYWNrQWdncmVnYXRvciA9IFJlbW92YWxDYWxsYmFj a0FnZ3JlZ2F0b3I6OmNyZWF0ZSgqdGhpcywgV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcikpOwot ICAgIAogICAgIGlmIChkYXRhVHlwZXMuY29udGFpbnMoV2Vic2l0ZURhdGFUeXBlOjpEaXNrQ2Fj aGUpKSB7CiAgICAgICAgIEhhc2hTZXQ8V2ViQ29yZTo6U2VjdXJpdHlPcmlnaW5EYXRhPiBvcmln aW5zOwogICAgICAgICBmb3IgKGNvbnN0IGF1dG8mIGRhdGFSZWNvcmQgOiBkYXRhUmVjb3Jkcykg ewo= 457856 2022-04-18 22:13:49 -0700 2022-04-19 14:48:55 -0700 Patch bug-239409-20220418221348.patch text/plain 9129 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjkyOTU1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDA4ZDU0ZWQ1MmJhM2M4ZDgz Njc5YjYxZmIwZTEwZGJiOTZmODc0ZDcuLjY2ZmRiYjNjZjk1ODVlOTZmN2Y4MWIzMjkxNTk3Y2M4 OTAxYmQ4NGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMjItMDQtMTggIFNpaHVpIExp dSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIGxvZ2dpbmcgZm9yIFdlYnNp dGVEYXRhU3RvcmUgZGF0YSBmZXRjaCBhbmQgcmVtb3ZhbAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM5NDA5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyB3b3VsZCBoZWxwIHVzIGRlYnVnIGlzc3Vl cyBsaWtlIHJkYXI6Ly85MTQyMjI0NS4KKworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL05ldHdv cmtQcm9jZXNzLmNwcDoKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya1Byb2Nlc3M6OmZldGNoV2Vi c2l0ZURhdGEpOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrUHJvY2Vzczo6ZGVsZXRlV2Vic2l0 ZURhdGEpOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrUHJvY2Vzczo6ZGVsZXRlV2Vic2l0ZURh dGFGb3JPcmlnaW5zKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURh dGFTdG9yZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYnNpdGVEYXRhU3RvcmU6OmZldGNoRGF0 YUFuZEFwcGx5KToKKyAgICAgICAgKFdlYktpdDo6V2Vic2l0ZURhdGFTdG9yZTo6cmVtb3ZlRGF0 YSk6CisKIDIwMjItMDQtMTggIFdlbnNvbiBIc2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+ CiAKICAgICAgICAgTWFrZSB0aGUgbWFpbiB2aWRlbyBoZXVyaXN0aWMgcm9idXN0IHdoZW4gdmlk ZW8gZWxlbWVudHMgYXJlIGFkZGVkIGFmdGVyIGVudGVyaW5nIGZ1bGxzY3JlZW4KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3MuY3BwIGIvU291 cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzcy5jcHAKaW5kZXggNmE4NzVm NDAyNDIxOTRmYTkyYzY4OWQ3NGQxZDQyY2FmOTM2MzcxZC4uNTMwY2JjZDVhMDZlMDQyZGI2NjVh NTA4YTBjNmIwY2Q0ZDE4MWYxOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJv Y2Vzcy9OZXR3b3JrUHJvY2Vzcy5jcHAKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vz cy9OZXR3b3JrUHJvY2Vzcy5jcHAKQEAgLTE0MDcsNiArMTQwNyw3IEBAIHN0YXRpYyB2b2lkIGZl dGNoRGlza0NhY2hlRW50cmllcyhOZXR3b3JrQ2FjaGU6OkNhY2hlKiBjYWNoZSwgUEFMOjpTZXNz aW9uSUQgc2VzCiAKIHZvaWQgTmV0d29ya1Byb2Nlc3M6OmZldGNoV2Vic2l0ZURhdGEoUEFMOjpT ZXNzaW9uSUQgc2Vzc2lvbklELCBPcHRpb25TZXQ8V2Vic2l0ZURhdGFUeXBlPiB3ZWJzaXRlRGF0 YVR5cGVzLCBPcHRpb25TZXQ8V2Vic2l0ZURhdGFGZXRjaE9wdGlvbj4gZmV0Y2hPcHRpb25zLCBD b21wbGV0aW9uSGFuZGxlcjx2b2lkKFdlYnNpdGVEYXRhJiYpPiYmIGNvbXBsZXRpb25IYW5kbGVy KQogeworICAgIFJFTEVBU0VfTE9HKFN0b3JhZ2UsICJOZXR3b3JrUHJvY2Vzczo6ZmV0Y2hXZWJz aXRlRGF0YSBzdGFydGVkIHRvIGZldGNoIGRhdGEgZm9yIHNlc3Npb24gJSIgUFJJdTY0LCBzZXNz aW9uSUQudG9VSW50NjQoKSk7CiAgICAgc3RydWN0IENhbGxiYWNrQWdncmVnYXRvciBmaW5hbCA6 IHB1YmxpYyBUaHJlYWRTYWZlUmVmQ291bnRlZDxDYWxsYmFja0FnZ3JlZ2F0b3I+IHsKICAgICAg ICAgZXhwbGljaXQgQ2FsbGJhY2tBZ2dyZWdhdG9yKENvbXBsZXRpb25IYW5kbGVyPHZvaWQoV2Vi c2l0ZURhdGEmJik+JiYgY29tcGxldGlvbkhhbmRsZXIpCiAgICAgICAgICAgICA6IG1fY29tcGxl dGlvbkhhbmRsZXIoV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcikpCkBAIC0xNDE3LDYgKzE0MTgs NyBAQCB2b2lkIE5ldHdvcmtQcm9jZXNzOjpmZXRjaFdlYnNpdGVEYXRhKFBBTDo6U2Vzc2lvbklE IHNlc3Npb25JRCwgT3B0aW9uU2V0PFdlYnNpdAogICAgICAgICB7CiAgICAgICAgICAgICBSdW5M b29wOjptYWluKCkuZGlzcGF0Y2goW2NvbXBsZXRpb25IYW5kbGVyID0gV1RGTW92ZShtX2NvbXBs ZXRpb25IYW5kbGVyKSwgd2Vic2l0ZURhdGEgPSBXVEZNb3ZlKG1fd2Vic2l0ZURhdGEpXSAoKSBt dXRhYmxlIHsKICAgICAgICAgICAgICAgICBjb21wbGV0aW9uSGFuZGxlcihXVEZNb3ZlKHdlYnNp dGVEYXRhKSk7CisgICAgICAgICAgICAgICAgUkVMRUFTRV9MT0coU3RvcmFnZSwgIk5ldHdvcmtQ cm9jZXNzOjpmZXRjaFdlYnNpdGVEYXRhIGZpbmlzaGVkIGZldGNoaW5nIGRhdGEiKTsKICAgICAg ICAgICAgIH0pOwogICAgICAgICB9CiAKQEAgLTE0OTcsNiArMTQ5OSw3IEBAIHZvaWQgTmV0d29y a1Byb2Nlc3M6OmZldGNoV2Vic2l0ZURhdGEoUEFMOjpTZXNzaW9uSUQgc2Vzc2lvbklELCBPcHRp b25TZXQ8V2Vic2l0CiAKIHZvaWQgTmV0d29ya1Byb2Nlc3M6OmRlbGV0ZVdlYnNpdGVEYXRhKFBB TDo6U2Vzc2lvbklEIHNlc3Npb25JRCwgT3B0aW9uU2V0PFdlYnNpdGVEYXRhVHlwZT4gd2Vic2l0 ZURhdGFUeXBlcywgV2FsbFRpbWUgbW9kaWZpZWRTaW5jZSwgQ29tcGxldGlvbkhhbmRsZXI8dm9p ZCgpPiYmIGNvbXBsZXRpb25IYW5kbGVyKQogeworICAgIFJFTEVBU0VfTE9HKFN0b3JhZ2UsICJO ZXR3b3JrUHJvY2Vzczo6ZGVsZXRlV2Vic2l0ZURhdGEgc3RhcnRlZCB0byBkZWxldGUgZGF0YSBt b2RpZmllZCBzaW5jZSAlZiBmb3Igc2Vzc2lvbiAlIiBQUkl1NjQsIG1vZGlmaWVkU2luY2Uuc2Vj b25kc1NpbmNlRXBvY2goKS52YWx1ZSgpLCBzZXNzaW9uSUQudG9VSW50NjQoKSk7CiAgICAgYXV0 byogc2Vzc2lvbiA9IG5ldHdvcmtTZXNzaW9uKHNlc3Npb25JRCk7CiAKICNpZiBQTEFURk9STShD T0NPQSkgfHwgVVNFKFNPVVApCkBAIC0xNTE1LDcgKzE1MTgsMTAgQEAgdm9pZCBOZXR3b3JrUHJv Y2Vzczo6ZGVsZXRlV2Vic2l0ZURhdGEoUEFMOjpTZXNzaW9uSUQgc2Vzc2lvbklELCBPcHRpb25T ZXQ8V2Vic2kKICAgICAgICAgV2ViQ29yZTo6Q3JlZGVudGlhbFN0b3JhZ2U6OmNsZWFyU2Vzc2lv bkNyZWRlbnRpYWxzKCk7CiAgICAgfQogCi0gICAgYXV0byBjbGVhclRhc2tzSGFuZGxlciA9IFdU Rjo6Q2FsbGJhY2tBZ2dyZWdhdG9yOjpjcmVhdGUoV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcikp OworICAgIGF1dG8gY2xlYXJUYXNrc0hhbmRsZXIgPSBXVEY6OkNhbGxiYWNrQWdncmVnYXRvcjo6 Y3JlYXRlKFtjb21wbGV0aW9uSGFuZGxlciA9IFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpXSgp IG11dGFibGUgeworICAgICAgICBjb21wbGV0aW9uSGFuZGxlcigpOworICAgICAgICBSRUxFQVNF X0xPRyhTdG9yYWdlLCAiTmV0d29ya1Byb2Nlc3M6OmRlbGV0ZVdlYnNpdGVEYXRhIGZpbmlzaGVk IGRlbGV0aW5nIG1vZGlmaWVkIGRhdGEiKTsKKyAgICB9KTsKIAogICAgIGlmICh3ZWJzaXRlRGF0 YVR5cGVzLmNvbnRhaW5zKFdlYnNpdGVEYXRhVHlwZTo6RE9NQ2FjaGUpICYmIHNlc3Npb24pCiAg ICAgICAgIENhY2hlU3RvcmFnZTo6RW5naW5lOjpjbGVhckFsbENhY2hlcygqc2Vzc2lvbiwgW2Ns ZWFyVGFza3NIYW5kbGVyXSB7IH0pOwpAQCAtMTU4Niw2ICsxNTkyLDcgQEAgc3RhdGljIHZvaWQg Y2xlYXJEaXNrQ2FjaGVFbnRyaWVzKE5ldHdvcmtDYWNoZTo6Q2FjaGUqIGNhY2hlLCBjb25zdCBW ZWN0b3I8U2VjdXIKIAogdm9pZCBOZXR3b3JrUHJvY2Vzczo6ZGVsZXRlV2Vic2l0ZURhdGFGb3JP cmlnaW5zKFBBTDo6U2Vzc2lvbklEIHNlc3Npb25JRCwgT3B0aW9uU2V0PFdlYnNpdGVEYXRhVHlw ZT4gd2Vic2l0ZURhdGFUeXBlcywgY29uc3QgVmVjdG9yPFNlY3VyaXR5T3JpZ2luRGF0YT4mIG9y aWdpbkRhdGFzLCBjb25zdCBWZWN0b3I8U3RyaW5nPiYgY29va2llSG9zdE5hbWVzLCBjb25zdCBW ZWN0b3I8U3RyaW5nPiYgSFNUU0NhY2hlSG9zdE5hbWVzLCBjb25zdCBWZWN0b3I8UmVnaXN0cmFi bGVEb21haW4+JiByZWdpc3RyYWJsZURvbWFpbnMsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoKT4m JiBjb21wbGV0aW9uSGFuZGxlcikKIHsKKyAgICBSRUxFQVNFX0xPRyhTdG9yYWdlLCAiTmV0d29y a1Byb2Nlc3M6OmRlbGV0ZVdlYnNpdGVEYXRhRm9yT3JpZ2lucyBzdGFydGVkIHRvIGRlbGV0ZSBk YXRhIGZvciBzZXNzaW9uICUiIFBSSXU2NCwgc2Vzc2lvbklELnRvVUludDY0KCkpOwogICAgIGF1 dG8qIHNlc3Npb24gPSBuZXR3b3JrU2Vzc2lvbihzZXNzaW9uSUQpOwogCiAgICAgaWYgKHdlYnNp dGVEYXRhVHlwZXMuY29udGFpbnMoV2Vic2l0ZURhdGFUeXBlOjpDb29raWVzKSkgewpAQCAtMTYw NSw3ICsxNjEyLDEwIEBAIHZvaWQgTmV0d29ya1Byb2Nlc3M6OmRlbGV0ZVdlYnNpdGVEYXRhRm9y T3JpZ2lucyhQQUw6OlNlc3Npb25JRCBzZXNzaW9uSUQsIE9wdGlvCiAgICAgfQogI2VuZGlmCiAK LSAgICBhdXRvIGNsZWFyVGFza3NIYW5kbGVyID0gV1RGOjpDYWxsYmFja0FnZ3JlZ2F0b3I6OmNy ZWF0ZShXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKSk7CisgICAgYXV0byBjbGVhclRhc2tzSGFu ZGxlciA9IFdURjo6Q2FsbGJhY2tBZ2dyZWdhdG9yOjpjcmVhdGUoW2NvbXBsZXRpb25IYW5kbGVy ID0gV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcildKCkgbXV0YWJsZSB7CisgICAgICAgIGNvbXBs ZXRpb25IYW5kbGVyKCk7CisgICAgICAgIFJFTEVBU0VfTE9HKFN0b3JhZ2UsICJOZXR3b3JrUHJv Y2Vzczo6ZGVsZXRlV2Vic2l0ZURhdGFGb3JPcmlnaW5zIGZpbmlzaGVkIGRlbGV0aW5nIGRhdGEi KTsKKyAgICB9KTsKIAogICAgIGlmICh3ZWJzaXRlRGF0YVR5cGVzLmNvbnRhaW5zKFdlYnNpdGVE YXRhVHlwZTo6UHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRzKSAmJiBzZXNzaW9uKSB7CiAgICAgICAg IGZvciAoYXV0byYgb3JpZ2luRGF0YSA6IG9yaWdpbkRhdGFzKQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5jcHAgYi9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVN0b3JlLmNwcAppbmRl eCBhNjk0NWVjZTI3ZmNiZWFmMzkxZmIyMDA5ZDQxYmQzZjE3ZDA1YjliLi45ODFmNzQ3Y2YwODM5 YWY2NGMwZmU4N2VlZDIxNmZhYjUwZTRiNzAwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVN0b3JlLmNwcAorKysgYi9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVN0b3JlLmNwcApAQCAtMzM5LDYg KzMzOSw3IEBAIHZvaWQgV2Vic2l0ZURhdGFTdG9yZTo6ZmV0Y2hEYXRhKE9wdGlvblNldDxXZWJz aXRlRGF0YVR5cGU+IGRhdGFUeXBlcywgT3B0aW9uU2V0CiAKIHZvaWQgV2Vic2l0ZURhdGFTdG9y ZTo6ZmV0Y2hEYXRhQW5kQXBwbHkoT3B0aW9uU2V0PFdlYnNpdGVEYXRhVHlwZT4gZGF0YVR5cGVz LCBPcHRpb25TZXQ8V2Vic2l0ZURhdGFGZXRjaE9wdGlvbj4gZmV0Y2hPcHRpb25zLCBSZWY8V29y a1F1ZXVlPiYmIHF1ZXVlLCBGdW5jdGlvbjx2b2lkKFZlY3RvcjxXZWJzaXRlRGF0YVJlY29yZD4p PiYmIGFwcGx5KQogeworICAgIFJFTEVBU0VfTE9HKFN0b3JhZ2UsICJXZWJzaXRlRGF0YVN0b3Jl OjpmZXRjaERhdGFBbmRBcHBseSBzdGFydGVkIHRvIGZldGNoIGRhdGEgZm9yIHNlc3Npb24gJSIg UFJJdTY0LCBtX3Nlc3Npb25JRC50b1VJbnQ2NCgpKTsKICAgICBjbGFzcyBDYWxsYmFja0FnZ3Jl Z2F0b3IgZmluYWwgOiBwdWJsaWMgVGhyZWFkU2FmZVJlZkNvdW50ZWQ8Q2FsbGJhY2tBZ2dyZWdh dG9yLCBXVEY6OkRlc3RydWN0aW9uVGhyZWFkOjpNYWluUnVuTG9vcD4gewogICAgIHB1YmxpYzoK ICAgICAgICAgc3RhdGljIFJlZjxDYWxsYmFja0FnZ3JlZ2F0b3I+IGNyZWF0ZShPcHRpb25TZXQ8 V2Vic2l0ZURhdGFGZXRjaE9wdGlvbj4gZmV0Y2hPcHRpb25zLCBSZWY8V29ya1F1ZXVlPiYmIHF1 ZXVlLCBGdW5jdGlvbjx2b2lkKFZlY3RvcjxXZWJzaXRlRGF0YVJlY29yZD4pPiYmIGFwcGx5LCBX ZWJzaXRlRGF0YVN0b3JlJiBkYXRhU3RvcmUpCkBAIC0zNTMsOCArMzU0LDkgQEAgdm9pZCBXZWJz aXRlRGF0YVN0b3JlOjpmZXRjaERhdGFBbmRBcHBseShPcHRpb25TZXQ8V2Vic2l0ZURhdGFUeXBl PiBkYXRhVHlwZXMsIE8KICAgICAgICAgICAgIGF1dG8gcmVjb3JkcyA9IFdURjo6bWFwKFdURk1v dmUobV93ZWJzaXRlRGF0YVJlY29yZHMpLCBbdGhpc10oYXV0byYmIGVudHJ5KSB7CiAgICAgICAg ICAgICAgICAgcmV0dXJuIG1fcXVldWUucHRyKCkgIT0gJldvcmtRdWV1ZTo6bWFpbigpID8gY3Jv c3NUaHJlYWRDb3B5KFdURk1vdmUoZW50cnkudmFsdWUpKSA6IFdURk1vdmUoZW50cnkudmFsdWUp OwogICAgICAgICAgICAgfSk7Ci0gICAgICAgICAgICBtX3F1ZXVlLT5kaXNwYXRjaChbYXBwbHkg PSBXVEZNb3ZlKG1fYXBwbHkpLCByZWNvcmRzID0gV1RGTW92ZShyZWNvcmRzKV0gKCkgbXV0YWJs ZSB7CisgICAgICAgICAgICBtX3F1ZXVlLT5kaXNwYXRjaChbYXBwbHkgPSBXVEZNb3ZlKG1fYXBw bHkpLCByZWNvcmRzID0gV1RGTW92ZShyZWNvcmRzKSwgc2Vzc2lvbklEID0gbV9wcm90ZWN0ZWRE YXRhU3RvcmUtPnNlc3Npb25JRCgpXSAoKSBtdXRhYmxlIHsKICAgICAgICAgICAgICAgICBhcHBs eShXVEZNb3ZlKHJlY29yZHMpKTsKKyAgICAgICAgICAgICAgICBSRUxFQVNFX0xPRyhTdG9yYWdl LCAiV2Vic2l0ZURhdGFTdG9yZTo6ZmV0Y2hEYXRhQW5kQXBwbHkgZmluaXNoZWQgZmV0Y2hpbmcg ZGF0YSBmb3Igc2Vzc2lvbiAlIiBQUkl1NjQsIHNlc3Npb25JRC50b1VJbnQ2NCgpKTsKICAgICAg ICAgICAgIH0pOwogICAgICAgICB9CiAKQEAgLTYwOSw3ICs2MTEsMTEgQEAgcHJpdmF0ZToKIAog dm9pZCBXZWJzaXRlRGF0YVN0b3JlOjpyZW1vdmVEYXRhKE9wdGlvblNldDxXZWJzaXRlRGF0YVR5 cGU+IGRhdGFUeXBlcywgV2FsbFRpbWUgbW9kaWZpZWRTaW5jZSwgRnVuY3Rpb248dm9pZCgpPiYm IGNvbXBsZXRpb25IYW5kbGVyKQogewotICAgIGF1dG8gY2FsbGJhY2tBZ2dyZWdhdG9yID0gUmVt b3ZhbENhbGxiYWNrQWdncmVnYXRvcjo6Y3JlYXRlKCp0aGlzLCBXVEZNb3ZlKGNvbXBsZXRpb25I YW5kbGVyKSk7CisgICAgUkVMRUFTRV9MT0coU3RvcmFnZSwgIldlYnNpdGVEYXRhU3RvcmU6OnJl bW92ZURhdGEgc3RhcnRlZCB0byBkZWxldGUgZGF0YSBtb2RpZmllZCBzaW5jZSAlZiBmb3Igc2Vz c2lvbiAlIiBQUkl1NjQsIG1vZGlmaWVkU2luY2Uuc2Vjb25kc1NpbmNlRXBvY2goKS52YWx1ZSgp LCBtX3Nlc3Npb25JRC50b1VJbnQ2NCgpKTsKKyAgICBhdXRvIGNhbGxiYWNrQWdncmVnYXRvciA9 IFJlbW92YWxDYWxsYmFja0FnZ3JlZ2F0b3I6OmNyZWF0ZSgqdGhpcywgW3Nlc3Npb25JRCA9IG1f c2Vzc2lvbklELCBjb21wbGV0aW9uSGFuZGxlciA9IFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIp XSB7CisgICAgICAgIFJFTEVBU0VfTE9HKFN0b3JhZ2UsICJXZWJzaXRlRGF0YVN0b3JlOjpyZW1v dmVEYXRhIGZpbmlzaGVkIGRlbGV0aW5nIG1vZGlmaWVkIGRhdGEgZm9yIHNlc3Npb24gJSIgUFJJ dTY0LCBzZXNzaW9uSUQudG9VSW50NjQoKSk7CisgICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKCk7 CisgICAgfSk7CiAKICNpZiBFTkFCTEUoVklERU8pCiAgICAgaWYgKGRhdGFUeXBlcy5jb250YWlu cyhXZWJzaXRlRGF0YVR5cGU6OkRpc2tDYWNoZSkpIHsKQEAgLTY5NiwxNSArNzAyLDE4IEBAIHZv aWQgV2Vic2l0ZURhdGFTdG9yZTo6cmVtb3ZlRGF0YShPcHRpb25TZXQ8V2Vic2l0ZURhdGFUeXBl PiBkYXRhVHlwZXMsIFdhbGxUaW1lCiAKIHZvaWQgV2Vic2l0ZURhdGFTdG9yZTo6cmVtb3ZlRGF0 YShPcHRpb25TZXQ8V2Vic2l0ZURhdGFUeXBlPiBkYXRhVHlwZXMsIGNvbnN0IFZlY3RvcjxXZWJz aXRlRGF0YVJlY29yZD4mIGRhdGFSZWNvcmRzLCBGdW5jdGlvbjx2b2lkKCk+JiYgY29tcGxldGlv bkhhbmRsZXIpCiB7Ci0gICAgVmVjdG9yPFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luRGF0YT4gb3Jp Z2luczsKKyAgICBSRUxFQVNFX0xPRyhTdG9yYWdlLCAiV2Vic2l0ZURhdGFTdG9yZTo6cmVtb3Zl RGF0YSBzdGFydGVkIHRvIGRlbGV0ZSBkYXRhIGZvciBzZXNzaW9uICUiIFBSSXU2NCwgbV9zZXNz aW9uSUQudG9VSW50NjQoKSk7CisgICAgYXV0byBjYWxsYmFja0FnZ3JlZ2F0b3IgPSBSZW1vdmFs Q2FsbGJhY2tBZ2dyZWdhdG9yOjpjcmVhdGUoKnRoaXMsIFtzZXNzaW9uSUQgPSBtX3Nlc3Npb25J RCwgY29tcGxldGlvbkhhbmRsZXIgPSBXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKV0geworICAg ICAgICBSRUxFQVNFX0xPRyhTdG9yYWdlLCAiV2Vic2l0ZURhdGFTdG9yZTo6cmVtb3ZlRGF0YSBm aW5pc2hlZCBkZWxldGluZyBkYXRhIGZvciBzZXNzaW9uICUiIFBSSXU2NCwgc2Vzc2lvbklELnRv VUludDY0KCkpOworICAgICAgICBjb21wbGV0aW9uSGFuZGxlcigpOworICAgIH0pOwogCisgICAg VmVjdG9yPFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luRGF0YT4gb3JpZ2luczsKICAgICBmb3IgKGNv bnN0IGF1dG8mIGRhdGFSZWNvcmQgOiBkYXRhUmVjb3JkcykgewogICAgICAgICBmb3IgKGF1dG8m IG9yaWdpbiA6IGRhdGFSZWNvcmQub3JpZ2lucykKICAgICAgICAgICAgIG9yaWdpbnMuYXBwZW5k KG9yaWdpbik7CiAgICAgfQogCi0gICAgYXV0byBjYWxsYmFja0FnZ3JlZ2F0b3IgPSBSZW1vdmFs Q2FsbGJhY2tBZ2dyZWdhdG9yOjpjcmVhdGUoKnRoaXMsIFdURk1vdmUoY29tcGxldGlvbkhhbmRs ZXIpKTsKLSAgICAKICAgICBpZiAoZGF0YVR5cGVzLmNvbnRhaW5zKFdlYnNpdGVEYXRhVHlwZTo6 RGlza0NhY2hlKSkgewogICAgICAgICBIYXNoU2V0PFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luRGF0 YT4gb3JpZ2luczsKICAgICAgICAgZm9yIChjb25zdCBhdXRvJiBkYXRhUmVjb3JkIDogZGF0YVJl Y29yZHMpIHsK