239744 2022-04-25 15:56:24 -0700 [iOS] Infinite recursion at -[WKFullScreenWindowController _exitFullscreenImmediately] 2022-05-06 12:51:48 -0700 1 1 1 Unclassified WebKit Media WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jer.noble jer.noble ajuma cdumez eric.carlson esprehn+autocc ews-watchlist kangil.han webkit-bug-importer oldest_to_newest 1864265 0 jer.noble 2022-04-25 15:56:24 -0700 [iOS] Infinite recursion at -[WKFullScreenWindowController _exitFullscreenImmediately] 1864266 1 jer.noble 2022-04-25 15:56:39 -0700 <rdar://74201964> 1864284 2 458309 jer.noble 2022-04-25 16:30:53 -0700 Created attachment 458309 Patch 1864343 3 458309 eric.carlson 2022-04-25 21:10:20 -0700 Comment on attachment 458309 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=458309&action=review > Source/WebCore/dom/FullscreenManager.cpp:116 > + INFO_LOG(LOGIDENTIFIER); This happens infrequently enough I think it might as well use ALWAYS_LOG. > Source/WebCore/dom/FullscreenManager.cpp:293 > + INFO_LOG(LOGIDENTIFIER); Ditto > Source/WebCore/dom/FullscreenManager.cpp:640 > + INFO_LOG(LOGIDENTIFIER, flag); Ditto > Source/WebCore/dom/FullscreenManager.cpp:658 > + INFO_LOG(LOGIDENTIFIER, flag); Ditto 1866899 4 458885 jer.noble 2022-05-05 10:14:57 -0700 Created attachment 458885 Patch for landing 1867234 5 ews-feeder 2022-05-06 09:10:18 -0700 Committed r293894 (250352@main): <https://commits.webkit.org/250352@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 458885. 1867315 6 ajuma 2022-05-06 12:51:31 -0700 *** Bug 239076 has been marked as a duplicate of this bug. *** 1867317 7 ajuma 2022-05-06 12:51:48 -0700 *** Bug 239071 has been marked as a duplicate of this bug. *** 458309 2022-04-25 16:30:53 -0700 2022-05-05 10:14:54 -0700 Patch bug-239744-20220425163053.patch text/plain 10680 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMjkyNzE1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjQwMDhhOTMwMzExZTIx ZWIxMWEwZmU5NmE2YzczMjRkM2RiMWI5OS4uMDAwZjUzYzdkODgxMTk3YmEyMDcwZDU3ZDZkOGIy MzliZWI5OGUxNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDIyLTA0LTI1ICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIFtpT1NdIEluZmluaXRlIHJl Y3Vyc2lvbiBhdCAtW1dLRnVsbFNjcmVlbldpbmRvd0NvbnRyb2xsZXIgX2V4aXRGdWxsc2NyZWVu SW1tZWRpYXRlbHldCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMzk3NDQKKyAgICAgICAgPHJkYXI6Ly83NDIwMTk2ND4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBFdmVuIGFmdGVyIGZ1bGxzY3JlZW4gaXMg Y29ycmVjdGx5IHRvcm4gZG93biBkdXJpbmcgYW4gaW1tZWRpYXRlIGV4aXQsIGZ1bGxzY3JlZW4g Y2FuIG5ldmVyIGFnYWluCisgICAgICAgIGJlIGVudGVyZWQgZm9yIHRoZSBsaWZldGltZSBvZiB0 aGUgcGFnZS4gVGhpcyBpcyBkdWUgdG8gdGhlIGl2YXIgbV9wZW5kaW5nRXhpdEZ1bGxzY3JlZW4g YmVpbmcgc2V0CisgICAgICAgIHRvIHRydWUgd2l0aCBubyBvcHBvcnR1bml0eSBmb3IgdGhhdCBz dGF0ZSB0byBiZSBjbGVhcmVkLiBUaGlzIG9jY3VycyBiZWNhdXNlIHRoZSBjYWxsYmFja3MgZm9y CisgICAgICAgIGV4aXRpbmcgZnVsbHNjcmVlbiBhcmUgcGVyZm9ybWVkIGJlZm9yZSB0aGUgbGFt YmRhIGZvcm0gRnVsbHNjcmVlbk1hbmFnZXI6OmV4aXRGdWxsc2NyZWVuKCkgaXMKKyAgICAgICAg Y2FsbGVkLgorCisgICAgICAgIFNldCBtX3BlbmRpbmdFeGl0RnVsbHNjcmVlbiBpbnNpZGUgZXhp dEZ1bGxzY3JlZW4oKSwgcmF0aGVyIHRoYW4gdGhlIGxhbWJkYSwgYW5kIGNsZWFyIGl0IGV4cGxp Y2l0bHkKKyAgICAgICAgaW4gdGhlIGNhc2VzIHdoZXJlIGZ1bGxzY3JlZW4gZXhpdGluZyBpcyBu b3QgYWN0dWFsbHkgbmVjZXNzYXJ5LgorCisgICAgICAgIFRoZSBtb2NrIGJlaGF2aW9yIG9mIEZ1 bGxzY3JlZW4gaW5zaWRlIER1bXBSZW5kZXJUcmVlIGFuZCBXZWJLaXRUZXN0UnVubmVyIGFyZSBu b3QgYWJsZSB0byBleGVyY2lzZQorICAgICAgICB0aGlzIHNhbWUgcGF0aC4gVHJhY2sgaW1wcm92 ZW1lbnRzIHRvIHRoaXMgbW9jayBpbiBidWcgIzIzOTc0Ny4KKworICAgICAgICAqIGRvbS9GdWxs c2NyZWVuTWFuYWdlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGdWxsc2NyZWVuTWFuYWdlcjo6 cmVxdWVzdEZ1bGxzY3JlZW5Gb3JFbGVtZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkZ1bGxzY3Jl ZW5NYW5hZ2VyOjpleGl0RnVsbHNjcmVlbik6CisgICAgICAgIChXZWJDb3JlOjpGdWxsc2NyZWVu TWFuYWdlcjo6c2V0QW5pbWF0aW5nRnVsbHNjcmVlbik6CisgICAgICAgIChXZWJDb3JlOjpGdWxs c2NyZWVuTWFuYWdlcjo6c2V0RnVsbHNjcmVlbkNvbnRyb2xzSGlkZGVuKToKKwogMjAyMi0wNC0x MSAgSmVyIE5vYmxlICA8amVyLm5vYmxlQGFwcGxlLmNvbT4KIAogICAgICAgICBMZWFrIG9mIE1l ZGlhU291cmNlUHJpdmF0ZUFWRk9iakMgYW5kIFJlbW90ZU1lZGlhU291cmNlUHJveHkKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cK aW5kZXggOGQ3OTc2YmQ5ZTFjOGQzMGJkNTI2ZmFlMmE2ZWMwM2RlZjEwNmI3My4uMGYwZGQyNjdm NjAwOGUwYjg1MjJkNWRlZDM1NzJlODQ2ZjVhMzA2MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyOSBA QAorMjAyMi0wNC0yNSAgSmVyIE5vYmxlICA8amVyLm5vYmxlQGFwcGxlLmNvbT4KKworICAgICAg ICBbaU9TXSBJbmZpbml0ZSByZWN1cnNpb24gYXQgLVtXS0Z1bGxTY3JlZW5XaW5kb3dDb250cm9s bGVyIF9leGl0RnVsbHNjcmVlbkltbWVkaWF0ZWx5XQorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM5NzQ0CisgICAgICAgIDxyZGFyOi8vNzQyMDE5NjQ+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2hlbiBl eGl0aW5nIGZ1bGxzY3JlZW4gaW1tZWRpYXRlbHksIHdlIHRyaWdnZXIgdGhlIGNvcnJlY3Qgc3Rh dGUgdHJhbnNpdGlvbiBieSBjYWxsaW5nCisgICAgICAgIC1bc2VsZiBleGl0RnVsbFNjcmVlbl0u IEhvd2V2ZXIsIHdoZW4gbm8gZnVsbHNjcmVlbiBtYW5hZ2VyIGV4aXN0cyAoYXMgbWF5IGhhcHBl biBkdXJpbmcKKyAgICAgICAgbmF2aWdhdGlvbiksIC1leGl0RnVsbHNjcmVlbiBtYXkgaXRzZWxm IGNhbGwgLV9leGl0RnVsbHNjcmVlbkltbWVkaWF0ZWx5LCB3aGljaCBjYXVzZXMgYW4KKyAgICAg ICAgaW5maW5pdGUgcmVjdXJzaW9uIGFuZCBzdGFjayBvdmVyZmxvdy4KKworICAgICAgICBVbnJv bGwgdGhlIGltcGxlbWVudGF0aW9uIGJ5IHBlcmZvcm1pbmcgYWxsIHRoZSBzYW1lIHBpZWNlcyBh cyB3b3VsZCBoYXZlIGJlZW4gZG9uZSBieQorICAgICAgICAtZXhpdEZ1bGxTY3JlZW4sIGJ1dCBp bmxpbmUuIFJlZmFjdG9yIG91dCBjb21tb24gYmVoYXZpb3IgaW50byAtX3JlaW5zZXJ0V2ViVmll d1VuZGVyUGxhY2Vob2xkZXIsCisgICAgICAgIGFuZCBjYWxsIHRoYXQgYm90aCBmcm9tIC1fZXhp dEZ1bGxzY3JlZW5JbW1lZGlhdGVseSBhbmQgX2NvbXBsZXRlZEV4aXRGdWxsU2NyZWVuLgorCisg ICAgICAgIFVuZm9ydHVuYXRlbHksIG5vIEFQSSB0ZXN0cyBhcmUgcG9zc2libGUgaGVyZSBiZWNh dXNlIFRlc3RXZWJLaXRBUEkgaXMgbm90IGFuIGFjdHVhbCBpT1MgVUkKKyAgICAgICAgYXBwbGlj YXRpb24uCisKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL2Z1bGxzY3JlZW4vV0tGdWxsU2NyZWVu V2luZG93Q29udHJvbGxlcklPUy5tbToKKyAgICAgICAgKC1bV0tGdWxsU2NyZWVuV2luZG93Q29u dHJvbGxlciBleGl0RnVsbFNjcmVlbl0pOgorICAgICAgICAoLVtXS0Z1bGxTY3JlZW5XaW5kb3dD b250cm9sbGVyIF9yZWluc2VydFdlYlZpZXdVbmRlclBsYWNlaG9sZGVyXSk6CisgICAgICAgICgt W1dLRnVsbFNjcmVlbldpbmRvd0NvbnRyb2xsZXIgX2NvbXBsZXRlZEV4aXRGdWxsU2NyZWVuXSk6 CisgICAgICAgICgtW1dLRnVsbFNjcmVlbldpbmRvd0NvbnRyb2xsZXIgX2V4aXRGdWxsc2NyZWVu SW1tZWRpYXRlbHldKToKKwogMjAyMi0wNC0xMSAgSmVyIE5vYmxlICA8amVyLm5vYmxlQGFwcGxl LmNvbT4KIAogICAgICAgICBMZWFrIG9mIE1lZGlhU291cmNlUHJpdmF0ZUFWRk9iakMgYW5kIFJl bW90ZU1lZGlhU291cmNlUHJveHkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9GdWxs c2NyZWVuTWFuYWdlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRnVsbHNjcmVlbk1hbmFnZXIu Y3BwCmluZGV4IDBlOWJiOTQ0MWMzN2RmNTNkNDcxODM4Y2NjMWFhZGNiNjM3NzhiZWYuLjE1ZGZk Y2RkZmEyNTBkYTUyZDQ5NTc5MTIwNWVlYThkZTA3NmI1ZGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2RvbS9GdWxsc2NyZWVuTWFuYWdlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9t L0Z1bGxzY3JlZW5NYW5hZ2VyLmNwcApAQCAtMTEzLDYgKzExMyw4IEBAIHZvaWQgRnVsbHNjcmVl bk1hbmFnZXI6OnJlcXVlc3RGdWxsc2NyZWVuRm9yRWxlbWVudChSZWY8RWxlbWVudD4mJiBlbGVt ZW50LCBGdWxsCiAgICAgICAgIH0KICAgICB9CiAKKyAgICBJTkZPX0xPRyhMT0dJREVOVElGSUVS KTsKKwogICAgIG1fcGVuZGluZ0Z1bGxzY3JlZW5FbGVtZW50ID0gUmVmUHRyIHsgZWxlbWVudC5w dHIoKSB9OwogCiAgICAgbV9kb2N1bWVudC5ldmVudExvb3AoKS5xdWV1ZVRhc2soVGFza1NvdXJj ZTo6TWVkaWFFbGVtZW50LCBbdGhpcywgd2Vha1RoaXMgPSBXZWFrUHRyIHsgKnRoaXMgfSwgZWxl bWVudCA9IFdURk1vdmUoZWxlbWVudCksIGNoZWNrVHlwZSwgaGFzS2V5Ym9hcmRBY2Nlc3MsIGZh aWxlZFByZWZsaWdodHMsIGlkZW50aWZpZXIgPSBMT0dJREVOVElGSUVSXSAoKSBtdXRhYmxlIHsK QEAgLTI3OSw3ICsyODEsNyBAQCB2b2lkIEZ1bGxzY3JlZW5NYW5hZ2VyOjpleGl0RnVsbHNjcmVl bigpCiAgICAgRG9jdW1lbnQqIGN1cnJlbnREb2MgPSAmZG9jdW1lbnQoKTsKIAogICAgIC8vIDIu IElmIGRvYydzIGZ1bGxzY3JlZW4gZWxlbWVudCBzdGFjayBpcyBlbXB0eSwgdGVybWluYXRlIHRo ZXNlIHN0ZXBzLgotICAgIGlmIChtX2Z1bGxzY3JlZW5FbGVtZW50U3RhY2suaXNFbXB0eSgpKSB7 CisgICAgaWYgKG1fZnVsbHNjcmVlbkVsZW1lbnRTdGFjay5pc0VtcHR5KCkgfHwgIW1fZnVsbHNj cmVlbkVsZW1lbnQpIHsKICAgICAgICAgLy8gSWYgdGhlcmUgaXMgYSBwZW5kaW5nIGZ1bGxzY3Jl ZW4gZWxlbWVudCBidXQgYW4gZW1wdHkgZnVsbHNjcmVlbiBlbGVtZW50IHN0YWNrLAogICAgICAg ICAvLyB0aGVyZSBpcyBhIHBlbmRpbmcgdGFzayBpbiByZXF1ZXN0RnVsbHNjcmVlbkZvckVsZW1l bnQoKS4gQ2F1c2UgaXQgdG8gY2FuY2VsIGFuZCBmaXJlIGFuIGVycm9yCiAgICAgICAgIC8vIGJ5 IGNsZWFyaW5nIHRoZSBwZW5kaW5nIGZ1bGxzY3JlZW4gZWxlbWVudC4KQEAgLTI4OCw2ICsyOTAs OCBAQCB2b2lkIEZ1bGxzY3JlZW5NYW5hZ2VyOjpleGl0RnVsbHNjcmVlbigpCiAgICAgICAgIHJl dHVybjsKICAgICB9CiAKKyAgICBJTkZPX0xPRyhMT0dJREVOVElGSUVSKTsKKwogICAgIC8vIDMu IExldCBkZXNjZW5kYW50cyBiZSBhbGwgdGhlIGRvYydzIGRlc2NlbmRhbnQgYnJvd3NpbmcgY29u dGV4dCdzIGRvY3VtZW50cyB3aXRoIGEgbm9uLWVtcHR5IGZ1bGxzY3JlZW4KICAgICAvLyBlbGVt ZW50IHN0YWNrIChpZiBhbnkpLCBvcmRlcmVkIHNvIHRoYXQgdGhlIGNoaWxkIG9mIHRoZSBkb2Mg aXMgbGFzdCBhbmQgdGhlIGRvY3VtZW50IGZ1cnRoZXN0CiAgICAgLy8gYXdheSBmcm9tIHRoZSBk b2MgaXMgZmlyc3QuCkBAIC0zMzEsNiArMzM1LDggQEAgdm9pZCBGdWxsc2NyZWVuTWFuYWdlcjo6 ZXhpdEZ1bGxzY3JlZW4oKQogICAgICAgICBjdXJyZW50RG9jID0gbnVsbHB0cjsKICAgICB9CiAK KyAgICBtX3BlbmRpbmdFeGl0RnVsbHNjcmVlbiA9IHRydWU7CisKICAgICAvLyA2LiBSZXR1cm4s IGFuZCBydW4gdGhlIHJlbWFpbmluZyBzdGVwcyBhc3luY2hyb25vdXNseS4KICAgICAvLyA3LiBP cHRpb25hbGx5LCBwZXJmb3JtIHNvbWUgYW5pbWF0aW9uLgogICAgIG1fZG9jdW1lbnQuZXZlbnRM b29wKCkucXVldWVUYXNrKFRhc2tTb3VyY2U6Ok1lZGlhRWxlbWVudCwgW3RoaXMsIHdlYWtUaGlz ID0gV2Vha1B0ciB7ICp0aGlzIH0sIG5ld1RvcCA9IFJlZlB0ciB7IG5ld1RvcCB9LCBmdWxsc2Ny ZWVuRWxlbWVudCA9IG1fZnVsbHNjcmVlbkVsZW1lbnQsIGlkZW50aWZpZXIgPSBMT0dJREVOVElG SUVSXSB7CkBAIC0zMzksNiArMzQ1LDcgQEAgdm9pZCBGdWxsc2NyZWVuTWFuYWdlcjo6ZXhpdEZ1 bGxzY3JlZW4oKQogCiAgICAgICAgIGF1dG8qIHBhZ2UgPSB0aGlzLT5wYWdlKCk7CiAgICAgICAg IGlmICghcGFnZSkgeworICAgICAgICAgICAgbV9wZW5kaW5nRXhpdEZ1bGxzY3JlZW4gPSBmYWxz ZTsKICAgICAgICAgICAgIEVSUk9SX0xPRyhpZGVudGlmaWVyLCAidGFzayAtIERvY3VtZW50IG5v dCBpbiBwYWdlOyBiYWlsaW5nLiIpOwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CkBA IC0zNDksMTkgKzM1NiwyMSBAQCB2b2lkIEZ1bGxzY3JlZW5NYW5hZ2VyOjpleGl0RnVsbHNjcmVl bigpCiAgICAgICAgIGlmICghZnVsbHNjcmVlbkVsZW1lbnQgJiYgbV9wZW5kaW5nRnVsbHNjcmVl bkVsZW1lbnQpIHsKICAgICAgICAgICAgIElORk9fTE9HKGlkZW50aWZpZXIsICJ0YXNrIC0gQ2Fu Y2VsbGluZyBwZW5kaW5nIGZ1bGxzY3JlZW4gcmVxdWVzdC4iKTsKICAgICAgICAgICAgIG1fcGVu ZGluZ0Z1bGxzY3JlZW5FbGVtZW50ID0gbnVsbHB0cjsKKyAgICAgICAgICAgIG1fcGVuZGluZ0V4 aXRGdWxsc2NyZWVuID0gZmFsc2U7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KIAog ICAgICAgICAvLyBPbmx5IGV4aXQgb3V0IG9mIGZ1bGwgc2NyZWVuIHdpbmRvdyBtb2RlIGlmIHRo ZXJlIGFyZSBubyByZW1haW5pbmcgZWxlbWVudHMgaW4gdGhlCiAgICAgICAgIC8vIGZ1bGwgc2Ny ZWVuIHN0YWNrLgogICAgICAgICBpZiAoIW5ld1RvcCkgewotICAgICAgICAgICAgbV9wZW5kaW5n RXhpdEZ1bGxzY3JlZW4gPSB0cnVlOwogICAgICAgICAgICAgSU5GT19MT0coaWRlbnRpZmllciwg InRhc2sgLSBFbXB0eSBmdWxsc2NyZWVuIHN0YWNrOyBleGl0aW5nLiIpOwogICAgICAgICAgICAg cGFnZS0+Y2hyb21lKCkuY2xpZW50KCkuZXhpdEZ1bGxTY3JlZW5Gb3JFbGVtZW50KGZ1bGxzY3Jl ZW5FbGVtZW50LmdldCgpKTsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQogCiAgICAg ICAgIC8vIE90aGVyd2lzZSwgbm90aWZ5IHRoZSBjaHJvbWUgb2YgdGhlIG5ldyBmdWxsIHNjcmVl biBlbGVtZW50LgorICAgICAgICBtX3BlbmRpbmdFeGl0RnVsbHNjcmVlbiA9IGZhbHNlOworCiAg ICAgICAgIElORk9fTE9HKGlkZW50aWZpZXIsICJ0YXNrIC0gTmV3IHRvcCBvZiBmdWxsc2NyZWVu IHN0YWNrLiIpOwogICAgICAgICBwYWdlLT5jaHJvbWUoKS5jbGllbnQoKS5lbnRlckZ1bGxTY3Jl ZW5Gb3JFbGVtZW50KCpuZXdUb3ApOwogICAgIH0pOwpAQCAtNjI4LDYgKzYzNyw4IEBAIHZvaWQg RnVsbHNjcmVlbk1hbmFnZXI6OnNldEFuaW1hdGluZ0Z1bGxzY3JlZW4oYm9vbCBmbGFnKQogICAg ICAgICByZXR1cm47CiAgICAgbV9pc0FuaW1hdGluZ0Z1bGxzY3JlZW4gPSBmbGFnOwogCisgICAg SU5GT19MT0coTE9HSURFTlRJRklFUiwgZmxhZyk7CisKICAgICBpZiAobV9mdWxsc2NyZWVuRWxl bWVudCAmJiBtX2Z1bGxzY3JlZW5FbGVtZW50LT5pc0Rlc2NlbmRhbnRPZihkb2N1bWVudCgpKSkg ewogICAgICAgICBtX2Z1bGxzY3JlZW5FbGVtZW50LT5pbnZhbGlkYXRlU3R5bGVGb3JTdWJ0cmVl KCk7CiAgICAgICAgIHNjaGVkdWxlRnVsbFN0eWxlUmVidWlsZCgpOwpAQCAtNjQzLDYgKzY1NCw5 IEBAIHZvaWQgRnVsbHNjcmVlbk1hbmFnZXI6OnNldEZ1bGxzY3JlZW5Db250cm9sc0hpZGRlbihi b29sIGZsYWcpCiB7CiAgICAgaWYgKG1fYXJlRnVsbHNjcmVlbkNvbnRyb2xzSGlkZGVuID09IGZs YWcpCiAgICAgICAgIHJldHVybjsKKworICAgIElORk9fTE9HKExPR0lERU5USUZJRVIsIGZsYWcp OworCiAgICAgbV9hcmVGdWxsc2NyZWVuQ29udHJvbHNIaWRkZW4gPSBmbGFnOwogCiAgICAgaWYg KG1fZnVsbHNjcmVlbkVsZW1lbnQgJiYgbV9mdWxsc2NyZWVuRWxlbWVudC0+aXNEZXNjZW5kYW50 T2YoZG9jdW1lbnQoKSkpIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lv cy9mdWxsc2NyZWVuL1dLRnVsbFNjcmVlbldpbmRvd0NvbnRyb2xsZXJJT1MubW0gYi9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9pb3MvZnVsbHNjcmVlbi9XS0Z1bGxTY3JlZW5XaW5kb3dDb250cm9s bGVySU9TLm1tCmluZGV4IGUwMDY1Y2NlMTNjYzQyZjQzODJkNjQ3ZTlkNzk3YjIzN2U4NDM3OTEu LmIzMjkwYmJjOGYzMDNjOWYyOWMyYWRlZDI4MTZjYTQwM2Q5MmJjNTUgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9mdWxsc2NyZWVuL1dLRnVsbFNjcmVlbldpbmRvd0Nv bnRyb2xsZXJJT1MubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL2Z1bGxzY3Jl ZW4vV0tGdWxsU2NyZWVuV2luZG93Q29udHJvbGxlcklPUy5tbQpAQCAtNzQ0LDYgKzc0NCw5IEBA IC0gKHZvaWQpcmVxdWVzdEV4aXRGdWxsU2NyZWVuCiAKIC0gKHZvaWQpZXhpdEZ1bGxTY3JlZW4K IHsKKyAgICBpZiAoX2Z1bGxTY3JlZW5TdGF0ZSA9PSBXZWJLaXQ6Ok5vdEluRnVsbFNjcmVlbikK KyAgICAgICAgcmV0dXJuOworCiAgICAgaWYgKF9mdWxsU2NyZWVuU3RhdGUgPCBXZWJLaXQ6Oklu RnVsbFNjcmVlbikgewogICAgICAgICBfZXhpdFJlcXVlc3RlZCA9IFlFUzsKICAgICAgICAgcmV0 dXJuOwpAQCAtNzk1LDEyICs3OTgsOCBAQCAtICh2b2lkKWJlZ2FuRXhpdEZ1bGxTY3JlZW5XaXRo SW5pdGlhbEZyYW1lOihDR1JlY3QpaW5pdGlhbEZyYW1lIGZpbmFsRnJhbWU6KENHUgogI2VuZGlm CiB9CiAKLS0gKHZvaWQpX2NvbXBsZXRlZEV4aXRGdWxsU2NyZWVuCistICh2b2lkKV9yZWluc2Vy dFdlYlZpZXdVbmRlclBsYWNlaG9sZGVyCiB7Ci0gICAgaWYgKF9mdWxsU2NyZWVuU3RhdGUgIT0g V2ViS2l0OjpFeGl0aW5nRnVsbFNjcmVlbikKLSAgICAgICAgcmV0dXJuOwotICAgIF9mdWxsU2Ny ZWVuU3RhdGUgPSBXZWJLaXQ6Ok5vdEluRnVsbFNjcmVlbjsKLQogICAgIFtDQVRyYW5zYWN0aW9u IGJlZ2luXTsKICAgICBbQ0FUcmFuc2FjdGlvbiBzZXREaXNhYmxlQWN0aW9uczpZRVNdOwogCkBA IC04MjAsNiArODE5LDE1IEBAIC0gKHZvaWQpX2NvbXBsZXRlZEV4aXRGdWxsU2NyZWVuCiAgICAg W3dlYlZpZXcgbGF5b3V0SWZOZWVkZWRdOwogCiAgICAgW0NBVHJhbnNhY3Rpb24gY29tbWl0XTsK K30KKworLSAodm9pZClfY29tcGxldGVkRXhpdEZ1bGxTY3JlZW4KK3sKKyAgICBpZiAoX2Z1bGxT Y3JlZW5TdGF0ZSAhPSBXZWJLaXQ6OkV4aXRpbmdGdWxsU2NyZWVuKQorICAgICAgICByZXR1cm47 CisgICAgX2Z1bGxTY3JlZW5TdGF0ZSA9IFdlYktpdDo6Tm90SW5GdWxsU2NyZWVuOworCisgICAg W3NlbGYgX3JlaW5zZXJ0V2ViVmlld1VuZGVyUGxhY2Vob2xkZXJdOwogCiAgICAgaWYgKGF1dG8q IG1hbmFnZXIgPSBzZWxmLl9tYW5hZ2VyKSB7CiAgICAgICAgIG1hbmFnZXItPnJlc3RvcmVTY3Jv bGxQb3NpdGlvbigpOwpAQCAtOTg3LDE5ICs5OTUsMzkgQEAgLSAodm9pZClfZXhpdEZ1bGxzY3Jl ZW5JbW1lZGlhdGVseQogICAgICAgICByZXR1cm47CiAKICAgICBfc2hvdWxkUmV0dXJuVG9GdWxs c2NyZWVuRnJvbVBpY3R1cmVJblBpY3R1cmUgPSBmYWxzZTsKKyAgICBfZXhpdFJlcXVlc3RlZCA9 IE5POworICAgIF9leGl0aW5nRnVsbFNjcmVlbiA9IE5POworICAgIF9mdWxsU2NyZWVuU3RhdGUg PSBXZWJLaXQ6Ok5vdEluRnVsbFNjcmVlbjsKKyAgICBfc2hvdWxkUmV0dXJuVG9GdWxsc2NyZWVu RnJvbVBpY3R1cmVJblBpY3R1cmUgPSBmYWxzZTsKIAotICAgIGF1dG8qIG1hbmFnZXIgPSBzZWxm Ll9tYW5hZ2VyOwotICAgIGlmIChtYW5hZ2VyKQorICAgIGF1dG8qIHBhZ2UgPSBbc2VsZi5fd2Vi VmlldyBfcGFnZV0uZ2V0KCk7CisgICAgaWYgKHBhZ2UpCisgICAgICAgIHBhZ2UtPnNldFN1cHBy ZXNzVmlzaWJpbGl0eVVwZGF0ZXModHJ1ZSk7CisKKyAgICBbc2VsZiBfcmVpbnNlcnRXZWJWaWV3 VW5kZXJQbGFjZWhvbGRlcl07CisKKyAgICBpZiAoYXV0byogbWFuYWdlciA9IHNlbGYuX21hbmFn ZXIpIHsKICAgICAgICAgbWFuYWdlci0+cmVxdWVzdEV4aXRGdWxsU2NyZWVuKCk7Ci0gICAgW3Nl bGYgZXhpdEZ1bGxTY3JlZW5dOwotICAgIF9mdWxsU2NyZWVuU3RhdGUgPSBXZWJLaXQ6OkV4aXRp bmdGdWxsU2NyZWVuOwotICAgIFtzZWxmIF9jb21wbGV0ZWRFeGl0RnVsbFNjcmVlbl07Ci0gICAg UmV0YWluUHRyPFdLV2ViVmlldz4gd2ViVmlldyA9IHNlbGYuX3dlYlZpZXc7Ci0gICAgX3dlYlZp ZXdQbGFjZWhvbGRlci5nZXQoKS5wYXJlbnQgPSBuaWw7Ci0gICAgV2ViS2l0OjpyZXBsYWNlVmll d1dpdGhWaWV3KF93ZWJWaWV3UGxhY2Vob2xkZXIuZ2V0KCksIHdlYlZpZXcuZ2V0KCkpOwotICAg IGlmIChhdXRvIHBhZ2UgPSBbd2ViVmlldyBfcGFnZV0pCi0gICAgICAgIHBhZ2UtPnNldFN1cHBy ZXNzVmlzaWJpbGl0eVVwZGF0ZXMoZmFsc2UpOworICAgICAgICBtYW5hZ2VyLT5zZXRBbmltYXRp bmdGdWxsU2NyZWVuKHRydWUpOworICAgICAgICBtYW5hZ2VyLT53aWxsRXhpdEZ1bGxTY3JlZW4o KTsKKyAgICAgICAgbWFuYWdlci0+cmVzdG9yZVNjcm9sbFBvc2l0aW9uKCk7CisgICAgICAgIG1h bmFnZXItPnNldEFuaW1hdGluZ0Z1bGxTY3JlZW4oZmFsc2UpOworICAgICAgICBtYW5hZ2VyLT5k aWRFeGl0RnVsbFNjcmVlbigpOworICAgIH0KKworICAgIFtfd2ViVmlld1BsYWNlaG9sZGVyIHJl bW92ZUZyb21TdXBlcnZpZXddOwogICAgIF93ZWJWaWV3UGxhY2Vob2xkZXIgPSBuaWw7CisgICAg W193aW5kb3cgc2V0SGlkZGVuOllFU107CisgICAgX3dpbmRvdyA9IG5pbDsKKworICAgIGlmIChw YWdlKSB7CisgICAgICAgIHBhZ2UtPnNldFN1cHByZXNzVmlzaWJpbGl0eVVwZGF0ZXMoZmFsc2Up OworICAgICAgICBwYWdlLT5zZXROZWVkc0RPTVdpbmRvd1Jlc2l6ZUV2ZW50KCk7CisgICAgfQor CisgICAgW19mdWxsc2NyZWVuVmlld0NvbnRyb2xsZXIgc2V0UHJlZmVyc1N0YXR1c0JhckhpZGRl bjpZRVNdOworICAgIFtfZnVsbHNjcmVlblZpZXdDb250cm9sbGVyIGludmFsaWRhdGVdOworICAg IF9mdWxsc2NyZWVuVmlld0NvbnRyb2xsZXIgPSBuaWw7CiB9CiAKIC0gKHZvaWQpX2ludmFsaWRh dGVFVk9yZ2FuaXphdGlvbk5hbWUK 458885 2022-05-05 10:14:57 -0700 2022-05-06 09:10:19 -0700 Patch for landing bug-239744-20220505101456.patch text/plain 10114 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMjkzNjMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzhkNmRmOTM5N2Y5NTcx YTU2OTU4ZmUxZTUwNmZlZjc5MzRlZTNmZC4uZjNmMGE5NzFkNDEzNjc1NzU3ODI3ZjNhMzE0NDQ2 ZTY2MjE3Yzk5YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDIyLTA0LTI1ICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIFtpT1NdIEluZmluaXRlIHJl Y3Vyc2lvbiBhdCAtW1dLRnVsbFNjcmVlbldpbmRvd0NvbnRyb2xsZXIgX2V4aXRGdWxsc2NyZWVu SW1tZWRpYXRlbHldCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMzk3NDQKKyAgICAgICAgPHJkYXI6Ly83NDIwMTk2ND4KKworICAgICAgICBSZXZpZXdl ZCBieSBFcmljIENhcmxzb24uCisKKyAgICAgICAgRXZlbiBhZnRlciBmdWxsc2NyZWVuIGlzIGNv cnJlY3RseSB0b3JuIGRvd24gZHVyaW5nIGFuIGltbWVkaWF0ZSBleGl0LCBmdWxsc2NyZWVuIGNh biBuZXZlciBhZ2FpbgorICAgICAgICBiZSBlbnRlcmVkIGZvciB0aGUgbGlmZXRpbWUgb2YgdGhl IHBhZ2UuIFRoaXMgaXMgZHVlIHRvIHRoZSBpdmFyIG1fcGVuZGluZ0V4aXRGdWxsc2NyZWVuIGJl aW5nIHNldAorICAgICAgICB0byB0cnVlIHdpdGggbm8gb3Bwb3J0dW5pdHkgZm9yIHRoYXQgc3Rh dGUgdG8gYmUgY2xlYXJlZC4gVGhpcyBvY2N1cnMgYmVjYXVzZSB0aGUgY2FsbGJhY2tzIGZvcgor ICAgICAgICBleGl0aW5nIGZ1bGxzY3JlZW4gYXJlIHBlcmZvcm1lZCBiZWZvcmUgdGhlIGxhbWJk YSBmb3JtIEZ1bGxzY3JlZW5NYW5hZ2VyOjpleGl0RnVsbHNjcmVlbigpIGlzCisgICAgICAgIGNh bGxlZC4KKworICAgICAgICBTZXQgbV9wZW5kaW5nRXhpdEZ1bGxzY3JlZW4gaW5zaWRlIGV4aXRG dWxsc2NyZWVuKCksIHJhdGhlciB0aGFuIHRoZSBsYW1iZGEsIGFuZCBjbGVhciBpdCBleHBsaWNp dGx5CisgICAgICAgIGluIHRoZSBjYXNlcyB3aGVyZSBmdWxsc2NyZWVuIGV4aXRpbmcgaXMgbm90 IGFjdHVhbGx5IG5lY2Vzc2FyeS4KKworICAgICAgICBUaGUgbW9jayBiZWhhdmlvciBvZiBGdWxs c2NyZWVuIGluc2lkZSBEdW1wUmVuZGVyVHJlZSBhbmQgV2ViS2l0VGVzdFJ1bm5lciBhcmUgbm90 IGFibGUgdG8gZXhlcmNpc2UKKyAgICAgICAgdGhpcyBzYW1lIHBhdGguIFRyYWNrIGltcHJvdmVt ZW50cyB0byB0aGlzIG1vY2sgaW4gYnVnICMyMzk3NDcuCisKKyAgICAgICAgKiBkb20vRnVsbHNj cmVlbk1hbmFnZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnVsbHNjcmVlbk1hbmFnZXI6OnJl cXVlc3RGdWxsc2NyZWVuRm9yRWxlbWVudCk6CisgICAgICAgIChXZWJDb3JlOjpGdWxsc2NyZWVu TWFuYWdlcjo6ZXhpdEZ1bGxzY3JlZW4pOgorICAgICAgICAoV2ViQ29yZTo6RnVsbHNjcmVlbk1h bmFnZXI6OnNldEFuaW1hdGluZ0Z1bGxzY3JlZW4pOgorICAgICAgICAoV2ViQ29yZTo6RnVsbHNj cmVlbk1hbmFnZXI6OnNldEZ1bGxzY3JlZW5Db250cm9sc0hpZGRlbik6CisKIDIwMjItMDQtMDUg IEplciBOb2JsZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CiAKICAgICAgICAgW1JlZmFjdG9yXSBJ bnRyb2R1Y2UgYSBTZWVrQ29tcGxldGlvbiBjYWxsYmFjayBmb3IgTWVkaWFQbGF5ZXIgc2VlayBj b21tYW5kcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi S2l0L0NoYW5nZUxvZwppbmRleCA4OTgxYzY3YjA2NDA1NGY1MDIzYjNhMzgxOTM3ZTM1N2ZiZmNh MzliLi5lMmRhY2UwMGU5Njk3ODlmZWE4ZWE4OGVlNjM2MTA5MmI0MjZkOTE1IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpA QCAtMSwzICsxLDI5IEBACisyMDIyLTA0LTI1ICBKZXIgTm9ibGUgIDxqZXIubm9ibGVAYXBwbGUu Y29tPgorCisgICAgICAgIFtpT1NdIEluZmluaXRlIHJlY3Vyc2lvbiBhdCAtW1dLRnVsbFNjcmVl bldpbmRvd0NvbnRyb2xsZXIgX2V4aXRGdWxsc2NyZWVuSW1tZWRpYXRlbHldCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzk3NDQKKyAgICAgICAgPHJk YXI6Ly83NDIwMTk2ND4KKworICAgICAgICBSZXZpZXdlZCBieSBFcmljIENhcmxzb24uCisKKyAg ICAgICAgV2hlbiBleGl0aW5nIGZ1bGxzY3JlZW4gaW1tZWRpYXRlbHksIHdlIHRyaWdnZXIgdGhl IGNvcnJlY3Qgc3RhdGUgdHJhbnNpdGlvbiBieSBjYWxsaW5nCisgICAgICAgIC1bc2VsZiBleGl0 RnVsbFNjcmVlbl0uIEhvd2V2ZXIsIHdoZW4gbm8gZnVsbHNjcmVlbiBtYW5hZ2VyIGV4aXN0cyAo YXMgbWF5IGhhcHBlbiBkdXJpbmcKKyAgICAgICAgbmF2aWdhdGlvbiksIC1leGl0RnVsbHNjcmVl biBtYXkgaXRzZWxmIGNhbGwgLV9leGl0RnVsbHNjcmVlbkltbWVkaWF0ZWx5LCB3aGljaCBjYXVz ZXMgYW4KKyAgICAgICAgaW5maW5pdGUgcmVjdXJzaW9uIGFuZCBzdGFjayBvdmVyZmxvdy4KKwor ICAgICAgICBVbnJvbGwgdGhlIGltcGxlbWVudGF0aW9uIGJ5IHBlcmZvcm1pbmcgYWxsIHRoZSBz YW1lIHBpZWNlcyBhcyB3b3VsZCBoYXZlIGJlZW4gZG9uZSBieQorICAgICAgICAtZXhpdEZ1bGxT Y3JlZW4sIGJ1dCBpbmxpbmUuIFJlZmFjdG9yIG91dCBjb21tb24gYmVoYXZpb3IgaW50byAtX3Jl aW5zZXJ0V2ViVmlld1VuZGVyUGxhY2Vob2xkZXIsCisgICAgICAgIGFuZCBjYWxsIHRoYXQgYm90 aCBmcm9tIC1fZXhpdEZ1bGxzY3JlZW5JbW1lZGlhdGVseSBhbmQgX2NvbXBsZXRlZEV4aXRGdWxs U2NyZWVuLgorCisgICAgICAgIFVuZm9ydHVuYXRlbHksIG5vIEFQSSB0ZXN0cyBhcmUgcG9zc2li bGUgaGVyZSBiZWNhdXNlIFRlc3RXZWJLaXRBUEkgaXMgbm90IGFuIGFjdHVhbCBpT1MgVUkKKyAg ICAgICAgYXBwbGljYXRpb24uCisKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL2Z1bGxzY3JlZW4v V0tGdWxsU2NyZWVuV2luZG93Q29udHJvbGxlcklPUy5tbToKKyAgICAgICAgKC1bV0tGdWxsU2Ny ZWVuV2luZG93Q29udHJvbGxlciBleGl0RnVsbFNjcmVlbl0pOgorICAgICAgICAoLVtXS0Z1bGxT Y3JlZW5XaW5kb3dDb250cm9sbGVyIF9yZWluc2VydFdlYlZpZXdVbmRlclBsYWNlaG9sZGVyXSk6 CisgICAgICAgICgtW1dLRnVsbFNjcmVlbldpbmRvd0NvbnRyb2xsZXIgX2NvbXBsZXRlZEV4aXRG dWxsU2NyZWVuXSk6CisgICAgICAgICgtW1dLRnVsbFNjcmVlbldpbmRvd0NvbnRyb2xsZXIgX2V4 aXRGdWxsc2NyZWVuSW1tZWRpYXRlbHldKToKKwogMjAyMi0wNC0yOSAgQ29tbWl0IFF1ZXVlICA8 Y29tbWl0LXF1ZXVlQHdlYmtpdC5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcmV2ZXJ0aW5n IHIyOTM1OTEuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRnVsbHNjcmVlbk1hbmFn ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL0Z1bGxzY3JlZW5NYW5hZ2VyLmNwcAppbmRleCAw ZTliYjk0NDFjMzdkZjUzZDQ3MTgzOGNjYzFhYWRjYjYzNzc4YmVmLi45MDUzZWJhYjYxNjE4ZDU5 OTZmY2U4NDY0OTdhMmNiMDhmNTE0MTIxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20v RnVsbHNjcmVlbk1hbmFnZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9GdWxsc2NyZWVu TWFuYWdlci5jcHAKQEAgLTExMyw2ICsxMTMsOCBAQCB2b2lkIEZ1bGxzY3JlZW5NYW5hZ2VyOjpy ZXF1ZXN0RnVsbHNjcmVlbkZvckVsZW1lbnQoUmVmPEVsZW1lbnQ+JiYgZWxlbWVudCwgRnVsbAog ICAgICAgICB9CiAgICAgfQogCisgICAgSU5GT19MT0coTE9HSURFTlRJRklFUik7CisKICAgICBt X3BlbmRpbmdGdWxsc2NyZWVuRWxlbWVudCA9IFJlZlB0ciB7IGVsZW1lbnQucHRyKCkgfTsKIAog ICAgIG1fZG9jdW1lbnQuZXZlbnRMb29wKCkucXVldWVUYXNrKFRhc2tTb3VyY2U6Ok1lZGlhRWxl bWVudCwgW3RoaXMsIHdlYWtUaGlzID0gV2Vha1B0ciB7ICp0aGlzIH0sIGVsZW1lbnQgPSBXVEZN b3ZlKGVsZW1lbnQpLCBjaGVja1R5cGUsIGhhc0tleWJvYXJkQWNjZXNzLCBmYWlsZWRQcmVmbGln aHRzLCBpZGVudGlmaWVyID0gTE9HSURFTlRJRklFUl0gKCkgbXV0YWJsZSB7CkBAIC0yODgsNiAr MjkwLDggQEAgdm9pZCBGdWxsc2NyZWVuTWFuYWdlcjo6ZXhpdEZ1bGxzY3JlZW4oKQogICAgICAg ICByZXR1cm47CiAgICAgfQogCisgICAgSU5GT19MT0coTE9HSURFTlRJRklFUik7CisKICAgICAv LyAzLiBMZXQgZGVzY2VuZGFudHMgYmUgYWxsIHRoZSBkb2MncyBkZXNjZW5kYW50IGJyb3dzaW5n IGNvbnRleHQncyBkb2N1bWVudHMgd2l0aCBhIG5vbi1lbXB0eSBmdWxsc2NyZWVuCiAgICAgLy8g ZWxlbWVudCBzdGFjayAoaWYgYW55KSwgb3JkZXJlZCBzbyB0aGF0IHRoZSBjaGlsZCBvZiB0aGUg ZG9jIGlzIGxhc3QgYW5kIHRoZSBkb2N1bWVudCBmdXJ0aGVzdAogICAgIC8vIGF3YXkgZnJvbSB0 aGUgZG9jIGlzIGZpcnN0LgpAQCAtMzMxLDYgKzMzNSw4IEBAIHZvaWQgRnVsbHNjcmVlbk1hbmFn ZXI6OmV4aXRGdWxsc2NyZWVuKCkKICAgICAgICAgY3VycmVudERvYyA9IG51bGxwdHI7CiAgICAg fQogCisgICAgbV9wZW5kaW5nRXhpdEZ1bGxzY3JlZW4gPSB0cnVlOworCiAgICAgLy8gNi4gUmV0 dXJuLCBhbmQgcnVuIHRoZSByZW1haW5pbmcgc3RlcHMgYXN5bmNocm9ub3VzbHkuCiAgICAgLy8g Ny4gT3B0aW9uYWxseSwgcGVyZm9ybSBzb21lIGFuaW1hdGlvbi4KICAgICBtX2RvY3VtZW50LmV2 ZW50TG9vcCgpLnF1ZXVlVGFzayhUYXNrU291cmNlOjpNZWRpYUVsZW1lbnQsIFt0aGlzLCB3ZWFr VGhpcyA9IFdlYWtQdHIgeyAqdGhpcyB9LCBuZXdUb3AgPSBSZWZQdHIgeyBuZXdUb3AgfSwgZnVs bHNjcmVlbkVsZW1lbnQgPSBtX2Z1bGxzY3JlZW5FbGVtZW50LCBpZGVudGlmaWVyID0gTE9HSURF TlRJRklFUl0gewpAQCAtMzM5LDYgKzM0NSw3IEBAIHZvaWQgRnVsbHNjcmVlbk1hbmFnZXI6OmV4 aXRGdWxsc2NyZWVuKCkKIAogICAgICAgICBhdXRvKiBwYWdlID0gdGhpcy0+cGFnZSgpOwogICAg ICAgICBpZiAoIXBhZ2UpIHsKKyAgICAgICAgICAgIG1fcGVuZGluZ0V4aXRGdWxsc2NyZWVuID0g ZmFsc2U7CiAgICAgICAgICAgICBFUlJPUl9MT0coaWRlbnRpZmllciwgInRhc2sgLSBEb2N1bWVu dCBub3QgaW4gcGFnZTsgYmFpbGluZy4iKTsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAg fQpAQCAtMzQ5LDE5ICszNTYsMjEgQEAgdm9pZCBGdWxsc2NyZWVuTWFuYWdlcjo6ZXhpdEZ1bGxz Y3JlZW4oKQogICAgICAgICBpZiAoIWZ1bGxzY3JlZW5FbGVtZW50ICYmIG1fcGVuZGluZ0Z1bGxz Y3JlZW5FbGVtZW50KSB7CiAgICAgICAgICAgICBJTkZPX0xPRyhpZGVudGlmaWVyLCAidGFzayAt IENhbmNlbGxpbmcgcGVuZGluZyBmdWxsc2NyZWVuIHJlcXVlc3QuIik7CiAgICAgICAgICAgICBt X3BlbmRpbmdGdWxsc2NyZWVuRWxlbWVudCA9IG51bGxwdHI7CisgICAgICAgICAgICBtX3BlbmRp bmdFeGl0RnVsbHNjcmVlbiA9IGZhbHNlOwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9 CiAKICAgICAgICAgLy8gT25seSBleGl0IG91dCBvZiBmdWxsIHNjcmVlbiB3aW5kb3cgbW9kZSBp ZiB0aGVyZSBhcmUgbm8gcmVtYWluaW5nIGVsZW1lbnRzIGluIHRoZQogICAgICAgICAvLyBmdWxs IHNjcmVlbiBzdGFjay4KICAgICAgICAgaWYgKCFuZXdUb3ApIHsKLSAgICAgICAgICAgIG1fcGVu ZGluZ0V4aXRGdWxsc2NyZWVuID0gdHJ1ZTsKICAgICAgICAgICAgIElORk9fTE9HKGlkZW50aWZp ZXIsICJ0YXNrIC0gRW1wdHkgZnVsbHNjcmVlbiBzdGFjazsgZXhpdGluZy4iKTsKICAgICAgICAg ICAgIHBhZ2UtPmNocm9tZSgpLmNsaWVudCgpLmV4aXRGdWxsU2NyZWVuRm9yRWxlbWVudChmdWxs c2NyZWVuRWxlbWVudC5nZXQoKSk7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KIAog ICAgICAgICAvLyBPdGhlcndpc2UsIG5vdGlmeSB0aGUgY2hyb21lIG9mIHRoZSBuZXcgZnVsbCBz Y3JlZW4gZWxlbWVudC4KKyAgICAgICAgbV9wZW5kaW5nRXhpdEZ1bGxzY3JlZW4gPSBmYWxzZTsK KwogICAgICAgICBJTkZPX0xPRyhpZGVudGlmaWVyLCAidGFzayAtIE5ldyB0b3Agb2YgZnVsbHNj cmVlbiBzdGFjay4iKTsKICAgICAgICAgcGFnZS0+Y2hyb21lKCkuY2xpZW50KCkuZW50ZXJGdWxs U2NyZWVuRm9yRWxlbWVudCgqbmV3VG9wKTsKICAgICB9KTsKQEAgLTYyOCw2ICs2MzcsOCBAQCB2 b2lkIEZ1bGxzY3JlZW5NYW5hZ2VyOjpzZXRBbmltYXRpbmdGdWxsc2NyZWVuKGJvb2wgZmxhZykK ICAgICAgICAgcmV0dXJuOwogICAgIG1faXNBbmltYXRpbmdGdWxsc2NyZWVuID0gZmxhZzsKIAor ICAgIElORk9fTE9HKExPR0lERU5USUZJRVIsIGZsYWcpOworCiAgICAgaWYgKG1fZnVsbHNjcmVl bkVsZW1lbnQgJiYgbV9mdWxsc2NyZWVuRWxlbWVudC0+aXNEZXNjZW5kYW50T2YoZG9jdW1lbnQo KSkpIHsKICAgICAgICAgbV9mdWxsc2NyZWVuRWxlbWVudC0+aW52YWxpZGF0ZVN0eWxlRm9yU3Vi dHJlZSgpOwogICAgICAgICBzY2hlZHVsZUZ1bGxTdHlsZVJlYnVpbGQoKTsKQEAgLTY0Myw2ICs2 NTQsOSBAQCB2b2lkIEZ1bGxzY3JlZW5NYW5hZ2VyOjpzZXRGdWxsc2NyZWVuQ29udHJvbHNIaWRk ZW4oYm9vbCBmbGFnKQogewogICAgIGlmIChtX2FyZUZ1bGxzY3JlZW5Db250cm9sc0hpZGRlbiA9 PSBmbGFnKQogICAgICAgICByZXR1cm47CisKKyAgICBJTkZPX0xPRyhMT0dJREVOVElGSUVSLCBm bGFnKTsKKwogICAgIG1fYXJlRnVsbHNjcmVlbkNvbnRyb2xzSGlkZGVuID0gZmxhZzsKIAogICAg IGlmIChtX2Z1bGxzY3JlZW5FbGVtZW50ICYmIG1fZnVsbHNjcmVlbkVsZW1lbnQtPmlzRGVzY2Vu ZGFudE9mKGRvY3VtZW50KCkpKSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9pb3MvZnVsbHNjcmVlbi9XS0Z1bGxTY3JlZW5XaW5kb3dDb250cm9sbGVySU9TLm1tIGIvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL2Z1bGxzY3JlZW4vV0tGdWxsU2NyZWVuV2luZG93Q29u dHJvbGxlcklPUy5tbQppbmRleCBlMDA2NWNjZTEzY2M0MmY0MzgyZDY0N2U5ZDc5N2IyMzdlODQz NzkxLi5iMzI5MGJiYzhmMzAzYzlmMjljMmFkZWQyODE2Y2E0MDNkOTJiYzU1IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvZnVsbHNjcmVlbi9XS0Z1bGxTY3JlZW5XaW5k b3dDb250cm9sbGVySU9TLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9mdWxs c2NyZWVuL1dLRnVsbFNjcmVlbldpbmRvd0NvbnRyb2xsZXJJT1MubW0KQEAgLTc0NCw2ICs3NDQs OSBAQCAtICh2b2lkKXJlcXVlc3RFeGl0RnVsbFNjcmVlbgogCiAtICh2b2lkKWV4aXRGdWxsU2Ny ZWVuCiB7CisgICAgaWYgKF9mdWxsU2NyZWVuU3RhdGUgPT0gV2ViS2l0OjpOb3RJbkZ1bGxTY3Jl ZW4pCisgICAgICAgIHJldHVybjsKKwogICAgIGlmIChfZnVsbFNjcmVlblN0YXRlIDwgV2ViS2l0 OjpJbkZ1bGxTY3JlZW4pIHsKICAgICAgICAgX2V4aXRSZXF1ZXN0ZWQgPSBZRVM7CiAgICAgICAg IHJldHVybjsKQEAgLTc5NSwxMiArNzk4LDggQEAgLSAodm9pZCliZWdhbkV4aXRGdWxsU2NyZWVu V2l0aEluaXRpYWxGcmFtZTooQ0dSZWN0KWluaXRpYWxGcmFtZSBmaW5hbEZyYW1lOihDR1IKICNl bmRpZgogfQogCi0tICh2b2lkKV9jb21wbGV0ZWRFeGl0RnVsbFNjcmVlbgorLSAodm9pZClfcmVp bnNlcnRXZWJWaWV3VW5kZXJQbGFjZWhvbGRlcgogewotICAgIGlmIChfZnVsbFNjcmVlblN0YXRl ICE9IFdlYktpdDo6RXhpdGluZ0Z1bGxTY3JlZW4pCi0gICAgICAgIHJldHVybjsKLSAgICBfZnVs bFNjcmVlblN0YXRlID0gV2ViS2l0OjpOb3RJbkZ1bGxTY3JlZW47Ci0KICAgICBbQ0FUcmFuc2Fj dGlvbiBiZWdpbl07CiAgICAgW0NBVHJhbnNhY3Rpb24gc2V0RGlzYWJsZUFjdGlvbnM6WUVTXTsK IApAQCAtODIwLDYgKzgxOSwxNSBAQCAtICh2b2lkKV9jb21wbGV0ZWRFeGl0RnVsbFNjcmVlbgog ICAgIFt3ZWJWaWV3IGxheW91dElmTmVlZGVkXTsKIAogICAgIFtDQVRyYW5zYWN0aW9uIGNvbW1p dF07Cit9CisKKy0gKHZvaWQpX2NvbXBsZXRlZEV4aXRGdWxsU2NyZWVuCit7CisgICAgaWYgKF9m dWxsU2NyZWVuU3RhdGUgIT0gV2ViS2l0OjpFeGl0aW5nRnVsbFNjcmVlbikKKyAgICAgICAgcmV0 dXJuOworICAgIF9mdWxsU2NyZWVuU3RhdGUgPSBXZWJLaXQ6Ok5vdEluRnVsbFNjcmVlbjsKKwor ICAgIFtzZWxmIF9yZWluc2VydFdlYlZpZXdVbmRlclBsYWNlaG9sZGVyXTsKIAogICAgIGlmIChh dXRvKiBtYW5hZ2VyID0gc2VsZi5fbWFuYWdlcikgewogICAgICAgICBtYW5hZ2VyLT5yZXN0b3Jl U2Nyb2xsUG9zaXRpb24oKTsKQEAgLTk4NywxOSArOTk1LDM5IEBAIC0gKHZvaWQpX2V4aXRGdWxs c2NyZWVuSW1tZWRpYXRlbHkKICAgICAgICAgcmV0dXJuOwogCiAgICAgX3Nob3VsZFJldHVyblRv RnVsbHNjcmVlbkZyb21QaWN0dXJlSW5QaWN0dXJlID0gZmFsc2U7CisgICAgX2V4aXRSZXF1ZXN0 ZWQgPSBOTzsKKyAgICBfZXhpdGluZ0Z1bGxTY3JlZW4gPSBOTzsKKyAgICBfZnVsbFNjcmVlblN0 YXRlID0gV2ViS2l0OjpOb3RJbkZ1bGxTY3JlZW47CisgICAgX3Nob3VsZFJldHVyblRvRnVsbHNj cmVlbkZyb21QaWN0dXJlSW5QaWN0dXJlID0gZmFsc2U7CiAKLSAgICBhdXRvKiBtYW5hZ2VyID0g c2VsZi5fbWFuYWdlcjsKLSAgICBpZiAobWFuYWdlcikKKyAgICBhdXRvKiBwYWdlID0gW3NlbGYu X3dlYlZpZXcgX3BhZ2VdLmdldCgpOworICAgIGlmIChwYWdlKQorICAgICAgICBwYWdlLT5zZXRT dXBwcmVzc1Zpc2liaWxpdHlVcGRhdGVzKHRydWUpOworCisgICAgW3NlbGYgX3JlaW5zZXJ0V2Vi Vmlld1VuZGVyUGxhY2Vob2xkZXJdOworCisgICAgaWYgKGF1dG8qIG1hbmFnZXIgPSBzZWxmLl9t YW5hZ2VyKSB7CiAgICAgICAgIG1hbmFnZXItPnJlcXVlc3RFeGl0RnVsbFNjcmVlbigpOwotICAg IFtzZWxmIGV4aXRGdWxsU2NyZWVuXTsKLSAgICBfZnVsbFNjcmVlblN0YXRlID0gV2ViS2l0OjpF eGl0aW5nRnVsbFNjcmVlbjsKLSAgICBbc2VsZiBfY29tcGxldGVkRXhpdEZ1bGxTY3JlZW5dOwot ICAgIFJldGFpblB0cjxXS1dlYlZpZXc+IHdlYlZpZXcgPSBzZWxmLl93ZWJWaWV3OwotICAgIF93 ZWJWaWV3UGxhY2Vob2xkZXIuZ2V0KCkucGFyZW50ID0gbmlsOwotICAgIFdlYktpdDo6cmVwbGFj ZVZpZXdXaXRoVmlldyhfd2ViVmlld1BsYWNlaG9sZGVyLmdldCgpLCB3ZWJWaWV3LmdldCgpKTsK LSAgICBpZiAoYXV0byBwYWdlID0gW3dlYlZpZXcgX3BhZ2VdKQotICAgICAgICBwYWdlLT5zZXRT dXBwcmVzc1Zpc2liaWxpdHlVcGRhdGVzKGZhbHNlKTsKKyAgICAgICAgbWFuYWdlci0+c2V0QW5p bWF0aW5nRnVsbFNjcmVlbih0cnVlKTsKKyAgICAgICAgbWFuYWdlci0+d2lsbEV4aXRGdWxsU2Ny ZWVuKCk7CisgICAgICAgIG1hbmFnZXItPnJlc3RvcmVTY3JvbGxQb3NpdGlvbigpOworICAgICAg ICBtYW5hZ2VyLT5zZXRBbmltYXRpbmdGdWxsU2NyZWVuKGZhbHNlKTsKKyAgICAgICAgbWFuYWdl ci0+ZGlkRXhpdEZ1bGxTY3JlZW4oKTsKKyAgICB9CisKKyAgICBbX3dlYlZpZXdQbGFjZWhvbGRl ciByZW1vdmVGcm9tU3VwZXJ2aWV3XTsKICAgICBfd2ViVmlld1BsYWNlaG9sZGVyID0gbmlsOwor ICAgIFtfd2luZG93IHNldEhpZGRlbjpZRVNdOworICAgIF93aW5kb3cgPSBuaWw7CisKKyAgICBp ZiAocGFnZSkgeworICAgICAgICBwYWdlLT5zZXRTdXBwcmVzc1Zpc2liaWxpdHlVcGRhdGVzKGZh bHNlKTsKKyAgICAgICAgcGFnZS0+c2V0TmVlZHNET01XaW5kb3dSZXNpemVFdmVudCgpOworICAg IH0KKworICAgIFtfZnVsbHNjcmVlblZpZXdDb250cm9sbGVyIHNldFByZWZlcnNTdGF0dXNCYXJI aWRkZW46WUVTXTsKKyAgICBbX2Z1bGxzY3JlZW5WaWV3Q29udHJvbGxlciBpbnZhbGlkYXRlXTsK KyAgICBfZnVsbHNjcmVlblZpZXdDb250cm9sbGVyID0gbmlsOwogfQogCiAtICh2b2lkKV9pbnZh bGlkYXRlRVZPcmdhbml6YXRpb25OYW1lCg==