230236 2021-09-13 16:26:40 -0700 Implement network process crash recovery for BroadcastChannel 2021-09-15 18:03:27 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 161472 1 cdumez cdumez achristensen beidson darin ggaren kkinnunen webkit-bug-importer oldest_to_newest 1793144 0 cdumez 2021-09-13 16:26:40 -0700 Implement network process crash recovery for BroadcastChannel. Currently, if the network process crashes and relaunches, pre-existing BroadcastChannels will be broken (communication won't be possible between WebProcesses). 1793716 1 438247 cdumez 2021-09-15 08:39:59 -0700 Created attachment 438247 Patch 1793775 2 438247 darin 2021-09-15 11:20:33 -0700 Comment on attachment 438247 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=438247&action=review > Source/WebKit/WebProcess/WebCoreSupport/WebBroadcastChannelRegistry.cpp:113 > + for (auto& channelsPerOriginEntry : m_channelsPerOrigin) { > + auto& origin = channelsPerOriginEntry.key; > + auto& channelsForOrigin = channelsPerOriginEntry.value; I believe we can write this with de-structuring and save many lines of code: for (auto& [origin, channelsForOrigin] : m_channelsPerOrigin) { But I haven’t tried it. Seems like it would be better if it works. 1793781 3 438267 cdumez 2021-09-15 11:32:46 -0700 Created attachment 438267 Patch 1793922 4 ews-feeder 2021-09-15 18:02:27 -0700 Committed r282483 (241731@main): <https://commits.webkit.org/241731@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 438267. 1793923 5 webkit-bug-importer 2021-09-15 18:03:27 -0700 <rdar://problem/83176366> 438247 2021-09-15 08:39:59 -0700 2021-09-15 11:32:44 -0700 Patch bug-230236-20210915083958.patch text/plain 10584 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjgyNDUyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGY2YzA3ZGE1ODRmNWY3NWNk M2RjNmI0MDIwMjgwMjkxNzE1MDMzMjguLmUxZTU3ZGQzZDA5NzNlZDJlOGRhZjRiY2FkMTU2ZjM3 N2YwMDA1ZTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMjEtMDktMTUgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBJbXBsZW1lbnQgbmV0d29yayBwcm9j ZXNzIGNyYXNoIHJlY292ZXJ5IGZvciBCcm9hZGNhc3RDaGFubmVsCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzAyMzYKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBIYXZlIHRoZSBXZWJCcm9hZGNhc3RDaGFu bmVsUmVnaXN0cnkgcmVnaXN0ZXIgaXRzIEJyb2FkY2FzdENoYW5uZWxzIHdpdGggdGhlIG5ldHdv cmsKKyAgICAgICAgcHJvY2VzcyBhZnRlciBhIG5ldHdvcmsgcHJvY2VzcyBjcmFzaC4gVGhpcyBp cyB1c2VmdWwgc28gdGhhdCBjcm9zcy1XZWJQcm9jZXNzCisgICAgICAgIGNvbW11bmljYXRpb24g Y2FuIGtlZXAgaGFwcGVuaW5nIHZpYSBleGlzdGluZyBCcm9hZGNhc3RDaGFubmVsIGFmdGVyIGEg bmV0d29yayBwcm9jZXNzCisgICAgICAgIGNyYXNoLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9X ZWJDb3JlU3VwcG9ydC9XZWJCcm9hZGNhc3RDaGFubmVsUmVnaXN0cnkuY3BwOgorICAgICAgICAo V2ViS2l0OjpXZWJCcm9hZGNhc3RDaGFubmVsUmVnaXN0cnk6Om5ldHdvcmtQcm9jZXNzQ3Jhc2hl ZCk6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJCcm9hZGNhc3RDaGFu bmVsUmVnaXN0cnkuaDoKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlByb2Nlc3MuY3BwOgorICAg ICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzOjpuZXR3b3JrUHJvY2Vzc0Nvbm5lY3Rpb25DbG9zZWQp OgorCiAyMDIxLTA5LTE1ICBUaW0gSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgog CiAgICAgICAgIFJlbW92ZSB0aGUgIlJlcGxhY2UgV2ViS2l0QWRkaXRpb25zIGluIEZyYW1ld29y ayBIZWFkZXJzIiBidWlsZCBwaGFzZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9j ZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkJyb2FkY2FzdENoYW5uZWxSZWdpc3RyeS5jcHAgYi9Tb3Vy Y2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViQnJvYWRjYXN0Q2hhbm5lbFJl Z2lzdHJ5LmNwcAppbmRleCA4MWNhYzQyNjU0NWJjOWFhYTgwOWVlZTc2MzVhOTZkMjc5MzE1ZTJk Li4xYzEzOTFkZTUyM2VlMmZmOWM0NzQxMTM4YzQ0NjQyZGUxZjEwZTg1IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViQnJvYWRjYXN0Q2hhbm5l bFJlZ2lzdHJ5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBv cnQvV2ViQnJvYWRjYXN0Q2hhbm5lbFJlZ2lzdHJ5LmNwcApAQCAtMTA2LDQgKzEwNiwxNCBAQCB2 b2lkIFdlYkJyb2FkY2FzdENoYW5uZWxSZWdpc3RyeTo6cG9zdE1lc3NhZ2VUb1JlbW90ZShjb25z dCBXZWJDb3JlOjpDbGllbnRPcmlnaQogICAgIHBvc3RNZXNzYWdlTG9jYWxseShvcmlnaW4sIG5h bWUsIHN0ZDo6bnVsbG9wdCwgKm1lc3NhZ2UubWVzc2FnZSwgY2FsbGJhY2tBZ2dyZWdhdG9yLmNv cHlSZWYoKSk7CiB9CiAKK3ZvaWQgV2ViQnJvYWRjYXN0Q2hhbm5lbFJlZ2lzdHJ5OjpuZXR3b3Jr UHJvY2Vzc0NyYXNoZWQoKQoreworICAgIGZvciAoYXV0byYgY2hhbm5lbHNQZXJPcmlnaW5FbnRy eSA6IG1fY2hhbm5lbHNQZXJPcmlnaW4pIHsKKyAgICAgICAgYXV0byYgb3JpZ2luID0gY2hhbm5l bHNQZXJPcmlnaW5FbnRyeS5rZXk7CisgICAgICAgIGF1dG8mIGNoYW5uZWxzRm9yT3JpZ2luID0g Y2hhbm5lbHNQZXJPcmlnaW5FbnRyeS52YWx1ZTsKKyAgICAgICAgZm9yIChhdXRvJiBuYW1lIDog Y2hhbm5lbHNGb3JPcmlnaW4ua2V5cygpKQorICAgICAgICAgICAgbmV0d29ya1Byb2Nlc3NDb25u ZWN0aW9uKCkuc2VuZChNZXNzYWdlczo6TmV0d29ya0Jyb2FkY2FzdENoYW5uZWxSZWdpc3RyeTo6 UmVnaXN0ZXJDaGFubmVsIHsgb3JpZ2luLCBuYW1lIH0sIDApOworICAgIH0KK30KKwogfSAvLyBu YW1lc3BhY2UgV2ViS2l0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2Vi Q29yZVN1cHBvcnQvV2ViQnJvYWRjYXN0Q2hhbm5lbFJlZ2lzdHJ5LmggYi9Tb3VyY2UvV2ViS2l0 L1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViQnJvYWRjYXN0Q2hhbm5lbFJlZ2lzdHJ5LmgK aW5kZXggM2NiM2U3NTRmOGI3MzI1ZGEwYTU2MjFhMTAzYTI4MWE3NjFmZDg5ZC4uZmIzOTk2NmNi YWE1MmQ0MzgxYjVmZGZmOWY5MTQ3NTA4Mjc3NmNhMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkJyb2FkY2FzdENoYW5uZWxSZWdpc3RyeS5o CisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJCcm9hZGNh c3RDaGFubmVsUmVnaXN0cnkuaApAQCAtNTIsNiArNTIsOCBAQCBwdWJsaWM6CiAgICAgdm9pZCB1 bnJlZ2lzdGVyQ2hhbm5lbChjb25zdCBXZWJDb3JlOjpDbGllbnRPcmlnaW4mLCBjb25zdCBTdHJp bmcmIG5hbWUsIFdlYkNvcmU6OkJyb2FkY2FzdENoYW5uZWxJZGVudGlmaWVyKSBmaW5hbDsKICAg ICB2b2lkIHBvc3RNZXNzYWdlKGNvbnN0IFdlYkNvcmU6OkNsaWVudE9yaWdpbiYsIGNvbnN0IFN0 cmluZyYgbmFtZSwgV2ViQ29yZTo6QnJvYWRjYXN0Q2hhbm5lbElkZW50aWZpZXIgc291cmNlLCBS ZWY8V2ViQ29yZTo6U2VyaWFsaXplZFNjcmlwdFZhbHVlPiYmLCBDb21wbGV0aW9uSGFuZGxlcjx2 b2lkKCk+JiYpIGZpbmFsOwogCisgICAgdm9pZCBuZXR3b3JrUHJvY2Vzc0NyYXNoZWQoKTsKKwog ICAgIHZvaWQgZGlkUmVjZWl2ZU1lc3NhZ2UoSVBDOjpDb25uZWN0aW9uJiwgSVBDOjpEZWNvZGVy Jik7CiAKIHByaXZhdGU6CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2Vi UHJvY2Vzcy5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUHJvY2Vzcy5jcHAKaW5k ZXggNmIzYjU0YjM4NzYxOWU5MWUzZmUyNTRmYjZiMjkxZGFjZjFhNmVlOS4uMzdmNmJlZjEwMjFj YThlYzUxN2YwNGMyZjYwZDRmYmUzN2ExNzU1MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9X ZWJQcm9jZXNzL1dlYlByb2Nlc3MuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9X ZWJQcm9jZXNzLmNwcApAQCAtMTE5NSw2ICsxMTk1LDcgQEAgdm9pZCBXZWJQcm9jZXNzOjpuZXR3 b3JrUHJvY2Vzc0Nvbm5lY3Rpb25DbG9zZWQoTmV0d29ya1Byb2Nlc3NDb25uZWN0aW9uKiBjb25u ZWMKICAgICBtX3dlYkxvYWRlclN0cmF0ZWd5Lm5ldHdvcmtQcm9jZXNzQ3Jhc2hlZCgpOwogICAg IFdlYlNvY2tldFN0cmVhbTo6bmV0d29ya1Byb2Nlc3NDcmFzaGVkKCk7CiAgICAgbV93ZWJTb2Nr ZXRDaGFubmVsTWFuYWdlci5uZXR3b3JrUHJvY2Vzc0NyYXNoZWQoKTsKKyAgICBtX2Jyb2FkY2Fz dENoYW5uZWxSZWdpc3RyeS0+bmV0d29ya1Byb2Nlc3NDcmFzaGVkKCk7CiAKICAgICBpZiAobV9s aWJXZWJSVENOZXR3b3JrKQogICAgICAgICBtX2xpYldlYlJUQ05ldHdvcmstPm5ldHdvcmtQcm9j ZXNzQ3Jhc2hlZCgpOwpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdl TG9nCmluZGV4IGZhN2NkMWMwNGM2NWM5NjA5ZWI2OGZiODc5N2E5YzA2NjE1ZDNjMWUuLmM2YzY5 M2NmYzhmNDg3MjZjOWY4OTU3ZGJmMTRjY2QwYzhhYzgyY2QgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0No YW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAyMS0wOS0x NSAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgorCisgICAgICAgIEltcGxlbWVudCBu ZXR3b3JrIHByb2Nlc3MgY3Jhc2ggcmVjb3ZlcnkgZm9yIEJyb2FkY2FzdENoYW5uZWwKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMDIzNgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBBUEkgdGVzdCBj b3ZlcmFnZS4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvTmV0 d29ya1Byb2Nlc3MubW06CisgICAgICAgICgtW0Jyb2FkY2FzdENoYW5uZWxNZXNzYWdlSGFuZGxl ciB1c2VyQ29udGVudENvbnRyb2xsZXI6ZGlkUmVjZWl2ZVNjcmlwdE1lc3NhZ2U6XSk6CisgICAg ICAgIChURVNUKToKKwogMjAyMS0wOS0xNCAgRG9uIE9sbXN0ZWFkICA8ZG9uLm9sbXN0ZWFkQHNv bnkuY29tPgogCiAgICAgICAgIFJlbmFtZSBSRVNPVVJDRV9MT0FEX1NUQVRJU1RJQ1MgdG8gSU5U RUxMSUdFTlRfVFJBQ0tJTkdfUFJFVkVOVElPTgpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktp dEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9OZXR3b3JrUHJvY2Vzcy5tbSBiL1Rvb2xzL1Rlc3RXZWJL aXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvTmV0d29ya1Byb2Nlc3MubW0KaW5kZXggMzk5NGIzMDI5 Yjk0Y2E0Y2E3MmJmNDA3NDVjYWRkODc5ZGU5NmZmMi4uOTljMTFlNDBhN2UwOTQ4MjI4YjE4MmNl NjhhOTk0ZDE3NGU1MjkzNyAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9X ZWJLaXRDb2NvYS9OZXR3b3JrUHJvY2Vzcy5tbQorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rl c3RzL1dlYktpdENvY29hL05ldHdvcmtQcm9jZXNzLm1tCkBAIC0yNiw5ICsyNiwxMSBAQAogI2lt cG9ydCAiY29uZmlnLmgiCiAKICNpbXBvcnQgIkhUVFBTZXJ2ZXIuaCIKKyNpbXBvcnQgIlBsYXRm b3JtVXRpbGl0aWVzLmgiCiAjaW1wb3J0ICJUZXN0V0tXZWJWaWV3LmgiCiAjaW1wb3J0ICJVdGls aXRpZXMuaCIKICNpbXBvcnQgPFdlYktpdC9XS1Byb2Nlc3NQb29sUHJpdmF0ZS5oPgorI2ltcG9y dCA8V2ViS2l0L1dLU2NyaXB0TWVzc2FnZUhhbmRsZXIuaD4KICNpbXBvcnQgPFdlYktpdC9XS1dl YlZpZXdQcml2YXRlLmg+CiAjaW1wb3J0IDxXZWJLaXQvV0tXZWJzaXRlRGF0YVN0b3JlUHJpdmF0 ZS5oPgogI2ltcG9ydCA8V2ViS2l0L19XS1dlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uLmg+ CkBAIC0xOTIsMyArMTk0LDEyOSBAQCBURVNUKE5ldHdvcmtQcm9jZXNzLCBDT1JTUHJlZmxpZ2h0 Q2FjaGVQYXJ0aXRpb25lZCkKICAgICB3aGlsZSAocHJlZmxpZ2h0UmVxdWVzdHNSZWNlaXZlZCAh PSAyKQogICAgICAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpzcGluUnVuTG9vcCgpOwogfQorCisK K3N0YXRpYyBWZWN0b3I8UmV0YWluUHRyPFdLU2NyaXB0TWVzc2FnZT4+IHJlY2VpdmVkTWVzc2Fn ZXM7CitzdGF0aWMgYm9vbCByZWNlaXZlZE1lc3NhZ2UgPSBmYWxzZTsKKworQGludGVyZmFjZSBC cm9hZGNhc3RDaGFubmVsTWVzc2FnZUhhbmRsZXIgOiBOU09iamVjdCA8V0tTY3JpcHRNZXNzYWdl SGFuZGxlcj4KK0BlbmQKKworQGltcGxlbWVudGF0aW9uIEJyb2FkY2FzdENoYW5uZWxNZXNzYWdl SGFuZGxlcgorLSAodm9pZCl1c2VyQ29udGVudENvbnRyb2xsZXI6KFdLVXNlckNvbnRlbnRDb250 cm9sbGVyICopdXNlckNvbnRlbnRDb250cm9sbGVyIGRpZFJlY2VpdmVTY3JpcHRNZXNzYWdlOihX S1NjcmlwdE1lc3NhZ2UgKiltZXNzYWdlCit7CisgICAgcmVjZWl2ZWRNZXNzYWdlcy5hcHBlbmQo bWVzc2FnZSk7CisgICAgcmVjZWl2ZWRNZXNzYWdlID0gdHJ1ZTsKK30KK0BlbmQKKworVEVTVChO ZXR3b3JrUHJvY2VzcywgQnJvYWRjYXN0Q2hhbm5lbENyYXNoUmVjb3ZlcnkpCit7CisgICAgYXV0 byB3ZWJWaWV3Q29uZmlndXJhdGlvbiA9IGFkb3B0TlMoW1tXS1dlYlZpZXdDb25maWd1cmF0aW9u IGFsbG9jXSBpbml0XSk7CisgICAgYXV0byBtZXNzYWdlSGFuZGxlciA9IGFkb3B0TlMoW1tCcm9h ZGNhc3RDaGFubmVsTWVzc2FnZUhhbmRsZXIgYWxsb2NdIGluaXRdKTsKKyAgICBbW3dlYlZpZXdD b25maWd1cmF0aW9uIHVzZXJDb250ZW50Q29udHJvbGxlcl0gYWRkU2NyaXB0TWVzc2FnZUhhbmRs ZXI6bWVzc2FnZUhhbmRsZXIuZ2V0KCkgbmFtZTpAInRlc3QiXTsKKworICAgIGF1dG8gd2ViVmll dzEgPSBhZG9wdE5TKFtbVGVzdFdLV2ViVmlldyBhbGxvY10gaW5pdFdpdGhGcmFtZTpOU01ha2VS ZWN0KDAsIDAsIDgwMCwgNjAwKSBjb25maWd1cmF0aW9uOndlYlZpZXdDb25maWd1cmF0aW9uLmdl dCgpXSk7CisgICAgYXV0byB3ZWJWaWV3MiA9IGFkb3B0TlMoW1tUZXN0V0tXZWJWaWV3IGFsbG9j XSBpbml0V2l0aEZyYW1lOk5TTWFrZVJlY3QoMCwgMCwgODAwLCA2MDApIGNvbmZpZ3VyYXRpb246 d2ViVmlld0NvbmZpZ3VyYXRpb24uZ2V0KCldKTsKKworICAgIHJlY2VpdmVkTWVzc2FnZSA9IGZh bHNlOworICAgIHJlY2VpdmVkTWVzc2FnZXMuY2xlYXIoKTsKKworICAgIE5TU3RyaW5nICpodG1s ID0gW05TU3RyaW5nIHN0cmluZ1dpdGhGb3JtYXQ6QCI8c2NyaXB0PmxldCBiYyA9IG5ldyBCcm9h ZGNhc3RDaGFubmVsKCd0ZXN0Jyk7IGJjLm9ubWVzc2FnZSA9IChtc2cpID0+IHsgd2Via2l0Lm1l c3NhZ2VIYW5kbGVycy50ZXN0LnBvc3RNZXNzYWdlKG1zZy5kYXRhKTsgfTs8L3NjcmlwdD4iXTsK KyAgICBOU1VSTCAqYmFzZVVSTCA9IFtOU1VSTCBVUkxXaXRoU3RyaW5nOkAiaHR0cDovL2V4YW1w bGUuY29tLyJdOworCisgICAgW3dlYlZpZXcxIHN5bmNocm9ub3VzbHlMb2FkSFRNTFN0cmluZzpo dG1sIGJhc2VVUkw6YmFzZVVSTF07CisgICAgW3dlYlZpZXcyIHN5bmNocm9ub3VzbHlMb2FkSFRN TFN0cmluZzpodG1sIGJhc2VVUkw6YmFzZVVSTF07CisKKyAgICBhdXRvIHdlYlBJRDEgPSBbd2Vi VmlldzEgX3dlYlByb2Nlc3NJZGVudGlmaWVyXTsKKyAgICBhdXRvIHdlYlBJRDIgPSBbd2ViVmll dzIgX3dlYlByb2Nlc3NJZGVudGlmaWVyXTsKKyAgICBFWFBFQ1RfTkUod2ViUElEMSwgMCk7Cisg ICAgRVhQRUNUX05FKHdlYlBJRDIsIDApOworICAgIEVYUEVDVF9ORSh3ZWJQSUQxLCB3ZWJQSUQy KTsKKworICAgIGF1dG8gbmV0d29ya1BJRCA9IFtbV0tXZWJzaXRlRGF0YVN0b3JlIGRlZmF1bHRE YXRhU3RvcmVdIF9uZXR3b3JrUHJvY2Vzc0lkZW50aWZpZXJdOworICAgIEVYUEVDVF9ORShuZXR3 b3JrUElELCAwKTsKKworICAgIEVYUEVDVF9GQUxTRShyZWNlaXZlZE1lc3NhZ2UpOworICAgIEVY UEVDVF9UUlVFKHJlY2VpdmVkTWVzc2FnZXMuaXNFbXB0eSgpKTsKKworICAgIC8vIFRlc3QgdGhh dCBpbml0aWFsIGNvbW11bmljYXRpb24gZnJvbSB3ZWJWaWV3MSB0byB3ZWJWaWV3MiB3b3Jrcy4K KyAgICByZWNlaXZlZE1lc3NhZ2UgPSBmYWxzZTsKKyAgICByZWNlaXZlZE1lc3NhZ2VzLmNsZWFy KCk7CisgICAgYm9vbCBmaW5pc2hlZFJ1bm5pbmdTY3JpcHQgPSBmYWxzZTsKKyAgICBbd2ViVmll dzEgZXZhbHVhdGVKYXZhU2NyaXB0OkAiYmMucG9zdE1lc3NhZ2UoJ2ZvbycpIiBjb21wbGV0aW9u SGFuZGxlcjogWyZdIChpZCByZXN1bHQsIE5TRXJyb3IgKmVycm9yKSB7CisgICAgICAgIEVYUEVD VF9UUlVFKCFlcnJvcik7CisgICAgICAgIGZpbmlzaGVkUnVubmluZ1NjcmlwdCA9IHRydWU7Cisg ICAgfV07CisgICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6cnVuKCZmaW5pc2hlZFJ1bm5pbmdTY3Jp cHQpOworCisgICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6cnVuKCZyZWNlaXZlZE1lc3NhZ2UpOwor ICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnNwaW5SdW5Mb29wKDEwKTsKKworICAgIEVYUEVDVF9F UShyZWNlaXZlZE1lc3NhZ2VzLnNpemUoKSwgMVUpOworICAgIEVYUEVDVF9FUShbcmVjZWl2ZWRN ZXNzYWdlc1swXSB3ZWJWaWV3XSwgd2ViVmlldzIpOworICAgIEVYUEVDVF9XS19TVFJFUShbcmVj ZWl2ZWRNZXNzYWdlc1swXSBib2R5XSwgQCJmb28iKTsKKworICAgIC8vIFRlc3QgdGhhdCBpbml0 aWFsIGNvbW11bmljYXRpb24gZnJvbSB3ZWJWaWV3MiB0byB3ZWJWaWV3MSB3b3Jrcy4KKyAgICBy ZWNlaXZlZE1lc3NhZ2UgPSBmYWxzZTsKKyAgICByZWNlaXZlZE1lc3NhZ2VzLmNsZWFyKCk7Cisg ICAgZmluaXNoZWRSdW5uaW5nU2NyaXB0ID0gZmFsc2U7CisgICAgW3dlYlZpZXcyIGV2YWx1YXRl SmF2YVNjcmlwdDpAImJjLnBvc3RNZXNzYWdlKCdiYXInKSIgY29tcGxldGlvbkhhbmRsZXI6IFsm XSAoaWQgcmVzdWx0LCBOU0Vycm9yICplcnJvcikgeworICAgICAgICBFWFBFQ1RfVFJVRSghZXJy b3IpOworICAgICAgICBmaW5pc2hlZFJ1bm5pbmdTY3JpcHQgPSB0cnVlOworICAgIH1dOworICAg IFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmZmluaXNoZWRSdW5uaW5nU2NyaXB0KTsKKworICAg IFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmcmVjZWl2ZWRNZXNzYWdlKTsKKyAgICBUZXN0V2Vi S2l0QVBJOjpVdGlsOjpzcGluUnVuTG9vcCgxMCk7CisKKyAgICBFWFBFQ1RfRVEocmVjZWl2ZWRN ZXNzYWdlcy5zaXplKCksIDFVKTsKKyAgICBFWFBFQ1RfRVEoW3JlY2VpdmVkTWVzc2FnZXNbMF0g d2ViVmlld10sIHdlYlZpZXcxKTsKKyAgICBFWFBFQ1RfV0tfU1RSRVEoW3JlY2VpdmVkTWVzc2Fn ZXNbMF0gYm9keV0sIEAiYmFyIik7CisKKyAgICAvLyBLaWxsIHRoZSBuZXR3b3JrIHByb2Nlc3Mu CisgICAga2lsbChuZXR3b3JrUElELCA5KTsKKyAgICB3aGlsZSAoW1tXS1dlYnNpdGVEYXRhU3Rv cmUgZGVmYXVsdERhdGFTdG9yZV0gX25ldHdvcmtQcm9jZXNzSWRlbnRpZmllcl0gPT0gbmV0d29y a1BJRCkKKyAgICAgICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6c3BpblJ1bkxvb3AoMTApOworCisg ICAgLy8gVGVzdCB0aGF0IGluaXRpYWwgY29tbXVuaWNhdGlvbiBmcm9tIHdlYlZpZXcxIHRvIHdl YlZpZXcyIHdvcmtzLgorICAgIHJlY2VpdmVkTWVzc2FnZSA9IGZhbHNlOworICAgIHJlY2VpdmVk TWVzc2FnZXMuY2xlYXIoKTsKKyAgICBmaW5pc2hlZFJ1bm5pbmdTY3JpcHQgPSBmYWxzZTsKKyAg ICBbd2ViVmlldzEgZXZhbHVhdGVKYXZhU2NyaXB0OkAiYmMucG9zdE1lc3NhZ2UoJ2ZvbzInKSIg Y29tcGxldGlvbkhhbmRsZXI6IFsmXSAoaWQgcmVzdWx0LCBOU0Vycm9yICplcnJvcikgeworICAg ICAgICBFWFBFQ1RfVFJVRSghZXJyb3IpOworICAgICAgICBmaW5pc2hlZFJ1bm5pbmdTY3JpcHQg PSB0cnVlOworICAgIH1dOworICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmZmluaXNoZWRS dW5uaW5nU2NyaXB0KTsKKworICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmcmVjZWl2ZWRN ZXNzYWdlKTsKKyAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpzcGluUnVuTG9vcCgxMCk7CisKKyAg ICBFWFBFQ1RfRVEocmVjZWl2ZWRNZXNzYWdlcy5zaXplKCksIDFVKTsKKyAgICBFWFBFQ1RfRVEo W3JlY2VpdmVkTWVzc2FnZXNbMF0gd2ViVmlld10sIHdlYlZpZXcyKTsKKyAgICBFWFBFQ1RfV0tf U1RSRVEoW3JlY2VpdmVkTWVzc2FnZXNbMF0gYm9keV0sIEAiZm9vMiIpOworCisgICAgLy8gVGVz dCB0aGF0IGluaXRpYWwgY29tbXVuaWNhdGlvbiBmcm9tIHdlYlZpZXcyIHRvIHdlYlZpZXcxIHdv cmtzLgorICAgIHJlY2VpdmVkTWVzc2FnZSA9IGZhbHNlOworICAgIHJlY2VpdmVkTWVzc2FnZXMu Y2xlYXIoKTsKKyAgICBmaW5pc2hlZFJ1bm5pbmdTY3JpcHQgPSBmYWxzZTsKKyAgICBbd2ViVmll dzIgZXZhbHVhdGVKYXZhU2NyaXB0OkAiYmMucG9zdE1lc3NhZ2UoJ2JhcjInKSIgY29tcGxldGlv bkhhbmRsZXI6IFsmXSAoaWQgcmVzdWx0LCBOU0Vycm9yICplcnJvcikgeworICAgICAgICBFWFBF Q1RfVFJVRSghZXJyb3IpOworICAgICAgICBmaW5pc2hlZFJ1bm5pbmdTY3JpcHQgPSB0cnVlOwor ICAgIH1dOworICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmZmluaXNoZWRSdW5uaW5nU2Ny aXB0KTsKKworICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmcmVjZWl2ZWRNZXNzYWdlKTsK KyAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpzcGluUnVuTG9vcCgxMCk7CisKKyAgICBFWFBFQ1Rf RVEocmVjZWl2ZWRNZXNzYWdlcy5zaXplKCksIDFVKTsKKyAgICBFWFBFQ1RfRVEoW3JlY2VpdmVk TWVzc2FnZXNbMF0gd2ViVmlld10sIHdlYlZpZXcxKTsKKyAgICBFWFBFQ1RfV0tfU1RSRVEoW3Jl Y2VpdmVkTWVzc2FnZXNbMF0gYm9keV0sIEAiYmFyMiIpOworCisgICAgYXV0byBuZXR3b3JrUElE MiA9IFtbV0tXZWJzaXRlRGF0YVN0b3JlIGRlZmF1bHREYXRhU3RvcmVdIF9uZXR3b3JrUHJvY2Vz c0lkZW50aWZpZXJdOworICAgIEVYUEVDVF9ORShuZXR3b3JrUElEMiwgMCk7CisgICAgRVhQRUNU X05FKG5ldHdvcmtQSUQsIG5ldHdvcmtQSUQyKTsKKworICAgIEVYUEVDVF9FUSh3ZWJQSUQxLCBb d2ViVmlldzEgX3dlYlByb2Nlc3NJZGVudGlmaWVyXSk7CisgICAgRVhQRUNUX0VRKHdlYlBJRDIs IFt3ZWJWaWV3MiBfd2ViUHJvY2Vzc0lkZW50aWZpZXJdKTsKK30K 438267 2021-09-15 11:32:46 -0700 2021-09-15 18:02:28 -0700 Patch bug-230236-20210915113245.patch text/plain 10476 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjgyNDUyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGY2YzA3ZGE1ODRmNWY3NWNk M2RjNmI0MDIwMjgwMjkxNzE1MDMzMjguLmMzYzlhZjBkMWJhOThhYzNlMTA2OTA3MjMyOTVjODMy ODc0Y2JiYzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMjEtMDktMTUgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBJbXBsZW1lbnQgbmV0d29yayBwcm9j ZXNzIGNyYXNoIHJlY292ZXJ5IGZvciBCcm9hZGNhc3RDaGFubmVsCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzAyMzYKKworICAgICAgICBSZXZpZXdl ZCBieSBBbGV4IENocmlzdGVuc2VuLgorCisgICAgICAgIEhhdmUgdGhlIFdlYkJyb2FkY2FzdENo YW5uZWxSZWdpc3RyeSByZWdpc3RlciBpdHMgQnJvYWRjYXN0Q2hhbm5lbHMgd2l0aCB0aGUgbmV0 d29yaworICAgICAgICBwcm9jZXNzIGFmdGVyIGEgbmV0d29yayBwcm9jZXNzIGNyYXNoLiBUaGlz IGlzIHVzZWZ1bCBzbyB0aGF0IGNyb3NzLVdlYlByb2Nlc3MKKyAgICAgICAgY29tbXVuaWNhdGlv biBjYW4ga2VlcCBoYXBwZW5pbmcgdmlhIGV4aXN0aW5nIEJyb2FkY2FzdENoYW5uZWwgYWZ0ZXIg YSBuZXR3b3JrIHByb2Nlc3MKKyAgICAgICAgY3Jhc2guCisKKyAgICAgICAgKiBXZWJQcm9jZXNz L1dlYkNvcmVTdXBwb3J0L1dlYkJyb2FkY2FzdENoYW5uZWxSZWdpc3RyeS5jcHA6CisgICAgICAg IChXZWJLaXQ6OldlYkJyb2FkY2FzdENoYW5uZWxSZWdpc3RyeTo6bmV0d29ya1Byb2Nlc3NDcmFz aGVkKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkJyb2FkY2FzdENo YW5uZWxSZWdpc3RyeS5oOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUHJvY2Vzcy5jcHA6Cisg ICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3M6Om5ldHdvcmtQcm9jZXNzQ29ubmVjdGlvbkNsb3Nl ZCk6CisKIDIwMjEtMDktMTUgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+ CiAKICAgICAgICAgUmVtb3ZlIHRoZSAiUmVwbGFjZSBXZWJLaXRBZGRpdGlvbnMgaW4gRnJhbWV3 b3JrIEhlYWRlcnMiIGJ1aWxkIHBoYXNlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlBy b2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViQnJvYWRjYXN0Q2hhbm5lbFJlZ2lzdHJ5LmNwcCBiL1Nv dXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJCcm9hZGNhc3RDaGFubmVs UmVnaXN0cnkuY3BwCmluZGV4IDgxY2FjNDI2NTQ1YmM5YWFhODA5ZWVlNzYzNWE5NmQyNzkzMTVl MmQuLjdjYTRiZjgxOTVhZDA5ZmRmNDJhNTgyMjA2ZmRiYTU0M2QzNTI0NTMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJCcm9hZGNhc3RDaGFu bmVsUmVnaXN0cnkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJDb3JlU3Vw cG9ydC9XZWJCcm9hZGNhc3RDaGFubmVsUmVnaXN0cnkuY3BwCkBAIC0xMDYsNCArMTA2LDEyIEBA IHZvaWQgV2ViQnJvYWRjYXN0Q2hhbm5lbFJlZ2lzdHJ5Ojpwb3N0TWVzc2FnZVRvUmVtb3RlKGNv bnN0IFdlYkNvcmU6OkNsaWVudE9yaWdpCiAgICAgcG9zdE1lc3NhZ2VMb2NhbGx5KG9yaWdpbiwg bmFtZSwgc3RkOjpudWxsb3B0LCAqbWVzc2FnZS5tZXNzYWdlLCBjYWxsYmFja0FnZ3JlZ2F0b3Iu Y29weVJlZigpKTsKIH0KIAordm9pZCBXZWJCcm9hZGNhc3RDaGFubmVsUmVnaXN0cnk6Om5ldHdv cmtQcm9jZXNzQ3Jhc2hlZCgpCit7CisgICAgZm9yIChhdXRvJiBbb3JpZ2luLCBjaGFubmVsc0Zv ck9yaWdpbl0gOiBtX2NoYW5uZWxzUGVyT3JpZ2luKSB7CisgICAgICAgIGZvciAoYXV0byYgbmFt ZSA6IGNoYW5uZWxzRm9yT3JpZ2luLmtleXMoKSkKKyAgICAgICAgICAgIG5ldHdvcmtQcm9jZXNz Q29ubmVjdGlvbigpLnNlbmQoTWVzc2FnZXM6Ok5ldHdvcmtCcm9hZGNhc3RDaGFubmVsUmVnaXN0 cnk6OlJlZ2lzdGVyQ2hhbm5lbCB7IG9yaWdpbiwgbmFtZSB9LCAwKTsKKyAgICB9Cit9CisKIH0g Ly8gbmFtZXNwYWNlIFdlYktpdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNz L1dlYkNvcmVTdXBwb3J0L1dlYkJyb2FkY2FzdENoYW5uZWxSZWdpc3RyeS5oIGIvU291cmNlL1dl YktpdC9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkJyb2FkY2FzdENoYW5uZWxSZWdpc3Ry eS5oCmluZGV4IDNjYjNlNzU0ZjhiNzMyNWRhMGE1NjIxYTEwM2EyODFhNzYxZmQ4OWQuLmZiMzk5 NjZjYmFhNTJkNDM4MWI1ZmRmZjlmOTE0NzUwODI3NzZjYTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJCcm9hZGNhc3RDaGFubmVsUmVnaXN0 cnkuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViQnJv YWRjYXN0Q2hhbm5lbFJlZ2lzdHJ5LmgKQEAgLTUyLDYgKzUyLDggQEAgcHVibGljOgogICAgIHZv aWQgdW5yZWdpc3RlckNoYW5uZWwoY29uc3QgV2ViQ29yZTo6Q2xpZW50T3JpZ2luJiwgY29uc3Qg U3RyaW5nJiBuYW1lLCBXZWJDb3JlOjpCcm9hZGNhc3RDaGFubmVsSWRlbnRpZmllcikgZmluYWw7 CiAgICAgdm9pZCBwb3N0TWVzc2FnZShjb25zdCBXZWJDb3JlOjpDbGllbnRPcmlnaW4mLCBjb25z dCBTdHJpbmcmIG5hbWUsIFdlYkNvcmU6OkJyb2FkY2FzdENoYW5uZWxJZGVudGlmaWVyIHNvdXJj ZSwgUmVmPFdlYkNvcmU6OlNlcmlhbGl6ZWRTY3JpcHRWYWx1ZT4mJiwgQ29tcGxldGlvbkhhbmRs ZXI8dm9pZCgpPiYmKSBmaW5hbDsKIAorICAgIHZvaWQgbmV0d29ya1Byb2Nlc3NDcmFzaGVkKCk7 CisKICAgICB2b2lkIGRpZFJlY2VpdmVNZXNzYWdlKElQQzo6Q29ubmVjdGlvbiYsIElQQzo6RGVj b2RlciYpOwogCiBwcml2YXRlOgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNz L1dlYlByb2Nlc3MuY3BwIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlByb2Nlc3MuY3Bw CmluZGV4IDZiM2I1NGIzODc2MTllOTFlM2ZlMjU0ZmI2YjI5MWRhY2YxYTZlZTkuLjM3ZjZiZWYx MDIxY2E4ZWM1MTdmMDRjMmY2MGQ0ZmJlMzdhMTc1NTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nl c3MvV2ViUHJvY2Vzcy5jcHAKQEAgLTExOTUsNiArMTE5NSw3IEBAIHZvaWQgV2ViUHJvY2Vzczo6 bmV0d29ya1Byb2Nlc3NDb25uZWN0aW9uQ2xvc2VkKE5ldHdvcmtQcm9jZXNzQ29ubmVjdGlvbiog Y29ubmVjCiAgICAgbV93ZWJMb2FkZXJTdHJhdGVneS5uZXR3b3JrUHJvY2Vzc0NyYXNoZWQoKTsK ICAgICBXZWJTb2NrZXRTdHJlYW06Om5ldHdvcmtQcm9jZXNzQ3Jhc2hlZCgpOwogICAgIG1fd2Vi U29ja2V0Q2hhbm5lbE1hbmFnZXIubmV0d29ya1Byb2Nlc3NDcmFzaGVkKCk7CisgICAgbV9icm9h ZGNhc3RDaGFubmVsUmVnaXN0cnktPm5ldHdvcmtQcm9jZXNzQ3Jhc2hlZCgpOwogCiAgICAgaWYg KG1fbGliV2ViUlRDTmV0d29yaykKICAgICAgICAgbV9saWJXZWJSVENOZXR3b3JrLT5uZXR3b3Jr UHJvY2Vzc0NyYXNoZWQoKTsKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0No YW5nZUxvZwppbmRleCBmYTdjZDFjMDRjNjVjOTYwOWViNjhmYjg3OTdhOWMwNjYxNWQzYzFlLi4y NDcyNGQ4ZDk1Y2M3ZTJkNTc2M2U5OThmMDFmYWZjMWUzYjc3ZjcwIDEwMDY0NAotLS0gYS9Ub29s cy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMjEt MDktMTUgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBJbXBsZW1l bnQgbmV0d29yayBwcm9jZXNzIGNyYXNoIHJlY292ZXJ5IGZvciBCcm9hZGNhc3RDaGFubmVsCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzAyMzYKKwor ICAgICAgICBSZXZpZXdlZCBieSBBbGV4IENocmlzdGVuc2VuLgorCisgICAgICAgIEFkZCBBUEkg dGVzdCBjb3ZlcmFnZS4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29j b2EvTmV0d29ya1Byb2Nlc3MubW06CisgICAgICAgICgtW0Jyb2FkY2FzdENoYW5uZWxNZXNzYWdl SGFuZGxlciB1c2VyQ29udGVudENvbnRyb2xsZXI6ZGlkUmVjZWl2ZVNjcmlwdE1lc3NhZ2U6XSk6 CisgICAgICAgIChURVNUKToKKwogMjAyMS0wOS0xNCAgRG9uIE9sbXN0ZWFkICA8ZG9uLm9sbXN0 ZWFkQHNvbnkuY29tPgogCiAgICAgICAgIFJlbmFtZSBSRVNPVVJDRV9MT0FEX1NUQVRJU1RJQ1Mg dG8gSU5URUxMSUdFTlRfVFJBQ0tJTkdfUFJFVkVOVElPTgpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVz dFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9OZXR3b3JrUHJvY2Vzcy5tbSBiL1Rvb2xzL1Rl c3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvTmV0d29ya1Byb2Nlc3MubW0KaW5kZXggMzk5 NGIzMDI5Yjk0Y2E0Y2E3MmJmNDA3NDVjYWRkODc5ZGU5NmZmMi4uOTljMTFlNDBhN2UwOTQ4MjI4 YjE4MmNlNjhhOTk0ZDE3NGU1MjkzNyAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9U ZXN0cy9XZWJLaXRDb2NvYS9OZXR3b3JrUHJvY2Vzcy5tbQorKysgYi9Ub29scy9UZXN0V2ViS2l0 QVBJL1Rlc3RzL1dlYktpdENvY29hL05ldHdvcmtQcm9jZXNzLm1tCkBAIC0yNiw5ICsyNiwxMSBA QAogI2ltcG9ydCAiY29uZmlnLmgiCiAKICNpbXBvcnQgIkhUVFBTZXJ2ZXIuaCIKKyNpbXBvcnQg IlBsYXRmb3JtVXRpbGl0aWVzLmgiCiAjaW1wb3J0ICJUZXN0V0tXZWJWaWV3LmgiCiAjaW1wb3J0 ICJVdGlsaXRpZXMuaCIKICNpbXBvcnQgPFdlYktpdC9XS1Byb2Nlc3NQb29sUHJpdmF0ZS5oPgor I2ltcG9ydCA8V2ViS2l0L1dLU2NyaXB0TWVzc2FnZUhhbmRsZXIuaD4KICNpbXBvcnQgPFdlYktp dC9XS1dlYlZpZXdQcml2YXRlLmg+CiAjaW1wb3J0IDxXZWJLaXQvV0tXZWJzaXRlRGF0YVN0b3Jl UHJpdmF0ZS5oPgogI2ltcG9ydCA8V2ViS2l0L19XS1dlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0 aW9uLmg+CkBAIC0xOTIsMyArMTk0LDEyOSBAQCBURVNUKE5ldHdvcmtQcm9jZXNzLCBDT1JTUHJl ZmxpZ2h0Q2FjaGVQYXJ0aXRpb25lZCkKICAgICB3aGlsZSAocHJlZmxpZ2h0UmVxdWVzdHNSZWNl aXZlZCAhPSAyKQogICAgICAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpzcGluUnVuTG9vcCgpOwog fQorCisKK3N0YXRpYyBWZWN0b3I8UmV0YWluUHRyPFdLU2NyaXB0TWVzc2FnZT4+IHJlY2VpdmVk TWVzc2FnZXM7CitzdGF0aWMgYm9vbCByZWNlaXZlZE1lc3NhZ2UgPSBmYWxzZTsKKworQGludGVy ZmFjZSBCcm9hZGNhc3RDaGFubmVsTWVzc2FnZUhhbmRsZXIgOiBOU09iamVjdCA8V0tTY3JpcHRN ZXNzYWdlSGFuZGxlcj4KK0BlbmQKKworQGltcGxlbWVudGF0aW9uIEJyb2FkY2FzdENoYW5uZWxN ZXNzYWdlSGFuZGxlcgorLSAodm9pZCl1c2VyQ29udGVudENvbnRyb2xsZXI6KFdLVXNlckNvbnRl bnRDb250cm9sbGVyICopdXNlckNvbnRlbnRDb250cm9sbGVyIGRpZFJlY2VpdmVTY3JpcHRNZXNz YWdlOihXS1NjcmlwdE1lc3NhZ2UgKiltZXNzYWdlCit7CisgICAgcmVjZWl2ZWRNZXNzYWdlcy5h cHBlbmQobWVzc2FnZSk7CisgICAgcmVjZWl2ZWRNZXNzYWdlID0gdHJ1ZTsKK30KK0BlbmQKKwor VEVTVChOZXR3b3JrUHJvY2VzcywgQnJvYWRjYXN0Q2hhbm5lbENyYXNoUmVjb3ZlcnkpCit7Cisg ICAgYXV0byB3ZWJWaWV3Q29uZmlndXJhdGlvbiA9IGFkb3B0TlMoW1tXS1dlYlZpZXdDb25maWd1 cmF0aW9uIGFsbG9jXSBpbml0XSk7CisgICAgYXV0byBtZXNzYWdlSGFuZGxlciA9IGFkb3B0TlMo W1tCcm9hZGNhc3RDaGFubmVsTWVzc2FnZUhhbmRsZXIgYWxsb2NdIGluaXRdKTsKKyAgICBbW3dl YlZpZXdDb25maWd1cmF0aW9uIHVzZXJDb250ZW50Q29udHJvbGxlcl0gYWRkU2NyaXB0TWVzc2Fn ZUhhbmRsZXI6bWVzc2FnZUhhbmRsZXIuZ2V0KCkgbmFtZTpAInRlc3QiXTsKKworICAgIGF1dG8g d2ViVmlldzEgPSBhZG9wdE5TKFtbVGVzdFdLV2ViVmlldyBhbGxvY10gaW5pdFdpdGhGcmFtZTpO U01ha2VSZWN0KDAsIDAsIDgwMCwgNjAwKSBjb25maWd1cmF0aW9uOndlYlZpZXdDb25maWd1cmF0 aW9uLmdldCgpXSk7CisgICAgYXV0byB3ZWJWaWV3MiA9IGFkb3B0TlMoW1tUZXN0V0tXZWJWaWV3 IGFsbG9jXSBpbml0V2l0aEZyYW1lOk5TTWFrZVJlY3QoMCwgMCwgODAwLCA2MDApIGNvbmZpZ3Vy YXRpb246d2ViVmlld0NvbmZpZ3VyYXRpb24uZ2V0KCldKTsKKworICAgIHJlY2VpdmVkTWVzc2Fn ZSA9IGZhbHNlOworICAgIHJlY2VpdmVkTWVzc2FnZXMuY2xlYXIoKTsKKworICAgIE5TU3RyaW5n ICpodG1sID0gW05TU3RyaW5nIHN0cmluZ1dpdGhGb3JtYXQ6QCI8c2NyaXB0PmxldCBiYyA9IG5l dyBCcm9hZGNhc3RDaGFubmVsKCd0ZXN0Jyk7IGJjLm9ubWVzc2FnZSA9IChtc2cpID0+IHsgd2Vi a2l0Lm1lc3NhZ2VIYW5kbGVycy50ZXN0LnBvc3RNZXNzYWdlKG1zZy5kYXRhKTsgfTs8L3Njcmlw dD4iXTsKKyAgICBOU1VSTCAqYmFzZVVSTCA9IFtOU1VSTCBVUkxXaXRoU3RyaW5nOkAiaHR0cDov L2V4YW1wbGUuY29tLyJdOworCisgICAgW3dlYlZpZXcxIHN5bmNocm9ub3VzbHlMb2FkSFRNTFN0 cmluZzpodG1sIGJhc2VVUkw6YmFzZVVSTF07CisgICAgW3dlYlZpZXcyIHN5bmNocm9ub3VzbHlM b2FkSFRNTFN0cmluZzpodG1sIGJhc2VVUkw6YmFzZVVSTF07CisKKyAgICBhdXRvIHdlYlBJRDEg PSBbd2ViVmlldzEgX3dlYlByb2Nlc3NJZGVudGlmaWVyXTsKKyAgICBhdXRvIHdlYlBJRDIgPSBb d2ViVmlldzIgX3dlYlByb2Nlc3NJZGVudGlmaWVyXTsKKyAgICBFWFBFQ1RfTkUod2ViUElEMSwg MCk7CisgICAgRVhQRUNUX05FKHdlYlBJRDIsIDApOworICAgIEVYUEVDVF9ORSh3ZWJQSUQxLCB3 ZWJQSUQyKTsKKworICAgIGF1dG8gbmV0d29ya1BJRCA9IFtbV0tXZWJzaXRlRGF0YVN0b3JlIGRl ZmF1bHREYXRhU3RvcmVdIF9uZXR3b3JrUHJvY2Vzc0lkZW50aWZpZXJdOworICAgIEVYUEVDVF9O RShuZXR3b3JrUElELCAwKTsKKworICAgIEVYUEVDVF9GQUxTRShyZWNlaXZlZE1lc3NhZ2UpOwor ICAgIEVYUEVDVF9UUlVFKHJlY2VpdmVkTWVzc2FnZXMuaXNFbXB0eSgpKTsKKworICAgIC8vIFRl c3QgdGhhdCBpbml0aWFsIGNvbW11bmljYXRpb24gZnJvbSB3ZWJWaWV3MSB0byB3ZWJWaWV3MiB3 b3Jrcy4KKyAgICByZWNlaXZlZE1lc3NhZ2UgPSBmYWxzZTsKKyAgICByZWNlaXZlZE1lc3NhZ2Vz LmNsZWFyKCk7CisgICAgYm9vbCBmaW5pc2hlZFJ1bm5pbmdTY3JpcHQgPSBmYWxzZTsKKyAgICBb d2ViVmlldzEgZXZhbHVhdGVKYXZhU2NyaXB0OkAiYmMucG9zdE1lc3NhZ2UoJ2ZvbycpIiBjb21w bGV0aW9uSGFuZGxlcjogWyZdIChpZCByZXN1bHQsIE5TRXJyb3IgKmVycm9yKSB7CisgICAgICAg IEVYUEVDVF9UUlVFKCFlcnJvcik7CisgICAgICAgIGZpbmlzaGVkUnVubmluZ1NjcmlwdCA9IHRy dWU7CisgICAgfV07CisgICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6cnVuKCZmaW5pc2hlZFJ1bm5p bmdTY3JpcHQpOworCisgICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6cnVuKCZyZWNlaXZlZE1lc3Nh Z2UpOworICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnNwaW5SdW5Mb29wKDEwKTsKKworICAgIEVY UEVDVF9FUShyZWNlaXZlZE1lc3NhZ2VzLnNpemUoKSwgMVUpOworICAgIEVYUEVDVF9FUShbcmVj ZWl2ZWRNZXNzYWdlc1swXSB3ZWJWaWV3XSwgd2ViVmlldzIpOworICAgIEVYUEVDVF9XS19TVFJF UShbcmVjZWl2ZWRNZXNzYWdlc1swXSBib2R5XSwgQCJmb28iKTsKKworICAgIC8vIFRlc3QgdGhh dCBpbml0aWFsIGNvbW11bmljYXRpb24gZnJvbSB3ZWJWaWV3MiB0byB3ZWJWaWV3MSB3b3Jrcy4K KyAgICByZWNlaXZlZE1lc3NhZ2UgPSBmYWxzZTsKKyAgICByZWNlaXZlZE1lc3NhZ2VzLmNsZWFy KCk7CisgICAgZmluaXNoZWRSdW5uaW5nU2NyaXB0ID0gZmFsc2U7CisgICAgW3dlYlZpZXcyIGV2 YWx1YXRlSmF2YVNjcmlwdDpAImJjLnBvc3RNZXNzYWdlKCdiYXInKSIgY29tcGxldGlvbkhhbmRs ZXI6IFsmXSAoaWQgcmVzdWx0LCBOU0Vycm9yICplcnJvcikgeworICAgICAgICBFWFBFQ1RfVFJV RSghZXJyb3IpOworICAgICAgICBmaW5pc2hlZFJ1bm5pbmdTY3JpcHQgPSB0cnVlOworICAgIH1d OworICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmZmluaXNoZWRSdW5uaW5nU2NyaXB0KTsK KworICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmcmVjZWl2ZWRNZXNzYWdlKTsKKyAgICBU ZXN0V2ViS2l0QVBJOjpVdGlsOjpzcGluUnVuTG9vcCgxMCk7CisKKyAgICBFWFBFQ1RfRVEocmVj ZWl2ZWRNZXNzYWdlcy5zaXplKCksIDFVKTsKKyAgICBFWFBFQ1RfRVEoW3JlY2VpdmVkTWVzc2Fn ZXNbMF0gd2ViVmlld10sIHdlYlZpZXcxKTsKKyAgICBFWFBFQ1RfV0tfU1RSRVEoW3JlY2VpdmVk TWVzc2FnZXNbMF0gYm9keV0sIEAiYmFyIik7CisKKyAgICAvLyBLaWxsIHRoZSBuZXR3b3JrIHBy b2Nlc3MuCisgICAga2lsbChuZXR3b3JrUElELCA5KTsKKyAgICB3aGlsZSAoW1tXS1dlYnNpdGVE YXRhU3RvcmUgZGVmYXVsdERhdGFTdG9yZV0gX25ldHdvcmtQcm9jZXNzSWRlbnRpZmllcl0gPT0g bmV0d29ya1BJRCkKKyAgICAgICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6c3BpblJ1bkxvb3AoMTAp OworCisgICAgLy8gVGVzdCB0aGF0IGluaXRpYWwgY29tbXVuaWNhdGlvbiBmcm9tIHdlYlZpZXcx IHRvIHdlYlZpZXcyIHdvcmtzLgorICAgIHJlY2VpdmVkTWVzc2FnZSA9IGZhbHNlOworICAgIHJl Y2VpdmVkTWVzc2FnZXMuY2xlYXIoKTsKKyAgICBmaW5pc2hlZFJ1bm5pbmdTY3JpcHQgPSBmYWxz ZTsKKyAgICBbd2ViVmlldzEgZXZhbHVhdGVKYXZhU2NyaXB0OkAiYmMucG9zdE1lc3NhZ2UoJ2Zv bzInKSIgY29tcGxldGlvbkhhbmRsZXI6IFsmXSAoaWQgcmVzdWx0LCBOU0Vycm9yICplcnJvcikg eworICAgICAgICBFWFBFQ1RfVFJVRSghZXJyb3IpOworICAgICAgICBmaW5pc2hlZFJ1bm5pbmdT Y3JpcHQgPSB0cnVlOworICAgIH1dOworICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmZmlu aXNoZWRSdW5uaW5nU2NyaXB0KTsKKworICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmcmVj ZWl2ZWRNZXNzYWdlKTsKKyAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpzcGluUnVuTG9vcCgxMCk7 CisKKyAgICBFWFBFQ1RfRVEocmVjZWl2ZWRNZXNzYWdlcy5zaXplKCksIDFVKTsKKyAgICBFWFBF Q1RfRVEoW3JlY2VpdmVkTWVzc2FnZXNbMF0gd2ViVmlld10sIHdlYlZpZXcyKTsKKyAgICBFWFBF Q1RfV0tfU1RSRVEoW3JlY2VpdmVkTWVzc2FnZXNbMF0gYm9keV0sIEAiZm9vMiIpOworCisgICAg Ly8gVGVzdCB0aGF0IGluaXRpYWwgY29tbXVuaWNhdGlvbiBmcm9tIHdlYlZpZXcyIHRvIHdlYlZp ZXcxIHdvcmtzLgorICAgIHJlY2VpdmVkTWVzc2FnZSA9IGZhbHNlOworICAgIHJlY2VpdmVkTWVz c2FnZXMuY2xlYXIoKTsKKyAgICBmaW5pc2hlZFJ1bm5pbmdTY3JpcHQgPSBmYWxzZTsKKyAgICBb d2ViVmlldzIgZXZhbHVhdGVKYXZhU2NyaXB0OkAiYmMucG9zdE1lc3NhZ2UoJ2JhcjInKSIgY29t cGxldGlvbkhhbmRsZXI6IFsmXSAoaWQgcmVzdWx0LCBOU0Vycm9yICplcnJvcikgeworICAgICAg ICBFWFBFQ1RfVFJVRSghZXJyb3IpOworICAgICAgICBmaW5pc2hlZFJ1bm5pbmdTY3JpcHQgPSB0 cnVlOworICAgIH1dOworICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmZmluaXNoZWRSdW5u aW5nU2NyaXB0KTsKKworICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmcmVjZWl2ZWRNZXNz YWdlKTsKKyAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpzcGluUnVuTG9vcCgxMCk7CisKKyAgICBF WFBFQ1RfRVEocmVjZWl2ZWRNZXNzYWdlcy5zaXplKCksIDFVKTsKKyAgICBFWFBFQ1RfRVEoW3Jl Y2VpdmVkTWVzc2FnZXNbMF0gd2ViVmlld10sIHdlYlZpZXcxKTsKKyAgICBFWFBFQ1RfV0tfU1RS RVEoW3JlY2VpdmVkTWVzc2FnZXNbMF0gYm9keV0sIEAiYmFyMiIpOworCisgICAgYXV0byBuZXR3 b3JrUElEMiA9IFtbV0tXZWJzaXRlRGF0YVN0b3JlIGRlZmF1bHREYXRhU3RvcmVdIF9uZXR3b3Jr UHJvY2Vzc0lkZW50aWZpZXJdOworICAgIEVYUEVDVF9ORShuZXR3b3JrUElEMiwgMCk7CisgICAg RVhQRUNUX05FKG5ldHdvcmtQSUQsIG5ldHdvcmtQSUQyKTsKKworICAgIEVYUEVDVF9FUSh3ZWJQ SUQxLCBbd2ViVmlldzEgX3dlYlByb2Nlc3NJZGVudGlmaWVyXSk7CisgICAgRVhQRUNUX0VRKHdl YlBJRDIsIFt3ZWJWaWV3MiBfd2ViUHJvY2Vzc0lkZW50aWZpZXJdKTsKK30K