236672 2022-02-15 14:59:17 -0800 Web Inspector: [Cocoa] Reentrancy in WebKit::WebInspectorUIProxy::open 2022-02-15 21:21:28 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 pangle pangle ews-watchlist hi inspector-bugzilla-changes joepeck webkit-bug-importer oldest_to_newest 1841961 0 pangle 2022-02-15 14:59:17 -0800 <rdar://88358696> 1841969 1 452097 pangle 2022-02-15 15:12:40 -0800 Created attachment 452097 Patch v1.0 1842000 2 452097 hi 2022-02-15 16:02:33 -0800 Comment on attachment 452097 Patch v1.0 View in context: https://bugs.webkit.org/attachment.cgi?id=452097&action=review rs=me > Source/WebKit/UIProcess/Inspector/mac/WebInspectorUIProxyMac.mm:406 > + WTFLogAlways("WebInspectorUIProxy::platformBringToFront - Inspected and inspector windows did not match while opening inspector. Falling back to detached inspector. Inspected page had window: %s", inspectedPage()->platformWindow() ? "YES" : "NO"); Do we _always_ want/need to log this? Also, maybe we should use the `Inspector` log channel (e.g. `LOG(Inspector, ...);`)? 1842015 3 452097 pangle 2022-02-15 16:22:24 -0800 Comment on attachment 452097 Patch v1.0 View in context: https://bugs.webkit.org/attachment.cgi?id=452097&action=review >> Source/WebKit/UIProcess/Inspector/mac/WebInspectorUIProxyMac.mm:406 >> + WTFLogAlways("WebInspectorUIProxy::platformBringToFront - Inspected and inspector windows did not match while opening inspector. Falling back to detached inspector. Inspected page had window: %s", inspectedPage()->platformWindow() ? "YES" : "NO"); > > Do we _always_ want/need to log this? > > Also, maybe we should use the `Inspector` log channel (e.g. `LOG(Inspector, ...);`)? I'd ideally like this logging to be present when someone files an issue with a sysdiagnose saying "hey, if I do these specific things in this order, Web Inspector detaches from the view into its own window". I can use `RELEASE_LOG` instead though, which allows us to target the Inspector channel. I think you are right that `*LOG(Inspector` is probably a better idea than `WTFLogAlways` here. Part of my thought process behind having the logging is so that we can hopefully better understand a report of "Web Inspector detached into a separate window" and get further clues as to the conditions that cause this in the first place. 1842030 4 452110 pangle 2022-02-15 16:48:30 -0800 Created attachment 452110 [fast-cq] Patch v1.1 - Use RELEASE_LOG for logging 1842123 5 ews-feeder 2022-02-15 21:21:21 -0800 Committed r289875 (247313@main): <https://commits.webkit.org/247313@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 452110. 452097 2022-02-15 15:12:40 -0800 2022-02-15 16:48:28 -0800 Patch v1.0 bug-236672-20220215151239.patch text/plain 4995 pangle U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5Nzc2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGE2OWZlZWU2ZWViOTQ5Yzlh NTRjZjE1MWRkNWEzZmJkMWVlOTY1MjAuLjE1NDVkMzNmMmJhZTEzZjAwOTMyNTNhOGFhMmFkNTQy NDVjM2Q1OWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYgQEAKKzIwMjItMDItMTUgIFBhdHJpY2sg QW5nbGUgIDxwYW5nbGVAYXBwbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IFtDb2Nv YV0gUmVlbnRyYW5jeSBpbiBXZWJLaXQ6OldlYkluc3BlY3RvclVJUHJveHk6Om9wZW4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNjY3MgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFNwZWN1bGF0aXZlIGZp eCBmb3Igbm9uLXJlcHJvZHVjaWJsZSByZWVudHJhbmN5LiBCZWNhdXNlIGBXZWJJbnNwZWN0b3JV SVByb3h5OjpvcGVuYCBjYWxscworICAgICAgICBgV2ViSW5zcGVjdG9yVUlQcm94eTo6cGxhdGZv cm1CcmluZ1RvRnJvbnRgLCB3aGljaCB1bmRlciBzb21lIGNvbmRpdGlvbnMgY2FuIGNhbGwgYFdl Ykluc3BlY3RvclVJUHJveHk6Om9wZW5gLAorICAgICAgICB0aGVyZSB3YXMgYW4gb3Bwb3J0dW5p dHkgZm9yIHJlY3Vyc3Npb24uIFRoaXMgYXBwZWFycyB0byBoYXBwZW4gd2hlbiB0aGUgd2luZG93 IG9mIHRoZSBpbnNwZWN0b3IgdmlldyBkb2VzIG5vdAorICAgICAgICBtYXRjaCB0aGUgd2luZG93 IG9mIHRoZSBpbnNwZWN0ZWQgd2ViIHZpZXcsIHdoaWNoIGluIGdlbmVyYWwgc2hvdWxkIG5vdCBi ZSBwb3NzaWJsZSBmb3IgYSBuZXdseSBvcGVuZWQKKyAgICAgICAgaW5zcGVjdG9yLiBNeSBzdXNw aWNpb24gaXMgdGhhdCB0aGUgd2ViIHZpZXcgaXMgbm90IGFjdHVhbGx5IGF0dGFjaGVkIHRvIGEg d2luZG93IGF0IHRoZSB0aW1lIHRoZSBpbnNwZWN0b3IgaXMKKyAgICAgICAgYmVpbmcgb3BlbmVk LiBUaGlzIHBhdGNoIGFkZHMgYSBmYWlsLXNhZmUgdGhhdCB3aWxsIGRldGFjaCB0aGUgaW5zcGVj dG9yIHZpZXcgaW50byBpdHMgb3duIHdpbmRvdyB3aGVuIHRoZXNlCisgICAgICAgIGNvbmRpdGlv bnMgYXJlIG1ldCB3aGlsZSB3ZSBhcmUgaW4gbWlkZGxlIG9mIG9wZW5pbmcgdGhlIGluc3BlY3Rv ciwgYW5kIGFsc28gYWRkcyBsb2dnaW5nIHRvIGluZGljYXRlIGlmIHRoZQorICAgICAgICBpbnNw ZWN0ZWQgd2ViIHZpZXcgd2FzIGFjdHVhbGx5IGluIGEgd2luZG93LiBUaGlzIHNob3VsZCBib3Ro IHByZXZlbnQgdGhlIGNyYXNoIGZyb20gdGhlIHJlLWVudHJ5IGFzIHdlbGwgYXMKKyAgICAgICAg cHJvdmlkZSBtb3JlIGNvbnRleHQgd2hlbiB0aGUgaXNzdWUgZG9lcyBvY2N1ci4KKworICAgICAg ICAqIFVJUHJvY2Vzcy9JbnNwZWN0b3IvV2ViSW5zcGVjdG9yVUlQcm94eS5jcHA6CisgICAgICAg IChXZWJLaXQ6OldlYkluc3BlY3RvclVJUHJveHk6Om9wZW4pOgorICAgICAgICAqIFVJUHJvY2Vz cy9JbnNwZWN0b3IvV2ViSW5zcGVjdG9yVUlQcm94eS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9J bnNwZWN0b3IvbWFjL1dlYkluc3BlY3RvclVJUHJveHlNYWMubW06CisgICAgICAgIChXZWJLaXQ6 OldlYkluc3BlY3RvclVJUHJveHk6OnBsYXRmb3JtQnJpbmdUb0Zyb250KToKKwogMjAyMi0wMi0x NCAgU2FpZCBBYm91LUhhbGxhd2EgIDxzYWlkQGFwcGxlLmNvbT4KIAogICAgICAgICBbR1BVIFBy b2Nlc3NdIFJlbW90ZUltYWdlQnVmZmVyUHJveHkgc2hvdWxkIG5vdCBzaW5rIGl0c2VsZiB0byBh biBJbWFnZSBvciBhIE5hdGl2ZUltYWdlIHRob3VnaCBpdHMgYmFja2VuZApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvSW5zcGVjdG9yL1dlYkluc3BlY3RvclVJUHJveHkuY3Bw IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvSW5zcGVjdG9yL1dlYkluc3BlY3RvclVJUHJveHku Y3BwCmluZGV4IDdkNzQ2YWY2MTIyZjhhODk0ZGE0YTcxMzZmYTdhMDY5NTZlNDRjYjIuLmNkMGU4 MDZkMTM0Y2I2MmMwMTcyNmUzMDQ0YWE3OWVmZGNmMmI4MWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL0luc3BlY3Rvci9XZWJJbnNwZWN0b3JVSVByb3h5LmNwcAorKysgYi9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9JbnNwZWN0b3IvV2ViSW5zcGVjdG9yVUlQcm94eS5jcHAK QEAgLTUwMCw5ICs1MDAsNyBAQCB2b2lkIFdlYkluc3BlY3RvclVJUHJveHk6Om9wZW4oKQogICAg IGlmICghbV9pbnNwZWN0b3JQYWdlKQogICAgICAgICByZXR1cm47CiAKLSNpZiBQTEFURk9STShH VEspCiAgICAgU2V0Rm9yU2NvcGU8Ym9vbD4gaXNPcGVuaW5nKG1faXNPcGVuaW5nLCB0cnVlKTsK LSNlbmRpZgogCiAgICAgbV9pc1Zpc2libGUgPSB0cnVlOwogICAgIG1faW5zcGVjdG9yUGFnZS0+ c2VuZChNZXNzYWdlczo6V2ViSW5zcGVjdG9yVUk6OlNldElzVmlzaWJsZShtX2lzVmlzaWJsZSkp OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvSW5zcGVjdG9yL1dlYkluc3Bl Y3RvclVJUHJveHkuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0luc3BlY3Rvci9XZWJJbnNw ZWN0b3JVSVByb3h5LmgKaW5kZXggNDgwYWEzY2I5YmJiYTFjYjJjMjQ3M2M0ZDhjYTcwM2IwMTIw MTU1YS4uYzRmOTBlMmJiMDlmODRlM2VmMWY2NTlhMDc4NjE3NjI4NzY2ZmMzZSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvSW5zcGVjdG9yL1dlYkluc3BlY3RvclVJUHJveHku aAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9JbnNwZWN0b3IvV2ViSW5zcGVjdG9yVUlQ cm94eS5oCkBAIC0zMDUsNiArMzA1LDcgQEAgcHJpdmF0ZToKICAgICBib29sIG1fZWxlbWVudFNl bGVjdGlvbkFjdGl2ZSB7IGZhbHNlIH07CiAgICAgYm9vbCBtX2lnbm9yZUVsZW1lbnRTZWxlY3Rp b25DaGFuZ2UgeyBmYWxzZSB9OwogICAgIGJvb2wgbV9pc0FjdGl2ZUZyb250ZW5kIHsgZmFsc2Ug fTsKKyAgICBib29sIG1faXNPcGVuaW5nIHsgZmFsc2UgfTsKICAgICBib29sIG1fY2xvc2luZyB7 IGZhbHNlIH07CiAKICAgICBBdHRhY2htZW50U2lkZSBtX2F0dGFjaG1lbnRTaWRlIHtBdHRhY2ht ZW50U2lkZTo6Qm90dG9tfTsKQEAgLTMyNSw3ICszMjYsNiBAQCBwcml2YXRlOgogICAgIEd0a1dp ZGdldCogbV9pbnNwZWN0b3JXaW5kb3cgeyBudWxscHRyIH07CiAgICAgR3RrV2lkZ2V0KiBtX2hl YWRlckJhciB7IG51bGxwdHIgfTsKICAgICBTdHJpbmcgbV9pbnNwZWN0ZWRVUkxTdHJpbmc7Ci0g ICAgYm9vbCBtX2lzT3BlbmluZyB7IGZhbHNlIH07CiAjZWxpZiBQTEFURk9STShXSU4pCiAgICAg SFdORCBtX2luc3BlY3RlZFZpZXdXaW5kb3cgeyBudWxscHRyIH07CiAgICAgSFdORCBtX2luc3Bl Y3RlZFZpZXdQYXJlbnRXaW5kb3cgeyBudWxscHRyIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9JbnNwZWN0b3IvbWFjL1dlYkluc3BlY3RvclVJUHJveHlNYWMubW0gYi9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9JbnNwZWN0b3IvbWFjL1dlYkluc3BlY3RvclVJUHJveHlN YWMubW0KaW5kZXggYzc3M2ZiNTBhOWQ4MDI1N2E5ZTZiNGM1ZTcxZDFiNGQ4MTcyNTk1ZC4uMzg1 MTEzMDc4M2RkYzgxNDYxZjM1M2E4MjNjYTNiOTQzOTU3ZWRjOCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvSW5zcGVjdG9yL21hYy9XZWJJbnNwZWN0b3JVSVByb3h5TWFjLm1t CisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0luc3BlY3Rvci9tYWMvV2ViSW5zcGVjdG9y VUlQcm94eU1hYy5tbQpAQCAtMzk4LDYgKzM5OCwxNiBAQCB2b2lkIFdlYkluc3BlY3RvclVJUHJv eHk6OnBsYXRmb3JtQnJpbmdUb0Zyb250KCkKICAgICAvLyB0aGVuIHdlIG5lZWQgdG8gcmVvcGVu IHRoZSBJbnNwZWN0b3IgdG8gZ2V0IGl0IGF0dGFjaGVkIHRvIHRoZSByaWdodCB3aW5kb3cuCiAg ICAgLy8gVGhpcyBjYW4gaGFwcGVuIHdoZW4gZHJhZ2dpbmcgdGFicyB0byBhbm90aGVyIHdpbmRv dyBpbiBTYWZhcmkuCiAgICAgaWYgKG1faXNBdHRhY2hlZCAmJiBbbV9pbnNwZWN0b3JWaWV3Q29u dHJvbGxlciB3ZWJWaWV3XS53aW5kb3cgIT0gaW5zcGVjdGVkUGFnZSgpLT5wbGF0Zm9ybVdpbmRv dygpKSB7CisgICAgICAgIGlmIChtX2lzT3BlbmluZykgeworICAgICAgICAgICAgLy8gPHJkYXI6 Ly84ODM1ODY5Nj4gSWYgd2UgYXJlIGN1cnJlbnRseSBvcGVuaW5nIGFuIGF0dGFjaGVkIGluc3Bl Y3RvciwgdGhlIHdpbmRvd3Mgc2hvdWxkIGhhdmUgYWxyZWFkeQorICAgICAgICAgICAgLy8gbWF0 Y2hlZCwgYW5kIGNhbGxpbmcgYmFjayB0byBgb3BlbmAgaXNuJ3QgZ29pbmcgdG8gY29ycmVjdCB0 aGlzLiBBcyBhIGZhaWwtc2FmZSB0byBwcmV2ZW50IHJlZW50cmFuY3ksCisgICAgICAgICAgICAv LyBmYWxsIGJhY2sgdG8gZGV0YWNoaW5nIHRoZSBpbnNwZWN0b3Igd2hlbiB0aGVyZSBpcyBhIG1p c21hdGNoIGluIHRoZSB3ZWIgdmlldydzIHdpbmRvdyBhbmQgdGhlCisgICAgICAgICAgICAvLyBp bnNwZWN0b3IncyB3aW5kb3cuCisgICAgICAgICAgICBXVEZMb2dBbHdheXMoIldlYkluc3BlY3Rv clVJUHJveHk6OnBsYXRmb3JtQnJpbmdUb0Zyb250IC0gSW5zcGVjdGVkIGFuZCBpbnNwZWN0b3Ig d2luZG93cyBkaWQgbm90IG1hdGNoIHdoaWxlIG9wZW5pbmcgaW5zcGVjdG9yLiBGYWxsaW5nIGJh Y2sgdG8gZGV0YWNoZWQgaW5zcGVjdG9yLiBJbnNwZWN0ZWQgcGFnZSBoYWQgd2luZG93OiAlcyIs IGluc3BlY3RlZFBhZ2UoKS0+cGxhdGZvcm1XaW5kb3coKSA/ICJZRVMiIDogIk5PIik7CisgICAg ICAgICAgICBkZXRhY2goKTsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQorCiAgICAg ICAgIG9wZW4oKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0K 452110 2022-02-15 16:48:30 -0800 2022-02-15 21:21:24 -0800 [fast-cq] Patch v1.1 - Use RELEASE_LOG for logging bug-236672-20220215164829.patch text/plain 5166 pangle U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5ODYwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDMzZDAwOGRjM2U4MTM4ZjM0 NDdiOGIzZTllOGFkOTg4MmY1OGFmMzIuLjI0YzVhNmQ0ZWJlMmNmMTgwYzdkOTk1NWI3ZWQ4YmVi YTgyYWJhNzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYgQEAKKzIwMjItMDItMTUgIFBhdHJpY2sg QW5nbGUgIDxwYW5nbGVAYXBwbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IFtDb2Nv YV0gUmVlbnRyYW5jeSBpbiBXZWJLaXQ6OldlYkluc3BlY3RvclVJUHJveHk6Om9wZW4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNjY3MgorCisgICAg ICAgIFJldmlld2VkIGJ5IERldmluIFJvdXNzby4KKworICAgICAgICBTcGVjdWxhdGl2ZSBmaXgg Zm9yIG5vbi1yZXByb2R1Y2libGUgcmVlbnRyYW5jeS4gQmVjYXVzZSBgV2ViSW5zcGVjdG9yVUlQ cm94eTo6b3BlbmAgY2FsbHMKKyAgICAgICAgYFdlYkluc3BlY3RvclVJUHJveHk6OnBsYXRmb3Jt QnJpbmdUb0Zyb250YCwgd2hpY2ggdW5kZXIgc29tZSBjb25kaXRpb25zIGNhbiBjYWxsIGBXZWJJ bnNwZWN0b3JVSVByb3h5OjpvcGVuYCwKKyAgICAgICAgdGhlcmUgd2FzIGFuIG9wcG9ydHVuaXR5 IGZvciByZWN1cnNzaW9uLiBUaGlzIGFwcGVhcnMgdG8gaGFwcGVuIHdoZW4gdGhlIHdpbmRvdyBv ZiB0aGUgaW5zcGVjdG9yIHZpZXcgZG9lcyBub3QKKyAgICAgICAgbWF0Y2ggdGhlIHdpbmRvdyBv ZiB0aGUgaW5zcGVjdGVkIHdlYiB2aWV3LCB3aGljaCBpbiBnZW5lcmFsIHNob3VsZCBub3QgYmUg cG9zc2libGUgZm9yIGEgbmV3bHkgb3BlbmVkCisgICAgICAgIGluc3BlY3Rvci4gTXkgc3VzcGlj aW9uIGlzIHRoYXQgdGhlIHdlYiB2aWV3IGlzIG5vdCBhY3R1YWxseSBhdHRhY2hlZCB0byBhIHdp bmRvdyBhdCB0aGUgdGltZSB0aGUgaW5zcGVjdG9yIGlzCisgICAgICAgIGJlaW5nIG9wZW5lZC4g VGhpcyBwYXRjaCBhZGRzIGEgZmFpbC1zYWZlIHRoYXQgd2lsbCBkZXRhY2ggdGhlIGluc3BlY3Rv ciB2aWV3IGludG8gaXRzIG93biB3aW5kb3cgd2hlbiB0aGVzZQorICAgICAgICBjb25kaXRpb25z IGFyZSBtZXQgd2hpbGUgd2UgYXJlIGluIG1pZGRsZSBvZiBvcGVuaW5nIHRoZSBpbnNwZWN0b3Is IGFuZCBhbHNvIGFkZHMgbG9nZ2luZyB0byBpbmRpY2F0ZSBpZiB0aGUKKyAgICAgICAgaW5zcGVj dGVkIHdlYiB2aWV3IHdhcyBhY3R1YWxseSBpbiBhIHdpbmRvdy4gVGhpcyBzaG91bGQgYm90aCBw cmV2ZW50IHRoZSBjcmFzaCBmcm9tIHRoZSByZS1lbnRyeSBhcyB3ZWxsIGFzCisgICAgICAgIHBy b3ZpZGUgbW9yZSBjb250ZXh0IHdoZW4gdGhlIGlzc3VlIGRvZXMgb2NjdXIuCisKKyAgICAgICAg KiBVSVByb2Nlc3MvSW5zcGVjdG9yL1dlYkluc3BlY3RvclVJUHJveHkuY3BwOgorICAgICAgICAo V2ViS2l0OjpXZWJJbnNwZWN0b3JVSVByb3h5OjpvcGVuKToKKyAgICAgICAgKiBVSVByb2Nlc3Mv SW5zcGVjdG9yL1dlYkluc3BlY3RvclVJUHJveHkuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvSW5z cGVjdG9yL21hYy9XZWJJbnNwZWN0b3JVSVByb3h5TWFjLm1tOgorICAgICAgICAoV2ViS2l0OjpX ZWJJbnNwZWN0b3JVSVByb3h5OjpwbGF0Zm9ybUJyaW5nVG9Gcm9udCk6CisKIDIwMjItMDItMTUg IFBoaWxpcCBDaGltZW50byAgPHBjaGltZW50b0BpZ2FsaWEuY29tPgogCiAgICAgICAgIEZpeGVz IGZvciBidWlsZC13ZWJraXQgLS1taW5pbWFsCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9JbnNwZWN0b3IvV2ViSW5zcGVjdG9yVUlQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9JbnNwZWN0b3IvV2ViSW5zcGVjdG9yVUlQcm94eS5jcHAKaW5kZXggN2Q3NDZh ZjYxMjJmOGE4OTRkYTRhNzEzNmZhN2EwNjk1NmU0NGNiMi4uY2QwZTgwNmQxMzRjYjYyYzAxNzI2 ZTMwNDRhYTc5ZWZkY2YyYjgxZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv SW5zcGVjdG9yL1dlYkluc3BlY3RvclVJUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL0luc3BlY3Rvci9XZWJJbnNwZWN0b3JVSVByb3h5LmNwcApAQCAtNTAwLDkgKzUwMCw3 IEBAIHZvaWQgV2ViSW5zcGVjdG9yVUlQcm94eTo6b3BlbigpCiAgICAgaWYgKCFtX2luc3BlY3Rv clBhZ2UpCiAgICAgICAgIHJldHVybjsKIAotI2lmIFBMQVRGT1JNKEdUSykKICAgICBTZXRGb3JT Y29wZTxib29sPiBpc09wZW5pbmcobV9pc09wZW5pbmcsIHRydWUpOwotI2VuZGlmCiAKICAgICBt X2lzVmlzaWJsZSA9IHRydWU7CiAgICAgbV9pbnNwZWN0b3JQYWdlLT5zZW5kKE1lc3NhZ2VzOjpX ZWJJbnNwZWN0b3JVSTo6U2V0SXNWaXNpYmxlKG1faXNWaXNpYmxlKSk7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9JbnNwZWN0b3IvV2ViSW5zcGVjdG9yVUlQcm94eS5oIGIv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvSW5zcGVjdG9yL1dlYkluc3BlY3RvclVJUHJveHkuaApp bmRleCA0ODBhYTNjYjliYmJhMWNiMmMyNDczYzRkOGNhNzAzYjAxMjAxNTVhLi5jNGY5MGUyYmIw OWY4NGUzZWYxZjY1OWEwNzg2MTc2Mjg3NjZmYzNlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9JbnNwZWN0b3IvV2ViSW5zcGVjdG9yVUlQcm94eS5oCisrKyBiL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL0luc3BlY3Rvci9XZWJJbnNwZWN0b3JVSVByb3h5LmgKQEAgLTMwNSw2 ICszMDUsNyBAQCBwcml2YXRlOgogICAgIGJvb2wgbV9lbGVtZW50U2VsZWN0aW9uQWN0aXZlIHsg ZmFsc2UgfTsKICAgICBib29sIG1faWdub3JlRWxlbWVudFNlbGVjdGlvbkNoYW5nZSB7IGZhbHNl IH07CiAgICAgYm9vbCBtX2lzQWN0aXZlRnJvbnRlbmQgeyBmYWxzZSB9OworICAgIGJvb2wgbV9p c09wZW5pbmcgeyBmYWxzZSB9OwogICAgIGJvb2wgbV9jbG9zaW5nIHsgZmFsc2UgfTsKIAogICAg IEF0dGFjaG1lbnRTaWRlIG1fYXR0YWNobWVudFNpZGUge0F0dGFjaG1lbnRTaWRlOjpCb3R0b219 OwpAQCAtMzI1LDcgKzMyNiw2IEBAIHByaXZhdGU6CiAgICAgR3RrV2lkZ2V0KiBtX2luc3BlY3Rv cldpbmRvdyB7IG51bGxwdHIgfTsKICAgICBHdGtXaWRnZXQqIG1faGVhZGVyQmFyIHsgbnVsbHB0 ciB9OwogICAgIFN0cmluZyBtX2luc3BlY3RlZFVSTFN0cmluZzsKLSAgICBib29sIG1faXNPcGVu aW5nIHsgZmFsc2UgfTsKICNlbGlmIFBMQVRGT1JNKFdJTikKICAgICBIV05EIG1faW5zcGVjdGVk Vmlld1dpbmRvdyB7IG51bGxwdHIgfTsKICAgICBIV05EIG1faW5zcGVjdGVkVmlld1BhcmVudFdp bmRvdyB7IG51bGxwdHIgfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0lu c3BlY3Rvci9tYWMvV2ViSW5zcGVjdG9yVUlQcm94eU1hYy5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL0luc3BlY3Rvci9tYWMvV2ViSW5zcGVjdG9yVUlQcm94eU1hYy5tbQppbmRleCBjNzcz ZmI1MGE5ZDgwMjU3YTllNmI0YzVlNzFkMWI0ZDgxNzI1OTVkLi4yZjJkYjAzZDIwZWFkNTBhNWQ2 YWNkM2YxOWU2MmQ0MmVjZmM4Mjg2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9JbnNwZWN0b3IvbWFjL1dlYkluc3BlY3RvclVJUHJveHlNYWMubW0KKysrIGIvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvSW5zcGVjdG9yL21hYy9XZWJJbnNwZWN0b3JVSVByb3h5TWFjLm1tCkBA IC0zMiw2ICszMiw3IEBACiAjaW1wb3J0ICJBUElJbnNwZWN0b3JDb25maWd1cmF0aW9uLmgiCiAj aW1wb3J0ICJBUElVSUNsaWVudC5oIgogI2ltcG9ydCAiR2xvYmFsRmluZEluUGFnZVN0YXRlLmgi CisjaW1wb3J0ICJMb2dnaW5nLmgiCiAjaW1wb3J0ICJXS0luc3BlY3RvclByaXZhdGVNYWMuaCIK ICNpbXBvcnQgIldLSW5zcGVjdG9yVmlld0NvbnRyb2xsZXIuaCIKICNpbXBvcnQgIldLT2JqZWN0 LmgiCkBAIC0zOTgsNiArMzk5LDE2IEBAIHZvaWQgV2ViSW5zcGVjdG9yVUlQcm94eTo6cGxhdGZv cm1CcmluZ1RvRnJvbnQoKQogICAgIC8vIHRoZW4gd2UgbmVlZCB0byByZW9wZW4gdGhlIEluc3Bl Y3RvciB0byBnZXQgaXQgYXR0YWNoZWQgdG8gdGhlIHJpZ2h0IHdpbmRvdy4KICAgICAvLyBUaGlz IGNhbiBoYXBwZW4gd2hlbiBkcmFnZ2luZyB0YWJzIHRvIGFub3RoZXIgd2luZG93IGluIFNhZmFy aS4KICAgICBpZiAobV9pc0F0dGFjaGVkICYmIFttX2luc3BlY3RvclZpZXdDb250cm9sbGVyIHdl YlZpZXddLndpbmRvdyAhPSBpbnNwZWN0ZWRQYWdlKCktPnBsYXRmb3JtV2luZG93KCkpIHsKKyAg ICAgICAgaWYgKG1faXNPcGVuaW5nKSB7CisgICAgICAgICAgICAvLyA8cmRhcjovLzg4MzU4Njk2 PiBJZiB3ZSBhcmUgY3VycmVudGx5IG9wZW5pbmcgYW4gYXR0YWNoZWQgaW5zcGVjdG9yLCB0aGUg d2luZG93cyBzaG91bGQgaGF2ZSBhbHJlYWR5CisgICAgICAgICAgICAvLyBtYXRjaGVkLCBhbmQg Y2FsbGluZyBiYWNrIHRvIGBvcGVuYCBpc24ndCBnb2luZyB0byBjb3JyZWN0IHRoaXMuIEFzIGEg ZmFpbC1zYWZlIHRvIHByZXZlbnQgcmVlbnRyYW5jeSwKKyAgICAgICAgICAgIC8vIGZhbGwgYmFj ayB0byBkZXRhY2hpbmcgdGhlIGluc3BlY3RvciB3aGVuIHRoZXJlIGlzIGEgbWlzbWF0Y2ggaW4g dGhlIHdlYiB2aWV3J3Mgd2luZG93IGFuZCB0aGUKKyAgICAgICAgICAgIC8vIGluc3BlY3Rvcidz IHdpbmRvdy4KKyAgICAgICAgICAgIFJFTEVBU0VfTE9HKEluc3BlY3RvciwgIldlYkluc3BlY3Rv clVJUHJveHk6OnBsYXRmb3JtQnJpbmdUb0Zyb250IC0gSW5zcGVjdGVkIGFuZCBpbnNwZWN0b3Ig d2luZG93cyBkaWQgbm90IG1hdGNoIHdoaWxlIG9wZW5pbmcgaW5zcGVjdG9yLiBGYWxsaW5nIGJh Y2sgdG8gZGV0YWNoZWQgaW5zcGVjdG9yLiBJbnNwZWN0ZWQgcGFnZSBoYWQgd2luZG93OiAlcyIs IGluc3BlY3RlZFBhZ2UoKS0+cGxhdGZvcm1XaW5kb3coKSA/ICJZRVMiIDogIk5PIik7CisgICAg ICAgICAgICBkZXRhY2goKTsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQorCiAgICAg ICAgIG9wZW4oKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0K