230495 2021-09-20 12:02:07 -0700 [Cocoa] Videos sometimes don't render when loaded in the GPU process 2021-10-21 18:19:21 -0700 1 1 1 Unclassified WebKit Media WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=230500 https://bugs.webkit.org/show_bug.cgi?id=230471 https://bugs.webkit.org/show_bug.cgi?id=232125 InRadar P2 Normal --- 230500 1 eric.carlson eric.carlson ews-watchlist glenn jer.noble peng.liu6 philipj sergio webkit-bug-importer oldest_to_newest 1795195 0 eric.carlson 2021-09-20 12:02:07 -0700 Videos sometimes don't render when loaded in the GPU process 1795196 1 eric.carlson 2021-09-20 12:02:29 -0700 rdar://83205407 1795229 2 438717 eric.carlson 2021-09-20 13:13:42 -0700 Created attachment 438717 Patch 1795230 3 438717 jer.noble 2021-09-20 13:15:25 -0700 Comment on attachment 438717 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=438717&action=review r=me with nits: > Source/WebKit/GPUProcess/media/RemoteMediaPlayerProxy.cpp:244 > + ALWAYS_LOG(LOGIDENTIFIER); Maybe, `ALWAYS_LOG(LOGIDENTIFIER, visible)` ? > Source/WebKit/GPUProcess/media/RemoteMediaPlayerProxy.cpp:356 > + ALWAYS_LOG(LOGIDENTIFIER); Maybe, `ALWAYS_LOG(LOGIDENTIFIER, m_player->readyState())` ? 1795234 4 438717 eric.carlson 2021-09-20 13:19:49 -0700 Comment on attachment 438717 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=438717&action=review >> Source/WebKit/GPUProcess/media/RemoteMediaPlayerProxy.cpp:244 >> + ALWAYS_LOG(LOGIDENTIFIER); > > Maybe, `ALWAYS_LOG(LOGIDENTIFIER, visible)` ? Good idea. >> Source/WebKit/GPUProcess/media/RemoteMediaPlayerProxy.cpp:356 >> + ALWAYS_LOG(LOGIDENTIFIER); > > Maybe, `ALWAYS_LOG(LOGIDENTIFIER, m_player->readyState())` ? Ditto 1795235 5 438718 eric.carlson 2021-09-20 13:20:49 -0700 Created attachment 438718 Patch for landing 1795242 6 438721 eric.carlson 2021-09-20 13:33:18 -0700 Created attachment 438721 Patch for landing 1795332 7 ews-feeder 2021-09-20 16:08:08 -0700 Committed r282789 (241924@main): <https://commits.webkit.org/241924@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 438721. 438717 2021-09-20 13:13:42 -0700 2021-09-20 13:20:48 -0700 Patch bug-230495-20210920131341.patch text/plain 9590 eric.carlson U3VidmVyc2lvbiBSZXZpc2lvbjogMjgyNDA1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDAzYTc5ZGY0M2QwNDc3MjE5 YTUxOWFkY2FhMDA2NTE2ODE5ZDY1ZTYuLjZmYjYzNWJiMGE3OWI2MDcyNmFhNTE4MWRmMzVlOGRk NDVmYWI2ZWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDUgQEAKKzIwMjEtMDktMjAgIEVyaWMgQ2Fy bHNvbiAgPGVyaWMuY2FybHNvbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0NvY29hXSBWaWRlb3Mg c29tZXRpbWVzIGRvbid0IHJlbmRlciB3aGVuIGxvYWRlZCBpbiB0aGUgR1BVIHByb2Nlc3MKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMDQ5NQorICAg ICAgICByZGFyOi8vODMyMDU0MDcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBUaGUgbWVkaWEgcGxheWVycyBjaG9vc2Ugd2hhdCB0eXBlIG9mIHZpZGVv IG91dHB1dCB0byBjcmVhdGUgYmFzZWQgb24gd2hldGhlcgorICAgICAgICBvciBub3QgdGhlIHJl bmRlcmVyIGNhbiBzdXBwb3J0IGFjY2VsZXJhdGVkIHJlbmRlcmluZy4gV2Ugd2VyZSBvbmx5IHB1 c2hpbmcKKyAgICAgICAgdGhpcyBzdGF0ZSB0byB0aGUgR1BVIHByb2Nlc3Mgd2hlbiB0aGUgcmVu ZGVyZXIgY2hhbmdlZCB0byByZXF1aXJlIGJhY2tpbmcsIGJ1dAorICAgICAgICB0aGF0IHN0YXRl IHdhcyBsb3N0IGlmIHRoYXQgdHJhbnNpdGlvbiBoYXBwZW5lZCBiZWZvcmUgdGhlIEFWRm91bmRh dGlvbi1iYWNrZWQKKyAgICAgICAgbWVkaWEgcGxheWVyIHdhcyBjcmVhdGVkLiBDaGFuZ2UgdGhp cyB0byBwdXNoIHRoZSBjdXJyZW50IHN0YXRlIGZyb20gdGhlIHdlYiBwcm9jZXNzCisgICAgICAg IHdoZW4gYSByZW1vdGUgbWVkaWEgcGxheWVyIGlzIGNyZWF0ZWQsIGFuZCBhZ2FpbiB3aGVuZXZl ciBpdHMgcmVhZHlTdGF0ZSBjaGFuZ2VzLgorCisgICAgICAgIFdlIGhhdmVuJ3QgZmlndXJlZCBv dXQgaG93IHRvIHJlbGlhYmx5IHJlcHJvZHVjZSB0aGlzLCBzbyBodHRwczovL3dlYmtpdC5vcmcv Yi8yMzA1MDAKKyAgICAgICAgdHJhY2tzIGZpZ3VyaW5nIHRoYXQgb3V0IGFuZCBjcmVhdGluZyBh IHRlc3QuCisKKyAgICAgICAgKiBHUFVQcm9jZXNzL21lZGlhL1JlbW90ZU1lZGlhUGxheWVyUHJv eHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpSZW1vdGVNZWRpYVBsYXllclByb3h5OjpSZW1vdGVN ZWRpYVBsYXllclByb3h5KTogU2V0IG1fcmVuZGVyaW5nQ2FuQmVBY2NlbGVyYXRlZAorICAgICAg ICBmcm9tIHRoZSBjb25maWd1cmF0aW9uLgorICAgICAgICAoV2ViS2l0OjpSZW1vdGVNZWRpYVBs YXllclByb3h5OjpwcmVwYXJlVG9QbGF5KTogQWRkIGxvZ2dpbmcuCisgICAgICAgIChXZWJLaXQ6 OlJlbW90ZU1lZGlhUGxheWVyUHJveHk6OnByZXBhcmVGb3JSZW5kZXJpbmcpOiBEaXR0by4KKyAg ICAgICAgKFdlYktpdDo6UmVtb3RlTWVkaWFQbGF5ZXJQcm94eTo6c2V0UGFnZUlzVmlzaWJsZSk6 IERpdHRvLgorICAgICAgICAoV2ViS2l0OjpSZW1vdGVNZWRpYVBsYXllclByb3h5OjphY2NlbGVy YXRlZFJlbmRlcmluZ1N0YXRlQ2hhbmdlZCk6IERpdHRvLgorICAgICAgICAoV2ViS2l0OjpSZW1v dGVNZWRpYVBsYXllclByb3h5OjptZWRpYVBsYXllclJlYWR5U3RhdGVDaGFuZ2VkKTogRGl0dG8u CisKKyAgICAgICAgKiBHUFVQcm9jZXNzL21lZGlhL1JlbW90ZU1lZGlhUGxheWVyUHJveHlDb25m aWd1cmF0aW9uLmg6IEFkZCByZW5kZXJpbmdDYW5CZUFjY2VsZXJhdGVkLgorICAgICAgICAoV2Vi S2l0OjpSZW1vdGVNZWRpYVBsYXllclByb3h5Q29uZmlndXJhdGlvbjo6ZW5jb2RlIGNvbnN0KToK KyAgICAgICAgKFdlYktpdDo6UmVtb3RlTWVkaWFQbGF5ZXJQcm94eUNvbmZpZ3VyYXRpb246OmRl Y29kZSk6IERlY29kZSBpdC4KKworICAgICAgICAqIFdlYlByb2Nlc3MvR1BVL21lZGlhL01lZGlh UGxheWVyUHJpdmF0ZVJlbW90ZS5jcHA6CisgICAgICAgIChXZWJLaXQ6Ok1lZGlhUGxheWVyUHJp dmF0ZVJlbW90ZTo6cmVhZHlTdGF0ZUNoYW5nZWQpOiBDYWxsIGFjY2VsZXJhdGVkUmVuZGVyaW5n U3RhdGVDaGFuZ2VkCisgICAgICAgIGlmIHRoZSBzdGF0ZSBoYXMgY2hhbmdlZC4KKyAgICAgICAg KFdlYktpdDo6TWVkaWFQbGF5ZXJQcml2YXRlUmVtb3RlOjphY2NlbGVyYXRlZFJlbmRlcmluZ1N0 YXRlQ2hhbmdlZCk6IFJlbWVtYmVyCisgICAgICAgIHRoZSBzdGF0ZS4KKyAgICAgICAgKiBXZWJQ cm9jZXNzL0dQVS9tZWRpYS9NZWRpYVBsYXllclByaXZhdGVSZW1vdGUuaDoKKworICAgICAgICAq IFdlYlByb2Nlc3MvR1BVL21lZGlhL1JlbW90ZU1lZGlhUGxheWVyTWFuYWdlci5jcHA6CisgICAg ICAgIChXZWJLaXQ6OlJlbW90ZU1lZGlhUGxheWVyTWFuYWdlcjo6Y3JlYXRlUmVtb3RlTWVkaWFQ bGF5ZXIpOiBQYXNzIHRoZSBhY2NlbGVyYXRlZCAKKyAgICAgICAgcmVuZGVyaW5nIHN0YXRlIHdp dGggdGhlIGNvbmZpZ3VyYXRpb24uCisKIDIwMjEtMDktMTQgIENocmlzIER1bWV6ICA8Y2R1bWV6 QGFwcGxlLmNvbT4KIAogICAgICAgICBbSGFyZGVuaW5nXSBWYWxpZGF0ZSBJREJWYWx1ZSdzIGJs b2IgcGF0aHMgaW4gV2ViSURCU2VydmVyOjpwdXRPckFkZCgpCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L0dQVVByb2Nlc3MvbWVkaWEvUmVtb3RlTWVkaWFQbGF5ZXJQcm94eS5jcHAgYi9Tb3Vy Y2UvV2ViS2l0L0dQVVByb2Nlc3MvbWVkaWEvUmVtb3RlTWVkaWFQbGF5ZXJQcm94eS5jcHAKaW5k ZXggYmFmZDkyNjVkNTE2Mzk1Y2I1YzA1MDA5ZjJmM2QwM2M2NTdlOGZhNy4uMWFkYmE5ZThiOWRk MDQ4MzljMjI1MTg2NGQ3YjlhMjllZmEwN2QyZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9H UFVQcm9jZXNzL21lZGlhL1JlbW90ZU1lZGlhUGxheWVyUHJveHkuY3BwCisrKyBiL1NvdXJjZS9X ZWJLaXQvR1BVUHJvY2Vzcy9tZWRpYS9SZW1vdGVNZWRpYVBsYXllclByb3h5LmNwcApAQCAtODQs NiArODQsNyBAQCBSZW1vdGVNZWRpYVBsYXllclByb3h5OjpSZW1vdGVNZWRpYVBsYXllclByb3h5 KFJlbW90ZU1lZGlhUGxheWVyTWFuYWdlclByb3h5JiBtYQogI2VuZGlmCiB7CiAgICAgbV90eXBl c1JlcXVpcmluZ0hhcmR3YXJlU3VwcG9ydCA9IG1fY29uZmlndXJhdGlvbi5tZWRpYUNvbnRlbnRU eXBlc1JlcXVpcmluZ0hhcmR3YXJlU3VwcG9ydDsKKyAgICBtX3JlbmRlcmluZ0NhbkJlQWNjZWxl cmF0ZWQgPSBtX2NvbmZpZ3VyYXRpb24ucmVuZGVyaW5nQ2FuQmVBY2NlbGVyYXRlZDsKICAgICBt X3BsYXllciA9IE1lZGlhUGxheWVyOjpjcmVhdGUoKnRoaXMsIG1fZW5naW5lSWRlbnRpZmllcik7 CiB9CiAKQEAgLTE3Miw2ICsxNzMsNyBAQCB2b2lkIFJlbW90ZU1lZGlhUGxheWVyUHJveHk6OmNh bmNlbExvYWQoKQogCiB2b2lkIFJlbW90ZU1lZGlhUGxheWVyUHJveHk6OnByZXBhcmVUb1BsYXko KQogeworICAgIEFMV0FZU19MT0coTE9HSURFTlRJRklFUik7CiAgICAgbV9wbGF5ZXItPnByZXBh cmVUb1BsYXkoKTsKIH0KIApAQCAtMjMzLDExICsyMzUsMTMgQEAgdm9pZCBSZW1vdGVNZWRpYVBs YXllclByb3h5OjpzZXRQaXRjaENvcnJlY3Rpb25BbGdvcml0aG0oV2ViQ29yZTo6TWVkaWFQbGF5 ZXI6OlAKIAogdm9pZCBSZW1vdGVNZWRpYVBsYXllclByb3h5OjpwcmVwYXJlRm9yUmVuZGVyaW5n KCkKIHsKKyAgICBBTFdBWVNfTE9HKExPR0lERU5USUZJRVIpOwogICAgIG1fcGxheWVyLT5wcmVw YXJlRm9yUmVuZGVyaW5nKCk7CiB9CiAKIHZvaWQgUmVtb3RlTWVkaWFQbGF5ZXJQcm94eTo6c2V0 UGFnZUlzVmlzaWJsZShib29sIHZpc2libGUpCiB7CisgICAgQUxXQVlTX0xPRyhMT0dJREVOVElG SUVSKTsKICAgICBtX3BsYXllci0+c2V0UGFnZUlzVmlzaWJsZSh2aXNpYmxlKTsKIH0KIApAQCAt MjU1LDYgKzI1OSw3IEBAIHZvaWQgUmVtb3RlTWVkaWFQbGF5ZXJQcm94eTo6c2V0VmlkZW9GdWxs c2NyZWVuR3Jhdml0eShXZWJDb3JlOjpNZWRpYVBsYXllckVudW1zCiAKIHZvaWQgUmVtb3RlTWVk aWFQbGF5ZXJQcm94eTo6YWNjZWxlcmF0ZWRSZW5kZXJpbmdTdGF0ZUNoYW5nZWQoYm9vbCByZW5k ZXJpbmdDYW5CZUFjY2VsZXJhdGVkKQogeworICAgIEFMV0FZU19MT0coTE9HSURFTlRJRklFUiwg cmVuZGVyaW5nQ2FuQmVBY2NlbGVyYXRlZCk7CiAgICAgbV9yZW5kZXJpbmdDYW5CZUFjY2VsZXJh dGVkID0gcmVuZGVyaW5nQ2FuQmVBY2NlbGVyYXRlZDsKICAgICBtX3BsYXllci0+YWNjZWxlcmF0 ZWRSZW5kZXJpbmdTdGF0ZUNoYW5nZWQoKTsKIH0KQEAgLTM0OCw2ICszNTMsNyBAQCB2b2lkIFJl bW90ZU1lZGlhUGxheWVyUHJveHk6Om1lZGlhUGxheWVyTmV0d29ya1N0YXRlQ2hhbmdlZCgpCiAK IHZvaWQgUmVtb3RlTWVkaWFQbGF5ZXJQcm94eTo6bWVkaWFQbGF5ZXJSZWFkeVN0YXRlQ2hhbmdl ZCgpCiB7CisgICAgQUxXQVlTX0xPRyhMT0dJREVOVElGSUVSKTsKICAgICB1cGRhdGVDYWNoZWRW aWRlb01ldHJpY3MoKTsKICAgICB1cGRhdGVDYWNoZWRTdGF0ZSh0cnVlKTsKICAgICBtX2NhY2hl ZFN0YXRlLnJlYWR5U3RhdGUgPSBtX3BsYXllci0+cmVhZHlTdGF0ZSgpOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9HUFVQcm9jZXNzL21lZGlhL1JlbW90ZU1lZGlhUGxheWVyUHJveHlDb25m aWd1cmF0aW9uLmggYi9Tb3VyY2UvV2ViS2l0L0dQVVByb2Nlc3MvbWVkaWEvUmVtb3RlTWVkaWFQ bGF5ZXJQcm94eUNvbmZpZ3VyYXRpb24uaAppbmRleCBhZTFkOTlmZDY2MTMwMzhlZjk4ZmE3YjI1 NWI0OWE4NWQxN2UzZjhiLi40YWNiNDBlMmMwOWVjNzVjZTllZWJiNzMxZTFkZDFjOWM2MzIxNTBm IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0dQVVByb2Nlc3MvbWVkaWEvUmVtb3RlTWVkaWFQ bGF5ZXJQcm94eUNvbmZpZ3VyYXRpb24uaAorKysgYi9Tb3VyY2UvV2ViS2l0L0dQVVByb2Nlc3Mv bWVkaWEvUmVtb3RlTWVkaWFQbGF5ZXJQcm94eUNvbmZpZ3VyYXRpb24uaApAQCAtNDcsNyArNDcs OCBAQCBzdHJ1Y3QgUmVtb3RlTWVkaWFQbGF5ZXJQcm94eUNvbmZpZ3VyYXRpb24gewogICAgIFdl YkNvcmU6OlNlY3VyaXR5T3JpZ2luRGF0YSBkb2N1bWVudFNlY3VyaXR5T3JpZ2luOwogICAgIHVp bnQ2NF90IGxvZ0lkZW50aWZpZXIgeyAwIH07CiAgICAgYm9vbCBzaG91bGRVc2VQZXJzaXN0ZW50 Q2FjaGUgeyBmYWxzZSB9OwotICAgIGJvb2wgaXNWaWRlbyB7IDAgfTsKKyAgICBib29sIGlzVmlk ZW8geyBmYWxzZSB9OworICAgIGJvb2wgcmVuZGVyaW5nQ2FuQmVBY2NlbGVyYXRlZCB7IGZhbHNl IH07CiAKICAgICB0ZW1wbGF0ZTxjbGFzcyBFbmNvZGVyPgogICAgIHZvaWQgZW5jb2RlKEVuY29k ZXImIGVuY29kZXIpIGNvbnN0CkBAIC02NSw2ICs2Niw3IEBAIHN0cnVjdCBSZW1vdGVNZWRpYVBs YXllclByb3h5Q29uZmlndXJhdGlvbiB7CiAgICAgICAgIGVuY29kZXIgPDwgbG9nSWRlbnRpZmll cjsKICAgICAgICAgZW5jb2RlciA8PCBzaG91bGRVc2VQZXJzaXN0ZW50Q2FjaGU7CiAgICAgICAg IGVuY29kZXIgPDwgaXNWaWRlbzsKKyAgICAgICAgZW5jb2RlciA8PCByZW5kZXJpbmdDYW5CZUFj Y2VsZXJhdGVkOwogICAgIH0KIAogICAgIHRlbXBsYXRlIDxjbGFzcyBEZWNvZGVyPgpAQCAtMTI3 LDYgKzEyOSwxMSBAQCBzdHJ1Y3QgUmVtb3RlTWVkaWFQbGF5ZXJQcm94eUNvbmZpZ3VyYXRpb24g ewogICAgICAgICBpZiAoIWlzVmlkZW8pCiAgICAgICAgICAgICByZXR1cm4gc3RkOjpudWxsb3B0 OwogCisgICAgICAgIHN0ZDo6b3B0aW9uYWw8Ym9vbD4gcmVuZGVyaW5nQ2FuQmVBY2NlbGVyYXRl ZDsKKyAgICAgICAgZGVjb2RlciA+PiByZW5kZXJpbmdDYW5CZUFjY2VsZXJhdGVkOworICAgICAg ICBpZiAoIXJlbmRlcmluZ0NhbkJlQWNjZWxlcmF0ZWQpCisgICAgICAgICAgICByZXR1cm4gc3Rk OjpudWxsb3B0OworCiAgICAgICAgIHJldHVybiB7ewogICAgICAgICAgICAgV1RGTW92ZSgqcmVm ZXJyZXIpLAogICAgICAgICAgICAgV1RGTW92ZSgqdXNlckFnZW50KSwKQEAgLTE0MSw2ICsxNDgs NyBAQCBzdHJ1Y3QgUmVtb3RlTWVkaWFQbGF5ZXJQcm94eUNvbmZpZ3VyYXRpb24gewogICAgICAg ICAgICAgKmxvZ0lkZW50aWZpZXIsCiAgICAgICAgICAgICAqc2hvdWxkVXNlUGVyc2lzdGVudENh Y2hlLAogICAgICAgICAgICAgKmlzVmlkZW8sCisgICAgICAgICAgICAqcmVuZGVyaW5nQ2FuQmVB Y2NlbGVyYXRlZCwKICAgICAgICAgfX07CiAgICAgfQogfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvV2ViUHJvY2Vzcy9HUFUvbWVkaWEvTWVkaWFQbGF5ZXJQcml2YXRlUmVtb3RlLmNwcCBi L1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUvbWVkaWEvTWVkaWFQbGF5ZXJQcml2YXRlUmVt b3RlLmNwcAppbmRleCBkZmUzNDA3MzBlMDYwZmY5ZjljZDQ2OGViMzYzZmM4OTE2MDJkZWFlLi5l MDZmNGY3ZTNhYzgxZjBkNWNmYTcyODI5NmUzM2FkY2U2MjNjMzk5IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L1dlYlByb2Nlc3MvR1BVL21lZGlhL01lZGlhUGxheWVyUHJpdmF0ZVJlbW90ZS5j cHAKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0dQVS9tZWRpYS9NZWRpYVBsYXllclBy aXZhdGVSZW1vdGUuY3BwCkBAIC0zNTEsOCArMzUxLDEyIEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2 YXRlUmVtb3RlOjpzZXRSZWFkeVN0YXRlKE1lZGlhUGxheWVyOjpSZWFkeVN0YXRlIHJlYWR5U3Rh dGUpCiB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZVJlbW90ZTo6cmVhZHlTdGF0ZUNoYW5nZWQoUmVt b3RlTWVkaWFQbGF5ZXJTdGF0ZSYmIHN0YXRlKQogewogICAgIHVwZGF0ZUNhY2hlZFN0YXRlKFdU Rk1vdmUoc3RhdGUpKTsKLSAgICBpZiAoYXV0byBwbGF5ZXIgPSBtYWtlUmVmUHRyKG1fcGxheWVy LmdldCgpKSkKKyAgICBpZiAoYXV0byBwbGF5ZXIgPSBtYWtlUmVmUHRyKG1fcGxheWVyLmdldCgp KSkgewogICAgICAgICBwbGF5ZXItPnJlYWR5U3RhdGVDaGFuZ2VkKCk7CisgICAgICAgIGJvb2wg cmVuZGVyaW5nQ2FuQmVBY2NlbGVyYXRlZCA9IHBsYXllci0+cmVuZGVyaW5nQ2FuQmVBY2NlbGVy YXRlZCgpOworICAgICAgICBpZiAobV9yZW5kZXJpbmdDYW5CZUFjY2VsZXJhdGVkICE9IHJlbmRl cmluZ0NhbkJlQWNjZWxlcmF0ZWQpCisgICAgICAgICAgICBhY2NlbGVyYXRlZFJlbmRlcmluZ1N0 YXRlQ2hhbmdlZCgpOworICAgIH0KIH0KIAogdm9pZCBNZWRpYVBsYXllclByaXZhdGVSZW1vdGU6 OnZvbHVtZUNoYW5nZWQoZG91YmxlIHZvbHVtZSkKQEAgLTQ2OSw4ICs0NzMsMTAgQEAgYm9vbCBN ZWRpYVBsYXllclByaXZhdGVSZW1vdGU6OnN1cHBvcnRzQWNjZWxlcmF0ZWRSZW5kZXJpbmcoKSBj b25zdAogCiB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZVJlbW90ZTo6YWNjZWxlcmF0ZWRSZW5kZXJp bmdTdGF0ZUNoYW5nZWQoKQogewotICAgIGlmIChhdXRvIHBsYXllciA9IG1ha2VSZWZQdHIobV9w bGF5ZXIuZ2V0KCkpKQotICAgICAgICBjb25uZWN0aW9uKCkuc2VuZChNZXNzYWdlczo6UmVtb3Rl TWVkaWFQbGF5ZXJQcm94eTo6QWNjZWxlcmF0ZWRSZW5kZXJpbmdTdGF0ZUNoYW5nZWQocGxheWVy LT5yZW5kZXJpbmdDYW5CZUFjY2VsZXJhdGVkKCkpLCBtX2lkKTsKKyAgICBpZiAoYXV0byBwbGF5 ZXIgPSBtYWtlUmVmUHRyKG1fcGxheWVyLmdldCgpKSkgeworICAgICAgICBtX3JlbmRlcmluZ0Nh bkJlQWNjZWxlcmF0ZWQgPSBwbGF5ZXItPnJlbmRlcmluZ0NhbkJlQWNjZWxlcmF0ZWQoKTsKKyAg ICAgICAgY29ubmVjdGlvbigpLnNlbmQoTWVzc2FnZXM6OlJlbW90ZU1lZGlhUGxheWVyUHJveHk6 OkFjY2VsZXJhdGVkUmVuZGVyaW5nU3RhdGVDaGFuZ2VkKG1fcmVuZGVyaW5nQ2FuQmVBY2NlbGVy YXRlZCksIG1faWQpOworICAgIH0KIH0KIAogI2lmIEVOQUJMRShXSVJFTEVTU19QTEFZQkFDS19U QVJHRVQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvR1BVL21lZGlhL01l ZGlhUGxheWVyUHJpdmF0ZVJlbW90ZS5oIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0dQVS9t ZWRpYS9NZWRpYVBsYXllclByaXZhdGVSZW1vdGUuaAppbmRleCBlNzA0ZTY5ZGViZjBlZGRlZjM2 NjAyNjIyZDEyNzNhYjEwMDE5NjY4Li42MjAwNzQ5ZDRkNDE3NjI5ZDBhYzJiZmI4YWIzOGIxOWQz MDg2MDdlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvR1BVL21lZGlhL01l ZGlhUGxheWVyUHJpdmF0ZVJlbW90ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9H UFUvbWVkaWEvTWVkaWFQbGF5ZXJQcml2YXRlUmVtb3RlLmgKQEAgLTQ0NCw2ICs0NDQsNyBAQCBw cml2YXRlOgogICAgIGJvb2wgbV9pbnZhbGlkIHsgZmFsc2UgfTsKICAgICBib29sIG1fd2FpdGlu Z0ZvcktleSB7IGZhbHNlIH07CiAgICAgYm9vbCBtX3RpbWVJc1Byb2dyZXNzaW5nIHsgZmFsc2Ug fTsKKyAgICBib29sIG1fcmVuZGVyaW5nQ2FuQmVBY2NlbGVyYXRlZCB7IGZhbHNlIH07CiB9Owog CiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJv Y2Vzcy9HUFUvbWVkaWEvUmVtb3RlTWVkaWFQbGF5ZXJNYW5hZ2VyLmNwcCBiL1NvdXJjZS9XZWJL aXQvV2ViUHJvY2Vzcy9HUFUvbWVkaWEvUmVtb3RlTWVkaWFQbGF5ZXJNYW5hZ2VyLmNwcAppbmRl eCBkYjVmNjEwYjg0OWViZjcwNWNlMzJlMGExOTdhOGU2ZmUwMWM2NTQ0Li44ZTllYzNhNTA5ZWEy NDA5YTQyNDExYjc4YmQ5YjNmZmRiNzNlMTg3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dl YlByb2Nlc3MvR1BVL21lZGlhL1JlbW90ZU1lZGlhUGxheWVyTWFuYWdlci5jcHAKKysrIGIvU291 cmNlL1dlYktpdC9XZWJQcm9jZXNzL0dQVS9tZWRpYS9SZW1vdGVNZWRpYVBsYXllck1hbmFnZXIu Y3BwCkBAIC0xNTAsNiArMTUwLDcgQEAgc3RkOjp1bmlxdWVfcHRyPE1lZGlhUGxheWVyUHJpdmF0 ZUludGVyZmFjZT4gUmVtb3RlTWVkaWFQbGF5ZXJNYW5hZ2VyOjpjcmVhdGVSZW0KICAgICBwcm94 eUNvbmZpZ3VyYXRpb24ubmV0d29ya0ludGVyZmFjZU5hbWUgPSBwbGF5ZXItPm1lZGlhUGxheWVy TmV0d29ya0ludGVyZmFjZU5hbWUoKTsKICNlbmRpZgogICAgIHByb3h5Q29uZmlndXJhdGlvbi5t ZWRpYUNvbnRlbnRUeXBlc1JlcXVpcmluZ0hhcmR3YXJlU3VwcG9ydCA9IHBsYXllci0+bWVkaWFD b250ZW50VHlwZXNSZXF1aXJpbmdIYXJkd2FyZVN1cHBvcnQoKTsKKyAgICBwcm94eUNvbmZpZ3Vy YXRpb24ucmVuZGVyaW5nQ2FuQmVBY2NlbGVyYXRlZCA9IHBsYXllci0+cmVuZGVyaW5nQ2FuQmVB Y2NlbGVyYXRlZCgpOwogICAgIHByb3h5Q29uZmlndXJhdGlvbi5wcmVmZXJyZWRBdWRpb0NoYXJh Y3RlcmlzdGljcyA9IHBsYXllci0+cHJlZmVycmVkQXVkaW9DaGFyYWN0ZXJpc3RpY3MoKTsKICNp ZiAhUkVMRUFTRV9MT0dfRElTQUJMRUQKICAgICBwcm94eUNvbmZpZ3VyYXRpb24ubG9nSWRlbnRp ZmllciA9IHJlaW50ZXJwcmV0X2Nhc3Q8dWludDY0X3Q+KHBsYXllci0+bWVkaWFQbGF5ZXJMb2dJ ZGVudGlmaWVyKCkpOwo= 438718 2021-09-20 13:20:49 -0700 2021-09-20 13:37:58 -0700 Patch for landing bug-230495-20210920132049.patch text/plain 9821 eric.carlson U3VidmVyc2lvbiBSZXZpc2lvbjogMjgyNDA1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDAzYTc5ZGY0M2QwNDc3MjE5 YTUxOWFkY2FhMDA2NTE2ODE5ZDY1ZTYuLmRlMWI4ZWJjZTY0YWQ0ODY1MWYzNmUzMWUyN2ZjNGE1 MjM2NDY4ZTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDUgQEAKKzIwMjEtMDktMjAgIEVyaWMgQ2Fy bHNvbiAgPGVyaWMuY2FybHNvbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0NvY29hXSBWaWRlb3Mg c29tZXRpbWVzIGRvbid0IHJlbmRlciB3aGVuIGxvYWRlZCBpbiB0aGUgR1BVIHByb2Nlc3MKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMDQ5NQorICAg ICAgICByZGFyOi8vODMyMDU0MDcKKworICAgICAgICBSZXZpZXdlZCBieSBKZXIgTm9ibGUuCisK KyAgICAgICAgVGhlIG1lZGlhIHBsYXllcnMgY2hvb3NlIHdoYXQgdHlwZSBvZiB2aWRlbyBvdXRw dXQgdG8gY3JlYXRlIGJhc2VkIG9uIHdoZXRoZXIKKyAgICAgICAgb3Igbm90IHRoZSByZW5kZXJl ciBjYW4gc3VwcG9ydCBhY2NlbGVyYXRlZCByZW5kZXJpbmcuIFdlIHdlcmUgb25seSBwdXNoaW5n CisgICAgICAgIHRoaXMgc3RhdGUgdG8gdGhlIEdQVSBwcm9jZXNzIHdoZW4gdGhlIHJlbmRlcmVy IGNoYW5nZWQgdG8gcmVxdWlyZSBiYWNraW5nLCBidXQKKyAgICAgICAgdGhhdCBzdGF0ZSB3YXMg bG9zdCBpZiB0aGF0IHRyYW5zaXRpb24gaGFwcGVuZWQgYmVmb3JlIHRoZSBBVkZvdW5kYXRpb24t YmFja2VkCisgICAgICAgIG1lZGlhIHBsYXllciB3YXMgY3JlYXRlZC4gQ2hhbmdlIHRoaXMgdG8g cHVzaCB0aGUgY3VycmVudCBzdGF0ZSBmcm9tIHRoZSB3ZWIgcHJvY2VzcworICAgICAgICB3aGVu IGEgcmVtb3RlIG1lZGlhIHBsYXllciBpcyBjcmVhdGVkLCBhbmQgYWdhaW4gd2hlbmV2ZXIgaXRz IHJlYWR5U3RhdGUgY2hhbmdlcy4KKworICAgICAgICBXZSBoYXZlbid0IGZpZ3VyZWQgb3V0IGhv dyB0byByZWxpYWJseSByZXByb2R1Y2UgdGhpcywgc28gaHR0cHM6Ly93ZWJraXQub3JnL2IvMjMw NTAwCisgICAgICAgIHRyYWNrcyBmaWd1cmluZyB0aGF0IG91dCBhbmQgY3JlYXRpbmcgYSB0ZXN0 LgorCisgICAgICAgICogR1BVUHJvY2Vzcy9tZWRpYS9SZW1vdGVNZWRpYVBsYXllclByb3h5LmNw cDoKKyAgICAgICAgKFdlYktpdDo6UmVtb3RlTWVkaWFQbGF5ZXJQcm94eTo6UmVtb3RlTWVkaWFQ bGF5ZXJQcm94eSk6IFNldCBtX3JlbmRlcmluZ0NhbkJlQWNjZWxlcmF0ZWQKKyAgICAgICAgZnJv bSB0aGUgY29uZmlndXJhdGlvbi4KKyAgICAgICAgKFdlYktpdDo6UmVtb3RlTWVkaWFQbGF5ZXJQ cm94eTo6cHJlcGFyZVRvUGxheSk6IEFkZCBsb2dnaW5nLgorICAgICAgICAoV2ViS2l0OjpSZW1v dGVNZWRpYVBsYXllclByb3h5OjpwcmVwYXJlRm9yUmVuZGVyaW5nKTogRGl0dG8uCisgICAgICAg IChXZWJLaXQ6OlJlbW90ZU1lZGlhUGxheWVyUHJveHk6OnNldFBhZ2VJc1Zpc2libGUpOiBEaXR0 by4KKyAgICAgICAgKFdlYktpdDo6UmVtb3RlTWVkaWFQbGF5ZXJQcm94eTo6YWNjZWxlcmF0ZWRS ZW5kZXJpbmdTdGF0ZUNoYW5nZWQpOiBEaXR0by4KKyAgICAgICAgKFdlYktpdDo6UmVtb3RlTWVk aWFQbGF5ZXJQcm94eTo6bWVkaWFQbGF5ZXJSZWFkeVN0YXRlQ2hhbmdlZCk6IERpdHRvLgorCisg ICAgICAgICogR1BVUHJvY2Vzcy9tZWRpYS9SZW1vdGVNZWRpYVBsYXllclByb3h5Q29uZmlndXJh dGlvbi5oOiBBZGQgcmVuZGVyaW5nQ2FuQmVBY2NlbGVyYXRlZC4KKyAgICAgICAgKFdlYktpdDo6 UmVtb3RlTWVkaWFQbGF5ZXJQcm94eUNvbmZpZ3VyYXRpb246OmVuY29kZSBjb25zdCk6CisgICAg ICAgIChXZWJLaXQ6OlJlbW90ZU1lZGlhUGxheWVyUHJveHlDb25maWd1cmF0aW9uOjpkZWNvZGUp OiBEZWNvZGUgaXQuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL0dQVS9tZWRpYS9NZWRpYVBsYXll clByaXZhdGVSZW1vdGUuY3BwOgorICAgICAgICAoV2ViS2l0OjpNZWRpYVBsYXllclByaXZhdGVS ZW1vdGU6OnJlYWR5U3RhdGVDaGFuZ2VkKTogQ2FsbCBhY2NlbGVyYXRlZFJlbmRlcmluZ1N0YXRl Q2hhbmdlZAorICAgICAgICBpZiB0aGUgc3RhdGUgaGFzIGNoYW5nZWQuCisgICAgICAgIChXZWJL aXQ6Ok1lZGlhUGxheWVyUHJpdmF0ZVJlbW90ZTo6YWNjZWxlcmF0ZWRSZW5kZXJpbmdTdGF0ZUNo YW5nZWQpOiBSZW1lbWJlcgorICAgICAgICB0aGUgc3RhdGUuCisgICAgICAgICogV2ViUHJvY2Vz cy9HUFUvbWVkaWEvTWVkaWFQbGF5ZXJQcml2YXRlUmVtb3RlLmg6CisKKyAgICAgICAgKiBXZWJQ cm9jZXNzL0dQVS9tZWRpYS9SZW1vdGVNZWRpYVBsYXllck1hbmFnZXIuY3BwOgorICAgICAgICAo V2ViS2l0OjpSZW1vdGVNZWRpYVBsYXllck1hbmFnZXI6OmNyZWF0ZVJlbW90ZU1lZGlhUGxheWVy KTogUGFzcyB0aGUgYWNjZWxlcmF0ZWQgCisgICAgICAgIHJlbmRlcmluZyBzdGF0ZSB3aXRoIHRo ZSBjb25maWd1cmF0aW9uLgorCiAyMDIxLTA5LTE0ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBs ZS5jb20+CiAKICAgICAgICAgW0hhcmRlbmluZ10gVmFsaWRhdGUgSURCVmFsdWUncyBibG9iIHBh dGhzIGluIFdlYklEQlNlcnZlcjo6cHV0T3JBZGQoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9HUFVQcm9jZXNzL21lZGlhL1JlbW90ZU1lZGlhUGxheWVyUHJveHkuY3BwIGIvU291cmNlL1dl YktpdC9HUFVQcm9jZXNzL21lZGlhL1JlbW90ZU1lZGlhUGxheWVyUHJveHkuY3BwCmluZGV4IGJh ZmQ5MjY1ZDUxNjM5NWNiNWMwNTAwOWYyZjNkMDNjNjU3ZThmYTcuLjJhNjdhYTQ4ODVjZDg5NmMw NGZlYjk0ZjcwNjRlMzNiMGEyYjhiY2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvR1BVUHJv Y2Vzcy9tZWRpYS9SZW1vdGVNZWRpYVBsYXllclByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0 L0dQVVByb2Nlc3MvbWVkaWEvUmVtb3RlTWVkaWFQbGF5ZXJQcm94eS5jcHAKQEAgLTg0LDYgKzg0 LDcgQEAgUmVtb3RlTWVkaWFQbGF5ZXJQcm94eTo6UmVtb3RlTWVkaWFQbGF5ZXJQcm94eShSZW1v dGVNZWRpYVBsYXllck1hbmFnZXJQcm94eSYgbWEKICNlbmRpZgogewogICAgIG1fdHlwZXNSZXF1 aXJpbmdIYXJkd2FyZVN1cHBvcnQgPSBtX2NvbmZpZ3VyYXRpb24ubWVkaWFDb250ZW50VHlwZXNS ZXF1aXJpbmdIYXJkd2FyZVN1cHBvcnQ7CisgICAgbV9yZW5kZXJpbmdDYW5CZUFjY2VsZXJhdGVk ID0gbV9jb25maWd1cmF0aW9uLnJlbmRlcmluZ0NhbkJlQWNjZWxlcmF0ZWQ7CiAgICAgbV9wbGF5 ZXIgPSBNZWRpYVBsYXllcjo6Y3JlYXRlKCp0aGlzLCBtX2VuZ2luZUlkZW50aWZpZXIpOwogfQog CkBAIC0xNzIsNiArMTczLDcgQEAgdm9pZCBSZW1vdGVNZWRpYVBsYXllclByb3h5OjpjYW5jZWxM b2FkKCkKIAogdm9pZCBSZW1vdGVNZWRpYVBsYXllclByb3h5OjpwcmVwYXJlVG9QbGF5KCkKIHsK KyAgICBBTFdBWVNfTE9HKExPR0lERU5USUZJRVIpOwogICAgIG1fcGxheWVyLT5wcmVwYXJlVG9Q bGF5KCk7CiB9CiAKQEAgLTIzMywxMSArMjM1LDEzIEBAIHZvaWQgUmVtb3RlTWVkaWFQbGF5ZXJQ cm94eTo6c2V0UGl0Y2hDb3JyZWN0aW9uQWxnb3JpdGhtKFdlYkNvcmU6Ok1lZGlhUGxheWVyOjpQ CiAKIHZvaWQgUmVtb3RlTWVkaWFQbGF5ZXJQcm94eTo6cHJlcGFyZUZvclJlbmRlcmluZygpCiB7 CisgICAgQUxXQVlTX0xPRyhMT0dJREVOVElGSUVSKTsKICAgICBtX3BsYXllci0+cHJlcGFyZUZv clJlbmRlcmluZygpOwogfQogCiB2b2lkIFJlbW90ZU1lZGlhUGxheWVyUHJveHk6OnNldFBhZ2VJ c1Zpc2libGUoYm9vbCB2aXNpYmxlKQogeworICAgIEFMV0FZU19MT0coTE9HSURFTlRJRklFUiwg dmlzaWJsZSk7CiAgICAgbV9wbGF5ZXItPnNldFBhZ2VJc1Zpc2libGUodmlzaWJsZSk7CiB9CiAK QEAgLTI1NSw2ICsyNTksNyBAQCB2b2lkIFJlbW90ZU1lZGlhUGxheWVyUHJveHk6OnNldFZpZGVv RnVsbHNjcmVlbkdyYXZpdHkoV2ViQ29yZTo6TWVkaWFQbGF5ZXJFbnVtcwogCiB2b2lkIFJlbW90 ZU1lZGlhUGxheWVyUHJveHk6OmFjY2VsZXJhdGVkUmVuZGVyaW5nU3RhdGVDaGFuZ2VkKGJvb2wg cmVuZGVyaW5nQ2FuQmVBY2NlbGVyYXRlZCkKIHsKKyAgICBBTFdBWVNfTE9HKExPR0lERU5USUZJ RVIsIHJlbmRlcmluZ0NhbkJlQWNjZWxlcmF0ZWQpOwogICAgIG1fcmVuZGVyaW5nQ2FuQmVBY2Nl bGVyYXRlZCA9IHJlbmRlcmluZ0NhbkJlQWNjZWxlcmF0ZWQ7CiAgICAgbV9wbGF5ZXItPmFjY2Vs ZXJhdGVkUmVuZGVyaW5nU3RhdGVDaGFuZ2VkKCk7CiB9CkBAIC0zNDgsOSArMzUzLDExIEBAIHZv aWQgUmVtb3RlTWVkaWFQbGF5ZXJQcm94eTo6bWVkaWFQbGF5ZXJOZXR3b3JrU3RhdGVDaGFuZ2Vk KCkKIAogdm9pZCBSZW1vdGVNZWRpYVBsYXllclByb3h5OjptZWRpYVBsYXllclJlYWR5U3RhdGVD aGFuZ2VkKCkKIHsKKyAgICBhdXRvIG5ld1JlYWR5U3RhdGUgPSBtX3BsYXllci0+cmVhZHlTdGF0 ZSgpOworICAgIEFMV0FZU19MT0coTE9HSURFTlRJRklFUiwgbmV3UmVhZHlTdGF0ZSk7CiAgICAg dXBkYXRlQ2FjaGVkVmlkZW9NZXRyaWNzKCk7CiAgICAgdXBkYXRlQ2FjaGVkU3RhdGUodHJ1ZSk7 Ci0gICAgbV9jYWNoZWRTdGF0ZS5yZWFkeVN0YXRlID0gbV9wbGF5ZXItPnJlYWR5U3RhdGUoKTsK KyAgICBtX2NhY2hlZFN0YXRlLnJlYWR5U3RhdGUgPSBuZXdSZWFkeVN0YXRlOwogICAgIG1fY2Fj aGVkU3RhdGUubmV0d29ya1N0YXRlID0gbV9wbGF5ZXItPm5ldHdvcmtTdGF0ZSgpOwogICAgIG1f Y2FjaGVkU3RhdGUuZHVyYXRpb24gPSBtX3BsYXllci0+ZHVyYXRpb24oKTsKIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9HUFVQcm9jZXNzL21lZGlhL1JlbW90ZU1lZGlhUGxheWVyUHJveHlD b25maWd1cmF0aW9uLmggYi9Tb3VyY2UvV2ViS2l0L0dQVVByb2Nlc3MvbWVkaWEvUmVtb3RlTWVk aWFQbGF5ZXJQcm94eUNvbmZpZ3VyYXRpb24uaAppbmRleCBhZTFkOTlmZDY2MTMwMzhlZjk4ZmE3 YjI1NWI0OWE4NWQxN2UzZjhiLi40YWNiNDBlMmMwOWVjNzVjZTllZWJiNzMxZTFkZDFjOWM2MzIx NTBmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0dQVVByb2Nlc3MvbWVkaWEvUmVtb3RlTWVk aWFQbGF5ZXJQcm94eUNvbmZpZ3VyYXRpb24uaAorKysgYi9Tb3VyY2UvV2ViS2l0L0dQVVByb2Nl c3MvbWVkaWEvUmVtb3RlTWVkaWFQbGF5ZXJQcm94eUNvbmZpZ3VyYXRpb24uaApAQCAtNDcsNyAr NDcsOCBAQCBzdHJ1Y3QgUmVtb3RlTWVkaWFQbGF5ZXJQcm94eUNvbmZpZ3VyYXRpb24gewogICAg IFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luRGF0YSBkb2N1bWVudFNlY3VyaXR5T3JpZ2luOwogICAg IHVpbnQ2NF90IGxvZ0lkZW50aWZpZXIgeyAwIH07CiAgICAgYm9vbCBzaG91bGRVc2VQZXJzaXN0 ZW50Q2FjaGUgeyBmYWxzZSB9OwotICAgIGJvb2wgaXNWaWRlbyB7IDAgfTsKKyAgICBib29sIGlz VmlkZW8geyBmYWxzZSB9OworICAgIGJvb2wgcmVuZGVyaW5nQ2FuQmVBY2NlbGVyYXRlZCB7IGZh bHNlIH07CiAKICAgICB0ZW1wbGF0ZTxjbGFzcyBFbmNvZGVyPgogICAgIHZvaWQgZW5jb2RlKEVu Y29kZXImIGVuY29kZXIpIGNvbnN0CkBAIC02NSw2ICs2Niw3IEBAIHN0cnVjdCBSZW1vdGVNZWRp YVBsYXllclByb3h5Q29uZmlndXJhdGlvbiB7CiAgICAgICAgIGVuY29kZXIgPDwgbG9nSWRlbnRp ZmllcjsKICAgICAgICAgZW5jb2RlciA8PCBzaG91bGRVc2VQZXJzaXN0ZW50Q2FjaGU7CiAgICAg ICAgIGVuY29kZXIgPDwgaXNWaWRlbzsKKyAgICAgICAgZW5jb2RlciA8PCByZW5kZXJpbmdDYW5C ZUFjY2VsZXJhdGVkOwogICAgIH0KIAogICAgIHRlbXBsYXRlIDxjbGFzcyBEZWNvZGVyPgpAQCAt MTI3LDYgKzEyOSwxMSBAQCBzdHJ1Y3QgUmVtb3RlTWVkaWFQbGF5ZXJQcm94eUNvbmZpZ3VyYXRp b24gewogICAgICAgICBpZiAoIWlzVmlkZW8pCiAgICAgICAgICAgICByZXR1cm4gc3RkOjpudWxs b3B0OwogCisgICAgICAgIHN0ZDo6b3B0aW9uYWw8Ym9vbD4gcmVuZGVyaW5nQ2FuQmVBY2NlbGVy YXRlZDsKKyAgICAgICAgZGVjb2RlciA+PiByZW5kZXJpbmdDYW5CZUFjY2VsZXJhdGVkOworICAg ICAgICBpZiAoIXJlbmRlcmluZ0NhbkJlQWNjZWxlcmF0ZWQpCisgICAgICAgICAgICByZXR1cm4g c3RkOjpudWxsb3B0OworCiAgICAgICAgIHJldHVybiB7ewogICAgICAgICAgICAgV1RGTW92ZSgq cmVmZXJyZXIpLAogICAgICAgICAgICAgV1RGTW92ZSgqdXNlckFnZW50KSwKQEAgLTE0MSw2ICsx NDgsNyBAQCBzdHJ1Y3QgUmVtb3RlTWVkaWFQbGF5ZXJQcm94eUNvbmZpZ3VyYXRpb24gewogICAg ICAgICAgICAgKmxvZ0lkZW50aWZpZXIsCiAgICAgICAgICAgICAqc2hvdWxkVXNlUGVyc2lzdGVu dENhY2hlLAogICAgICAgICAgICAgKmlzVmlkZW8sCisgICAgICAgICAgICAqcmVuZGVyaW5nQ2Fu QmVBY2NlbGVyYXRlZCwKICAgICAgICAgfX07CiAgICAgfQogfTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUvbWVkaWEvTWVkaWFQbGF5ZXJQcml2YXRlUmVtb3RlLmNw cCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUvbWVkaWEvTWVkaWFQbGF5ZXJQcml2YXRl UmVtb3RlLmNwcAppbmRleCBkZmUzNDA3MzBlMDYwZmY5ZjljZDQ2OGViMzYzZmM4OTE2MDJkZWFl Li5lMDZmNGY3ZTNhYzgxZjBkNWNmYTcyODI5NmUzM2FkY2U2MjNjMzk5IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvR1BVL21lZGlhL01lZGlhUGxheWVyUHJpdmF0ZVJlbW90 ZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0dQVS9tZWRpYS9NZWRpYVBsYXll clByaXZhdGVSZW1vdGUuY3BwCkBAIC0zNTEsOCArMzUxLDEyIEBAIHZvaWQgTWVkaWFQbGF5ZXJQ cml2YXRlUmVtb3RlOjpzZXRSZWFkeVN0YXRlKE1lZGlhUGxheWVyOjpSZWFkeVN0YXRlIHJlYWR5 U3RhdGUpCiB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZVJlbW90ZTo6cmVhZHlTdGF0ZUNoYW5nZWQo UmVtb3RlTWVkaWFQbGF5ZXJTdGF0ZSYmIHN0YXRlKQogewogICAgIHVwZGF0ZUNhY2hlZFN0YXRl KFdURk1vdmUoc3RhdGUpKTsKLSAgICBpZiAoYXV0byBwbGF5ZXIgPSBtYWtlUmVmUHRyKG1fcGxh eWVyLmdldCgpKSkKKyAgICBpZiAoYXV0byBwbGF5ZXIgPSBtYWtlUmVmUHRyKG1fcGxheWVyLmdl dCgpKSkgewogICAgICAgICBwbGF5ZXItPnJlYWR5U3RhdGVDaGFuZ2VkKCk7CisgICAgICAgIGJv b2wgcmVuZGVyaW5nQ2FuQmVBY2NlbGVyYXRlZCA9IHBsYXllci0+cmVuZGVyaW5nQ2FuQmVBY2Nl bGVyYXRlZCgpOworICAgICAgICBpZiAobV9yZW5kZXJpbmdDYW5CZUFjY2VsZXJhdGVkICE9IHJl bmRlcmluZ0NhbkJlQWNjZWxlcmF0ZWQpCisgICAgICAgICAgICBhY2NlbGVyYXRlZFJlbmRlcmlu Z1N0YXRlQ2hhbmdlZCgpOworICAgIH0KIH0KIAogdm9pZCBNZWRpYVBsYXllclByaXZhdGVSZW1v dGU6OnZvbHVtZUNoYW5nZWQoZG91YmxlIHZvbHVtZSkKQEAgLTQ2OSw4ICs0NzMsMTAgQEAgYm9v bCBNZWRpYVBsYXllclByaXZhdGVSZW1vdGU6OnN1cHBvcnRzQWNjZWxlcmF0ZWRSZW5kZXJpbmco KSBjb25zdAogCiB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZVJlbW90ZTo6YWNjZWxlcmF0ZWRSZW5k ZXJpbmdTdGF0ZUNoYW5nZWQoKQogewotICAgIGlmIChhdXRvIHBsYXllciA9IG1ha2VSZWZQdHIo bV9wbGF5ZXIuZ2V0KCkpKQotICAgICAgICBjb25uZWN0aW9uKCkuc2VuZChNZXNzYWdlczo6UmVt b3RlTWVkaWFQbGF5ZXJQcm94eTo6QWNjZWxlcmF0ZWRSZW5kZXJpbmdTdGF0ZUNoYW5nZWQocGxh eWVyLT5yZW5kZXJpbmdDYW5CZUFjY2VsZXJhdGVkKCkpLCBtX2lkKTsKKyAgICBpZiAoYXV0byBw bGF5ZXIgPSBtYWtlUmVmUHRyKG1fcGxheWVyLmdldCgpKSkgeworICAgICAgICBtX3JlbmRlcmlu Z0NhbkJlQWNjZWxlcmF0ZWQgPSBwbGF5ZXItPnJlbmRlcmluZ0NhbkJlQWNjZWxlcmF0ZWQoKTsK KyAgICAgICAgY29ubmVjdGlvbigpLnNlbmQoTWVzc2FnZXM6OlJlbW90ZU1lZGlhUGxheWVyUHJv eHk6OkFjY2VsZXJhdGVkUmVuZGVyaW5nU3RhdGVDaGFuZ2VkKG1fcmVuZGVyaW5nQ2FuQmVBY2Nl bGVyYXRlZCksIG1faWQpOworICAgIH0KIH0KIAogI2lmIEVOQUJMRShXSVJFTEVTU19QTEFZQkFD S19UQVJHRVQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvR1BVL21lZGlh L01lZGlhUGxheWVyUHJpdmF0ZVJlbW90ZS5oIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0dQ VS9tZWRpYS9NZWRpYVBsYXllclByaXZhdGVSZW1vdGUuaAppbmRleCBlNzA0ZTY5ZGViZjBlZGRl ZjM2NjAyNjIyZDEyNzNhYjEwMDE5NjY4Li42MjAwNzQ5ZDRkNDE3NjI5ZDBhYzJiZmI4YWIzOGIx OWQzMDg2MDdlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvR1BVL21lZGlh L01lZGlhUGxheWVyUHJpdmF0ZVJlbW90ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vz cy9HUFUvbWVkaWEvTWVkaWFQbGF5ZXJQcml2YXRlUmVtb3RlLmgKQEAgLTQ0NCw2ICs0NDQsNyBA QCBwcml2YXRlOgogICAgIGJvb2wgbV9pbnZhbGlkIHsgZmFsc2UgfTsKICAgICBib29sIG1fd2Fp dGluZ0ZvcktleSB7IGZhbHNlIH07CiAgICAgYm9vbCBtX3RpbWVJc1Byb2dyZXNzaW5nIHsgZmFs c2UgfTsKKyAgICBib29sIG1fcmVuZGVyaW5nQ2FuQmVBY2NlbGVyYXRlZCB7IGZhbHNlIH07CiB9 OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2Vi UHJvY2Vzcy9HUFUvbWVkaWEvUmVtb3RlTWVkaWFQbGF5ZXJNYW5hZ2VyLmNwcCBiL1NvdXJjZS9X ZWJLaXQvV2ViUHJvY2Vzcy9HUFUvbWVkaWEvUmVtb3RlTWVkaWFQbGF5ZXJNYW5hZ2VyLmNwcApp bmRleCBkYjVmNjEwYjg0OWViZjcwNWNlMzJlMGExOTdhOGU2ZmUwMWM2NTQ0Li44ZTllYzNhNTA5 ZWEyNDA5YTQyNDExYjc4YmQ5YjNmZmRiNzNlMTg3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L1dlYlByb2Nlc3MvR1BVL21lZGlhL1JlbW90ZU1lZGlhUGxheWVyTWFuYWdlci5jcHAKKysrIGIv U291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0dQVS9tZWRpYS9SZW1vdGVNZWRpYVBsYXllck1hbmFn ZXIuY3BwCkBAIC0xNTAsNiArMTUwLDcgQEAgc3RkOjp1bmlxdWVfcHRyPE1lZGlhUGxheWVyUHJp dmF0ZUludGVyZmFjZT4gUmVtb3RlTWVkaWFQbGF5ZXJNYW5hZ2VyOjpjcmVhdGVSZW0KICAgICBw cm94eUNvbmZpZ3VyYXRpb24ubmV0d29ya0ludGVyZmFjZU5hbWUgPSBwbGF5ZXItPm1lZGlhUGxh eWVyTmV0d29ya0ludGVyZmFjZU5hbWUoKTsKICNlbmRpZgogICAgIHByb3h5Q29uZmlndXJhdGlv bi5tZWRpYUNvbnRlbnRUeXBlc1JlcXVpcmluZ0hhcmR3YXJlU3VwcG9ydCA9IHBsYXllci0+bWVk aWFDb250ZW50VHlwZXNSZXF1aXJpbmdIYXJkd2FyZVN1cHBvcnQoKTsKKyAgICBwcm94eUNvbmZp Z3VyYXRpb24ucmVuZGVyaW5nQ2FuQmVBY2NlbGVyYXRlZCA9IHBsYXllci0+cmVuZGVyaW5nQ2Fu QmVBY2NlbGVyYXRlZCgpOwogICAgIHByb3h5Q29uZmlndXJhdGlvbi5wcmVmZXJyZWRBdWRpb0No YXJhY3RlcmlzdGljcyA9IHBsYXllci0+cHJlZmVycmVkQXVkaW9DaGFyYWN0ZXJpc3RpY3MoKTsK ICNpZiAhUkVMRUFTRV9MT0dfRElTQUJMRUQKICAgICBwcm94eUNvbmZpZ3VyYXRpb24ubG9nSWRl bnRpZmllciA9IHJlaW50ZXJwcmV0X2Nhc3Q8dWludDY0X3Q+KHBsYXllci0+bWVkaWFQbGF5ZXJM b2dJZGVudGlmaWVyKCkpOwo= 438721 2021-09-20 13:33:18 -0700 2021-09-20 16:08:09 -0700 Patch for landing bug-230495-20210920133317.patch text/plain 10540 eric.carlson U3VidmVyc2lvbiBSZXZpc2lvbjogMjgyNDA1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDAzYTc5ZGY0M2QwNDc3MjE5 YTUxOWFkY2FhMDA2NTE2ODE5ZDY1ZTYuLmRlMWI4ZWJjZTY0YWQ0ODY1MWYzNmUzMWUyN2ZjNGE1 MjM2NDY4ZTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDUgQEAKKzIwMjEtMDktMjAgIEVyaWMgQ2Fy bHNvbiAgPGVyaWMuY2FybHNvbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0NvY29hXSBWaWRlb3Mg c29tZXRpbWVzIGRvbid0IHJlbmRlciB3aGVuIGxvYWRlZCBpbiB0aGUgR1BVIHByb2Nlc3MKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMDQ5NQorICAg ICAgICByZGFyOi8vODMyMDU0MDcKKworICAgICAgICBSZXZpZXdlZCBieSBKZXIgTm9ibGUuCisK KyAgICAgICAgVGhlIG1lZGlhIHBsYXllcnMgY2hvb3NlIHdoYXQgdHlwZSBvZiB2aWRlbyBvdXRw dXQgdG8gY3JlYXRlIGJhc2VkIG9uIHdoZXRoZXIKKyAgICAgICAgb3Igbm90IHRoZSByZW5kZXJl ciBjYW4gc3VwcG9ydCBhY2NlbGVyYXRlZCByZW5kZXJpbmcuIFdlIHdlcmUgb25seSBwdXNoaW5n CisgICAgICAgIHRoaXMgc3RhdGUgdG8gdGhlIEdQVSBwcm9jZXNzIHdoZW4gdGhlIHJlbmRlcmVy IGNoYW5nZWQgdG8gcmVxdWlyZSBiYWNraW5nLCBidXQKKyAgICAgICAgdGhhdCBzdGF0ZSB3YXMg bG9zdCBpZiB0aGF0IHRyYW5zaXRpb24gaGFwcGVuZWQgYmVmb3JlIHRoZSBBVkZvdW5kYXRpb24t YmFja2VkCisgICAgICAgIG1lZGlhIHBsYXllciB3YXMgY3JlYXRlZC4gQ2hhbmdlIHRoaXMgdG8g cHVzaCB0aGUgY3VycmVudCBzdGF0ZSBmcm9tIHRoZSB3ZWIgcHJvY2VzcworICAgICAgICB3aGVu IGEgcmVtb3RlIG1lZGlhIHBsYXllciBpcyBjcmVhdGVkLCBhbmQgYWdhaW4gd2hlbmV2ZXIgaXRz IHJlYWR5U3RhdGUgY2hhbmdlcy4KKworICAgICAgICBXZSBoYXZlbid0IGZpZ3VyZWQgb3V0IGhv dyB0byByZWxpYWJseSByZXByb2R1Y2UgdGhpcywgc28gaHR0cHM6Ly93ZWJraXQub3JnL2IvMjMw NTAwCisgICAgICAgIHRyYWNrcyBmaWd1cmluZyB0aGF0IG91dCBhbmQgY3JlYXRpbmcgYSB0ZXN0 LgorCisgICAgICAgICogR1BVUHJvY2Vzcy9tZWRpYS9SZW1vdGVNZWRpYVBsYXllclByb3h5LmNw cDoKKyAgICAgICAgKFdlYktpdDo6UmVtb3RlTWVkaWFQbGF5ZXJQcm94eTo6UmVtb3RlTWVkaWFQ bGF5ZXJQcm94eSk6IFNldCBtX3JlbmRlcmluZ0NhbkJlQWNjZWxlcmF0ZWQKKyAgICAgICAgZnJv bSB0aGUgY29uZmlndXJhdGlvbi4KKyAgICAgICAgKFdlYktpdDo6UmVtb3RlTWVkaWFQbGF5ZXJQ cm94eTo6cHJlcGFyZVRvUGxheSk6IEFkZCBsb2dnaW5nLgorICAgICAgICAoV2ViS2l0OjpSZW1v dGVNZWRpYVBsYXllclByb3h5OjpwcmVwYXJlRm9yUmVuZGVyaW5nKTogRGl0dG8uCisgICAgICAg IChXZWJLaXQ6OlJlbW90ZU1lZGlhUGxheWVyUHJveHk6OnNldFBhZ2VJc1Zpc2libGUpOiBEaXR0 by4KKyAgICAgICAgKFdlYktpdDo6UmVtb3RlTWVkaWFQbGF5ZXJQcm94eTo6YWNjZWxlcmF0ZWRS ZW5kZXJpbmdTdGF0ZUNoYW5nZWQpOiBEaXR0by4KKyAgICAgICAgKFdlYktpdDo6UmVtb3RlTWVk aWFQbGF5ZXJQcm94eTo6bWVkaWFQbGF5ZXJSZWFkeVN0YXRlQ2hhbmdlZCk6IERpdHRvLgorCisg ICAgICAgICogR1BVUHJvY2Vzcy9tZWRpYS9SZW1vdGVNZWRpYVBsYXllclByb3h5Q29uZmlndXJh dGlvbi5oOiBBZGQgcmVuZGVyaW5nQ2FuQmVBY2NlbGVyYXRlZC4KKyAgICAgICAgKFdlYktpdDo6 UmVtb3RlTWVkaWFQbGF5ZXJQcm94eUNvbmZpZ3VyYXRpb246OmVuY29kZSBjb25zdCk6CisgICAg ICAgIChXZWJLaXQ6OlJlbW90ZU1lZGlhUGxheWVyUHJveHlDb25maWd1cmF0aW9uOjpkZWNvZGUp OiBEZWNvZGUgaXQuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL0dQVS9tZWRpYS9NZWRpYVBsYXll clByaXZhdGVSZW1vdGUuY3BwOgorICAgICAgICAoV2ViS2l0OjpNZWRpYVBsYXllclByaXZhdGVS ZW1vdGU6OnJlYWR5U3RhdGVDaGFuZ2VkKTogQ2FsbCBhY2NlbGVyYXRlZFJlbmRlcmluZ1N0YXRl Q2hhbmdlZAorICAgICAgICBpZiB0aGUgc3RhdGUgaGFzIGNoYW5nZWQuCisgICAgICAgIChXZWJL aXQ6Ok1lZGlhUGxheWVyUHJpdmF0ZVJlbW90ZTo6YWNjZWxlcmF0ZWRSZW5kZXJpbmdTdGF0ZUNo YW5nZWQpOiBSZW1lbWJlcgorICAgICAgICB0aGUgc3RhdGUuCisgICAgICAgICogV2ViUHJvY2Vz cy9HUFUvbWVkaWEvTWVkaWFQbGF5ZXJQcml2YXRlUmVtb3RlLmg6CisKKyAgICAgICAgKiBXZWJQ cm9jZXNzL0dQVS9tZWRpYS9SZW1vdGVNZWRpYVBsYXllck1hbmFnZXIuY3BwOgorICAgICAgICAo V2ViS2l0OjpSZW1vdGVNZWRpYVBsYXllck1hbmFnZXI6OmNyZWF0ZVJlbW90ZU1lZGlhUGxheWVy KTogUGFzcyB0aGUgYWNjZWxlcmF0ZWQgCisgICAgICAgIHJlbmRlcmluZyBzdGF0ZSB3aXRoIHRo ZSBjb25maWd1cmF0aW9uLgorCiAyMDIxLTA5LTE0ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBs ZS5jb20+CiAKICAgICAgICAgW0hhcmRlbmluZ10gVmFsaWRhdGUgSURCVmFsdWUncyBibG9iIHBh dGhzIGluIFdlYklEQlNlcnZlcjo6cHV0T3JBZGQoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvTWVkaWFQbGF5ZXJFbnVtcy5oIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvTWVkaWFQbGF5ZXJFbnVtcy5oCmluZGV4IDVmNWQ0NGE4NjllNDNi NzIxNjYwNTA1YmZlMmRiMjc0MjM1OGYyOTYuLmRhZTk4Zjk1NGMzZWUwZjI1NDA4M2I1N2U1ZDhh ZjdmN2ZlNTQ3NGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L01lZGlhUGxheWVyRW51bXMuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9NZWRpYVBsYXllckVudW1zLmgKQEAgLTExMyw3ICsxMTMsNyBAQCBwdWJsaWM6CiAgICAgfTsK IH07CiAKLVN0cmluZyBjb252ZXJ0RW51bWVyYXRpb25Ub1N0cmluZyhNZWRpYVBsYXllckVudW1z OjpSZWFkeVN0YXRlKTsKK1dFQkNPUkVfRVhQT1JUIFN0cmluZyBjb252ZXJ0RW51bWVyYXRpb25U b1N0cmluZyhNZWRpYVBsYXllckVudW1zOjpSZWFkeVN0YXRlKTsKIFN0cmluZyBjb252ZXJ0RW51 bWVyYXRpb25Ub1N0cmluZyhNZWRpYVBsYXllckVudW1zOjpOZXR3b3JrU3RhdGUpOwogU3RyaW5n IGNvbnZlcnRFbnVtZXJhdGlvblRvU3RyaW5nKE1lZGlhUGxheWVyRW51bXM6OlByZWxvYWQpOwog U3RyaW5nIGNvbnZlcnRFbnVtZXJhdGlvblRvU3RyaW5nKE1lZGlhUGxheWVyRW51bXM6OlN1cHBv cnRzVHlwZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0dQVVByb2Nlc3MvbWVkaWEvUmVt b3RlTWVkaWFQbGF5ZXJQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L0dQVVByb2Nlc3MvbWVkaWEv UmVtb3RlTWVkaWFQbGF5ZXJQcm94eS5jcHAKaW5kZXggYmFmZDkyNjVkNTE2Mzk1Y2I1YzA1MDA5 ZjJmM2QwM2M2NTdlOGZhNy4uMmE2N2FhNDg4NWNkODk2YzA0ZmViOTRmNzA2NGUzM2IwYTJiOGJj ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9HUFVQcm9jZXNzL21lZGlhL1JlbW90ZU1lZGlh UGxheWVyUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvR1BVUHJvY2Vzcy9tZWRpYS9SZW1v dGVNZWRpYVBsYXllclByb3h5LmNwcApAQCAtODQsNiArODQsNyBAQCBSZW1vdGVNZWRpYVBsYXll clByb3h5OjpSZW1vdGVNZWRpYVBsYXllclByb3h5KFJlbW90ZU1lZGlhUGxheWVyTWFuYWdlclBy b3h5JiBtYQogI2VuZGlmCiB7CiAgICAgbV90eXBlc1JlcXVpcmluZ0hhcmR3YXJlU3VwcG9ydCA9 IG1fY29uZmlndXJhdGlvbi5tZWRpYUNvbnRlbnRUeXBlc1JlcXVpcmluZ0hhcmR3YXJlU3VwcG9y dDsKKyAgICBtX3JlbmRlcmluZ0NhbkJlQWNjZWxlcmF0ZWQgPSBtX2NvbmZpZ3VyYXRpb24ucmVu ZGVyaW5nQ2FuQmVBY2NlbGVyYXRlZDsKICAgICBtX3BsYXllciA9IE1lZGlhUGxheWVyOjpjcmVh dGUoKnRoaXMsIG1fZW5naW5lSWRlbnRpZmllcik7CiB9CiAKQEAgLTE3Miw2ICsxNzMsNyBAQCB2 b2lkIFJlbW90ZU1lZGlhUGxheWVyUHJveHk6OmNhbmNlbExvYWQoKQogCiB2b2lkIFJlbW90ZU1l ZGlhUGxheWVyUHJveHk6OnByZXBhcmVUb1BsYXkoKQogeworICAgIEFMV0FZU19MT0coTE9HSURF TlRJRklFUik7CiAgICAgbV9wbGF5ZXItPnByZXBhcmVUb1BsYXkoKTsKIH0KIApAQCAtMjMzLDEx ICsyMzUsMTMgQEAgdm9pZCBSZW1vdGVNZWRpYVBsYXllclByb3h5OjpzZXRQaXRjaENvcnJlY3Rp b25BbGdvcml0aG0oV2ViQ29yZTo6TWVkaWFQbGF5ZXI6OlAKIAogdm9pZCBSZW1vdGVNZWRpYVBs YXllclByb3h5OjpwcmVwYXJlRm9yUmVuZGVyaW5nKCkKIHsKKyAgICBBTFdBWVNfTE9HKExPR0lE RU5USUZJRVIpOwogICAgIG1fcGxheWVyLT5wcmVwYXJlRm9yUmVuZGVyaW5nKCk7CiB9CiAKIHZv aWQgUmVtb3RlTWVkaWFQbGF5ZXJQcm94eTo6c2V0UGFnZUlzVmlzaWJsZShib29sIHZpc2libGUp CiB7CisgICAgQUxXQVlTX0xPRyhMT0dJREVOVElGSUVSLCB2aXNpYmxlKTsKICAgICBtX3BsYXll ci0+c2V0UGFnZUlzVmlzaWJsZSh2aXNpYmxlKTsKIH0KIApAQCAtMjU1LDYgKzI1OSw3IEBAIHZv aWQgUmVtb3RlTWVkaWFQbGF5ZXJQcm94eTo6c2V0VmlkZW9GdWxsc2NyZWVuR3Jhdml0eShXZWJD b3JlOjpNZWRpYVBsYXllckVudW1zCiAKIHZvaWQgUmVtb3RlTWVkaWFQbGF5ZXJQcm94eTo6YWNj ZWxlcmF0ZWRSZW5kZXJpbmdTdGF0ZUNoYW5nZWQoYm9vbCByZW5kZXJpbmdDYW5CZUFjY2VsZXJh dGVkKQogeworICAgIEFMV0FZU19MT0coTE9HSURFTlRJRklFUiwgcmVuZGVyaW5nQ2FuQmVBY2Nl bGVyYXRlZCk7CiAgICAgbV9yZW5kZXJpbmdDYW5CZUFjY2VsZXJhdGVkID0gcmVuZGVyaW5nQ2Fu QmVBY2NlbGVyYXRlZDsKICAgICBtX3BsYXllci0+YWNjZWxlcmF0ZWRSZW5kZXJpbmdTdGF0ZUNo YW5nZWQoKTsKIH0KQEAgLTM0OCw5ICszNTMsMTEgQEAgdm9pZCBSZW1vdGVNZWRpYVBsYXllclBy b3h5OjptZWRpYVBsYXllck5ldHdvcmtTdGF0ZUNoYW5nZWQoKQogCiB2b2lkIFJlbW90ZU1lZGlh UGxheWVyUHJveHk6Om1lZGlhUGxheWVyUmVhZHlTdGF0ZUNoYW5nZWQoKQogeworICAgIGF1dG8g bmV3UmVhZHlTdGF0ZSA9IG1fcGxheWVyLT5yZWFkeVN0YXRlKCk7CisgICAgQUxXQVlTX0xPRyhM T0dJREVOVElGSUVSLCBuZXdSZWFkeVN0YXRlKTsKICAgICB1cGRhdGVDYWNoZWRWaWRlb01ldHJp Y3MoKTsKICAgICB1cGRhdGVDYWNoZWRTdGF0ZSh0cnVlKTsKLSAgICBtX2NhY2hlZFN0YXRlLnJl YWR5U3RhdGUgPSBtX3BsYXllci0+cmVhZHlTdGF0ZSgpOworICAgIG1fY2FjaGVkU3RhdGUucmVh ZHlTdGF0ZSA9IG5ld1JlYWR5U3RhdGU7CiAgICAgbV9jYWNoZWRTdGF0ZS5uZXR3b3JrU3RhdGUg PSBtX3BsYXllci0+bmV0d29ya1N0YXRlKCk7CiAgICAgbV9jYWNoZWRTdGF0ZS5kdXJhdGlvbiA9 IG1fcGxheWVyLT5kdXJhdGlvbigpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0dQVVBy b2Nlc3MvbWVkaWEvUmVtb3RlTWVkaWFQbGF5ZXJQcm94eUNvbmZpZ3VyYXRpb24uaCBiL1NvdXJj ZS9XZWJLaXQvR1BVUHJvY2Vzcy9tZWRpYS9SZW1vdGVNZWRpYVBsYXllclByb3h5Q29uZmlndXJh dGlvbi5oCmluZGV4IGFlMWQ5OWZkNjYxMzAzOGVmOThmYTdiMjU1YjQ5YTg1ZDE3ZTNmOGIuLjRh Y2I0MGUyYzA5ZWM3NWNlOWVlYmI3MzFlMWRkMWM5YzYzMjE1MGYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvR1BVUHJvY2Vzcy9tZWRpYS9SZW1vdGVNZWRpYVBsYXllclByb3h5Q29uZmlndXJh dGlvbi5oCisrKyBiL1NvdXJjZS9XZWJLaXQvR1BVUHJvY2Vzcy9tZWRpYS9SZW1vdGVNZWRpYVBs YXllclByb3h5Q29uZmlndXJhdGlvbi5oCkBAIC00Nyw3ICs0Nyw4IEBAIHN0cnVjdCBSZW1vdGVN ZWRpYVBsYXllclByb3h5Q29uZmlndXJhdGlvbiB7CiAgICAgV2ViQ29yZTo6U2VjdXJpdHlPcmln aW5EYXRhIGRvY3VtZW50U2VjdXJpdHlPcmlnaW47CiAgICAgdWludDY0X3QgbG9nSWRlbnRpZmll ciB7IDAgfTsKICAgICBib29sIHNob3VsZFVzZVBlcnNpc3RlbnRDYWNoZSB7IGZhbHNlIH07Ci0g ICAgYm9vbCBpc1ZpZGVvIHsgMCB9OworICAgIGJvb2wgaXNWaWRlbyB7IGZhbHNlIH07CisgICAg Ym9vbCByZW5kZXJpbmdDYW5CZUFjY2VsZXJhdGVkIHsgZmFsc2UgfTsKIAogICAgIHRlbXBsYXRl PGNsYXNzIEVuY29kZXI+CiAgICAgdm9pZCBlbmNvZGUoRW5jb2RlciYgZW5jb2RlcikgY29uc3QK QEAgLTY1LDYgKzY2LDcgQEAgc3RydWN0IFJlbW90ZU1lZGlhUGxheWVyUHJveHlDb25maWd1cmF0 aW9uIHsKICAgICAgICAgZW5jb2RlciA8PCBsb2dJZGVudGlmaWVyOwogICAgICAgICBlbmNvZGVy IDw8IHNob3VsZFVzZVBlcnNpc3RlbnRDYWNoZTsKICAgICAgICAgZW5jb2RlciA8PCBpc1ZpZGVv OworICAgICAgICBlbmNvZGVyIDw8IHJlbmRlcmluZ0NhbkJlQWNjZWxlcmF0ZWQ7CiAgICAgfQog CiAgICAgdGVtcGxhdGUgPGNsYXNzIERlY29kZXI+CkBAIC0xMjcsNiArMTI5LDExIEBAIHN0cnVj dCBSZW1vdGVNZWRpYVBsYXllclByb3h5Q29uZmlndXJhdGlvbiB7CiAgICAgICAgIGlmICghaXNW aWRlbykKICAgICAgICAgICAgIHJldHVybiBzdGQ6Om51bGxvcHQ7CiAKKyAgICAgICAgc3RkOjpv cHRpb25hbDxib29sPiByZW5kZXJpbmdDYW5CZUFjY2VsZXJhdGVkOworICAgICAgICBkZWNvZGVy ID4+IHJlbmRlcmluZ0NhbkJlQWNjZWxlcmF0ZWQ7CisgICAgICAgIGlmICghcmVuZGVyaW5nQ2Fu QmVBY2NlbGVyYXRlZCkKKyAgICAgICAgICAgIHJldHVybiBzdGQ6Om51bGxvcHQ7CisKICAgICAg ICAgcmV0dXJuIHt7CiAgICAgICAgICAgICBXVEZNb3ZlKCpyZWZlcnJlciksCiAgICAgICAgICAg ICBXVEZNb3ZlKCp1c2VyQWdlbnQpLApAQCAtMTQxLDYgKzE0OCw3IEBAIHN0cnVjdCBSZW1vdGVN ZWRpYVBsYXllclByb3h5Q29uZmlndXJhdGlvbiB7CiAgICAgICAgICAgICAqbG9nSWRlbnRpZmll ciwKICAgICAgICAgICAgICpzaG91bGRVc2VQZXJzaXN0ZW50Q2FjaGUsCiAgICAgICAgICAgICAq aXNWaWRlbywKKyAgICAgICAgICAgICpyZW5kZXJpbmdDYW5CZUFjY2VsZXJhdGVkLAogICAgICAg ICB9fTsKICAgICB9CiB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0dQ VS9tZWRpYS9NZWRpYVBsYXllclByaXZhdGVSZW1vdGUuY3BwIGIvU291cmNlL1dlYktpdC9XZWJQ cm9jZXNzL0dQVS9tZWRpYS9NZWRpYVBsYXllclByaXZhdGVSZW1vdGUuY3BwCmluZGV4IGRmZTM0 MDczMGUwNjBmZjlmOWNkNDY4ZWIzNjNmYzg5MTYwMmRlYWUuLmUwNmY0ZjdlM2FjODFmMGQ1Y2Zh NzI4Mjk2ZTMzYWRjZTYyM2MzOTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vz cy9HUFUvbWVkaWEvTWVkaWFQbGF5ZXJQcml2YXRlUmVtb3RlLmNwcAorKysgYi9Tb3VyY2UvV2Vi S2l0L1dlYlByb2Nlc3MvR1BVL21lZGlhL01lZGlhUGxheWVyUHJpdmF0ZVJlbW90ZS5jcHAKQEAg LTM1MSw4ICszNTEsMTIgQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVSZW1vdGU6OnNldFJlYWR5 U3RhdGUoTWVkaWFQbGF5ZXI6OlJlYWR5U3RhdGUgcmVhZHlTdGF0ZSkKIHZvaWQgTWVkaWFQbGF5 ZXJQcml2YXRlUmVtb3RlOjpyZWFkeVN0YXRlQ2hhbmdlZChSZW1vdGVNZWRpYVBsYXllclN0YXRl JiYgc3RhdGUpCiB7CiAgICAgdXBkYXRlQ2FjaGVkU3RhdGUoV1RGTW92ZShzdGF0ZSkpOwotICAg IGlmIChhdXRvIHBsYXllciA9IG1ha2VSZWZQdHIobV9wbGF5ZXIuZ2V0KCkpKQorICAgIGlmIChh dXRvIHBsYXllciA9IG1ha2VSZWZQdHIobV9wbGF5ZXIuZ2V0KCkpKSB7CiAgICAgICAgIHBsYXll ci0+cmVhZHlTdGF0ZUNoYW5nZWQoKTsKKyAgICAgICAgYm9vbCByZW5kZXJpbmdDYW5CZUFjY2Vs ZXJhdGVkID0gcGxheWVyLT5yZW5kZXJpbmdDYW5CZUFjY2VsZXJhdGVkKCk7CisgICAgICAgIGlm IChtX3JlbmRlcmluZ0NhbkJlQWNjZWxlcmF0ZWQgIT0gcmVuZGVyaW5nQ2FuQmVBY2NlbGVyYXRl ZCkKKyAgICAgICAgICAgIGFjY2VsZXJhdGVkUmVuZGVyaW5nU3RhdGVDaGFuZ2VkKCk7CisgICAg fQogfQogCiB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZVJlbW90ZTo6dm9sdW1lQ2hhbmdlZChkb3Vi bGUgdm9sdW1lKQpAQCAtNDY5LDggKzQ3MywxMCBAQCBib29sIE1lZGlhUGxheWVyUHJpdmF0ZVJl bW90ZTo6c3VwcG9ydHNBY2NlbGVyYXRlZFJlbmRlcmluZygpIGNvbnN0CiAKIHZvaWQgTWVkaWFQ bGF5ZXJQcml2YXRlUmVtb3RlOjphY2NlbGVyYXRlZFJlbmRlcmluZ1N0YXRlQ2hhbmdlZCgpCiB7 Ci0gICAgaWYgKGF1dG8gcGxheWVyID0gbWFrZVJlZlB0cihtX3BsYXllci5nZXQoKSkpCi0gICAg ICAgIGNvbm5lY3Rpb24oKS5zZW5kKE1lc3NhZ2VzOjpSZW1vdGVNZWRpYVBsYXllclByb3h5OjpB Y2NlbGVyYXRlZFJlbmRlcmluZ1N0YXRlQ2hhbmdlZChwbGF5ZXItPnJlbmRlcmluZ0NhbkJlQWNj ZWxlcmF0ZWQoKSksIG1faWQpOworICAgIGlmIChhdXRvIHBsYXllciA9IG1ha2VSZWZQdHIobV9w bGF5ZXIuZ2V0KCkpKSB7CisgICAgICAgIG1fcmVuZGVyaW5nQ2FuQmVBY2NlbGVyYXRlZCA9IHBs YXllci0+cmVuZGVyaW5nQ2FuQmVBY2NlbGVyYXRlZCgpOworICAgICAgICBjb25uZWN0aW9uKCku c2VuZChNZXNzYWdlczo6UmVtb3RlTWVkaWFQbGF5ZXJQcm94eTo6QWNjZWxlcmF0ZWRSZW5kZXJp bmdTdGF0ZUNoYW5nZWQobV9yZW5kZXJpbmdDYW5CZUFjY2VsZXJhdGVkKSwgbV9pZCk7CisgICAg fQogfQogCiAjaWYgRU5BQkxFKFdJUkVMRVNTX1BMQVlCQUNLX1RBUkdFVCkKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUvbWVkaWEvTWVkaWFQbGF5ZXJQcml2YXRlUmVt b3RlLmggYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvR1BVL21lZGlhL01lZGlhUGxheWVyUHJp dmF0ZVJlbW90ZS5oCmluZGV4IGU3MDRlNjlkZWJmMGVkZGVmMzY2MDI2MjJkMTI3M2FiMTAwMTk2 NjguLjYyMDA3NDlkNGQ0MTc2MjlkMGFjMmJmYjhhYjM4YjE5ZDMwODYwN2UgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUvbWVkaWEvTWVkaWFQbGF5ZXJQcml2YXRlUmVt b3RlLmgKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0dQVS9tZWRpYS9NZWRpYVBsYXll clByaXZhdGVSZW1vdGUuaApAQCAtNDQ0LDYgKzQ0NCw3IEBAIHByaXZhdGU6CiAgICAgYm9vbCBt X2ludmFsaWQgeyBmYWxzZSB9OwogICAgIGJvb2wgbV93YWl0aW5nRm9yS2V5IHsgZmFsc2UgfTsK ICAgICBib29sIG1fdGltZUlzUHJvZ3Jlc3NpbmcgeyBmYWxzZSB9OworICAgIGJvb2wgbV9yZW5k ZXJpbmdDYW5CZUFjY2VsZXJhdGVkIHsgZmFsc2UgfTsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdl YktpdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0dQVS9tZWRpYS9SZW1v dGVNZWRpYVBsYXllck1hbmFnZXIuY3BwIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0dQVS9t ZWRpYS9SZW1vdGVNZWRpYVBsYXllck1hbmFnZXIuY3BwCmluZGV4IGRiNWY2MTBiODQ5ZWJmNzA1 Y2UzMmUwYTE5N2E4ZTZmZTAxYzY1NDQuLjhlOWVjM2E1MDllYTI0MDlhNDI0MTFiNzhiZDliM2Zm ZGI3M2UxODcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUvbWVkaWEv UmVtb3RlTWVkaWFQbGF5ZXJNYW5hZ2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nl c3MvR1BVL21lZGlhL1JlbW90ZU1lZGlhUGxheWVyTWFuYWdlci5jcHAKQEAgLTE1MCw2ICsxNTAs NyBAQCBzdGQ6OnVuaXF1ZV9wdHI8TWVkaWFQbGF5ZXJQcml2YXRlSW50ZXJmYWNlPiBSZW1vdGVN ZWRpYVBsYXllck1hbmFnZXI6OmNyZWF0ZVJlbQogICAgIHByb3h5Q29uZmlndXJhdGlvbi5uZXR3 b3JrSW50ZXJmYWNlTmFtZSA9IHBsYXllci0+bWVkaWFQbGF5ZXJOZXR3b3JrSW50ZXJmYWNlTmFt ZSgpOwogI2VuZGlmCiAgICAgcHJveHlDb25maWd1cmF0aW9uLm1lZGlhQ29udGVudFR5cGVzUmVx dWlyaW5nSGFyZHdhcmVTdXBwb3J0ID0gcGxheWVyLT5tZWRpYUNvbnRlbnRUeXBlc1JlcXVpcmlu Z0hhcmR3YXJlU3VwcG9ydCgpOworICAgIHByb3h5Q29uZmlndXJhdGlvbi5yZW5kZXJpbmdDYW5C ZUFjY2VsZXJhdGVkID0gcGxheWVyLT5yZW5kZXJpbmdDYW5CZUFjY2VsZXJhdGVkKCk7CiAgICAg cHJveHlDb25maWd1cmF0aW9uLnByZWZlcnJlZEF1ZGlvQ2hhcmFjdGVyaXN0aWNzID0gcGxheWVy LT5wcmVmZXJyZWRBdWRpb0NoYXJhY3RlcmlzdGljcygpOwogI2lmICFSRUxFQVNFX0xPR19ESVNB QkxFRAogICAgIHByb3h5Q29uZmlndXJhdGlvbi5sb2dJZGVudGlmaWVyID0gcmVpbnRlcnByZXRf Y2FzdDx1aW50NjRfdD4ocGxheWVyLT5tZWRpYVBsYXllckxvZ0lkZW50aWZpZXIoKSk7Cg==